diff options
| author | Michael W <baddaemon87@gmail.com> | 2021-01-30 20:39:30 +0100 |
|---|---|---|
| committer | Bruno Martins <bgcngm@gmail.com> | 2021-02-04 15:04:32 +0100 |
| commit | 2b90a7f7d863bd07707d583080ce413c503f875e (patch) | |
| tree | 6e89b0931751a29a8a3feb1ea85b3a51c7cbb6ed | |
| parent | da735e0ab38bd403bd7c28f82a30816d3be7e4ed (diff) | |
SetupWizard: Add device specific hook page
* Add a new activity DeviceSpecificActivity which acts as a jumppad
into an activity using "org.lineageos.settings.device.SUW_SETTINGS"
* Handles navigation (back / next)
* Handles cases where the script contains the page but SUW_SETTINGS
don't exist
* In order to use this, devices need to provide an activity that:
* at least shows a back and continue button
* returns Activity.RESULT_OK and Activity.RESULT_CANCELLED for the
buttons
* does whatever you need to specifically have done in setup!
Change-Id: I4956c8f5f1ad13b9adf2e5604fd4a728e261336b
| -rw-r--r-- | AndroidManifest.xml | 13 | ||||
| -rw-r--r-- | res/layout/setup_device_specific.xml | 23 | ||||
| -rw-r--r-- | res/raw/lineage_wizard_script.xml | 4 | ||||
| -rw-r--r-- | res/raw/wizard_script.xml | 5 | ||||
| -rw-r--r-- | src/org/lineageos/setupwizard/DeviceSpecificActivity.java | 76 |
5 files changed, 119 insertions, 2 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 43d0881..cdf7291 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- Copyright (C) 2013 The CyanogenMod Project - Copyright (C) 2017,2019 The LineageOS Project + Copyright (C) 2017-2021 The LineageOS Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -235,6 +235,17 @@ </intent-filter> </activity> + <activity android:name=".DeviceSpecificActivity" + android:label="@string/activity_label_empty" + android:excludeFromRecents="true" + android:immersive="true" + android:windowSoftInputMode="stateAlwaysHidden"> + <intent-filter> + <action android:name="org.lineageos.setupwizard.DEVICE_SPECIFIC"/> + <category android:name="android.intent.category.DEFAULT"/> + </intent-filter> + </activity> + <activity android:name=".LineageSettingsActivity" android:label="@string/activity_label_empty" android:excludeFromRecents="true" diff --git a/res/layout/setup_device_specific.xml b/res/layout/setup_device_specific.xml new file mode 100644 index 0000000..0b063ae --- /dev/null +++ b/res/layout/setup_device_specific.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2021 The LineageOS Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + android:background="@color/primary" /> diff --git a/res/raw/lineage_wizard_script.xml b/res/raw/lineage_wizard_script.xml index d502649..047f1b3 100644 --- a/res/raw/lineage_wizard_script.xml +++ b/res/raw/lineage_wizard_script.xml @@ -54,6 +54,10 @@ </WizardAction> <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_LOCATION_SETTINGS;end" id="location_settings"> + <result wizard:action="device_specific" /> + </WizardAction> + + <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.DEVICE_SPECIFIC;end" id="device_specific"> <result wizard:action="recovery_update" /> </WizardAction> diff --git a/res/raw/wizard_script.xml b/res/raw/wizard_script.xml index 8ff58f6..a5be50d 100644 --- a/res/raw/wizard_script.xml +++ b/res/raw/wizard_script.xml @@ -98,7 +98,10 @@ <result wizard:action="oem_post_setup" /> </WizardAction> <WizardAction wizard:script="android.resource://com.google.android.setupwizard/xml/wizard_script_qr_provision_flow" id="qr_provision_flow" /> - <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_RECOVERY_UPDATE;end" id="oem_post_setup"> + <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.DEVICE_SPECIFIC;end" id="oem_post_setup"> + <result wizard:action="recovery_update" /> + </WizardAction> + <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_RECOVERY_UPDATE;end" id="recovery_update"> <result wizard:action="lineage_settings" /> </WizardAction> <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_SETTINGS;end" id="lineage_settings"> diff --git a/src/org/lineageos/setupwizard/DeviceSpecificActivity.java b/src/org/lineageos/setupwizard/DeviceSpecificActivity.java new file mode 100644 index 0000000..9c12e95 --- /dev/null +++ b/src/org/lineageos/setupwizard/DeviceSpecificActivity.java @@ -0,0 +1,76 @@ +/* + * Copyright (C) 2021 The LineageOS Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License + */ + +package org.lineageos.setupwizard; + +import android.app.Activity; +import android.content.ComponentName; +import android.content.Intent; +import android.os.Bundle; + +import com.google.android.setupcompat.util.WizardManagerHelper; + +import org.lineageos.setupwizard.util.SetupWizardUtils; + +public class DeviceSpecificActivity extends BaseSetupWizardActivity { + + private static final String ACTION_SETUP_DEVICE = "org.lineageos.settings.device.SUW_SETTINGS"; + private static final int REQUEST_CODE_SETUP_DEVICE = 90000; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + onStartSubactivity(); + } + + @Override + protected void onActivityResult(int requestCode, int resultCode, Intent data) { + if (requestCode == REQUEST_CODE_SETUP_DEVICE) { + if (resultCode == RESULT_OK) { + goToNextPage(); + } else { + finish(); + } + } else if (resultCode == RESULT_CANCELED) { + onStartSubactivity(); + applyBackwardTransition(TRANSITION_ID_NONE); + } + } + + @Override + protected int getLayoutResId() { + return R.layout.setup_device_specific; + } + + private void onStartSubactivity() { + Intent intent = new Intent(ACTION_SETUP_DEVICE); + ComponentName name = intent.resolveActivity(getPackageManager()); + if (name != null) { + applyForwardTransition(TRANSITION_ID_SLIDE); + startActivityForResult(intent, REQUEST_CODE_SETUP_DEVICE); + } else { + SetupWizardUtils.disableComponent(this, DeviceSpecificActivity.class); + goToNextPage(); + finish(); + } + } + + private void goToNextPage() { + applyForwardTransition(TRANSITION_ID_SLIDE); + Intent intent = WizardManagerHelper.getNextIntent(getIntent(), Activity.RESULT_OK); + nextAction(NEXT_REQUEST, intent); + } +} |
