Reformat code

Run automated code reformatting in Android Studio and manually fix
unwanted/broken style changes

Change-Id: Iaf14a08a275f9b11e1ae17f69201ab61a9c6ade1
This commit is contained in:
Oliver Scott
2024-01-10 17:16:28 -05:00
committed by Michael Bestas
parent f609cd21c8
commit 7664461e5f
34 changed files with 486 additions and 378 deletions

View File

@@ -27,10 +27,10 @@
<uses-permission android:name="android.permission.SET_TIME_ZONE" />
<uses-permission android:name="android.permission.SET_TIME" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.CHANGE_NETWORK_STATE"/>
<uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.GET_ACCOUNTS_PRIVILEGED" />
<uses-permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE" />
<uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
@@ -49,28 +49,31 @@
android:name="lineageos.permission.FINISH_SETUP"
android:protectionLevel="signatureOrSystem" />
<protected-broadcast android:name="org.lineageos.setupwizard.LINEAGE_SETUP_COMPLETE"
android:permission="lineageos.permission.FINISH_SETUP"/>
<protected-broadcast
android:name="org.lineageos.setupwizard.LINEAGE_SETUP_COMPLETE"
android:permission="lineageos.permission.FINISH_SETUP" />
<protected-broadcast android:name="org.lineageos.setupwizard.SETUP_FINISHED"
android:permission="lineageos.permission.FINISH_SETUP"/>
<protected-broadcast
android:name="org.lineageos.setupwizard.SETUP_FINISHED"
android:permission="lineageos.permission.FINISH_SETUP" />
<application android:label="@string/app_name"
android:icon="@mipmap/ic_launcher"
android:theme="@style/Theme.Setup"
android:uiOptions="none"
android:taskAffinity="com.android.wizard"
android:name=".SetupWizardApp">
<application
android:label="@string/app_name"
android:icon="@mipmap/ic_launcher"
android:theme="@style/Theme.Setup"
android:uiOptions="none"
android:taskAffinity="com.android.wizard"
android:name=".SetupWizardApp">
<activity android:theme="@style/NoDisplay"
android:label="@string/activity_label_empty"
android:name=".wizardmanager.WizardManager"
android:enabled="false"
android:exported="false"
android:excludeFromRecents="true"
android:configChanges="keyboard|keyboardHidden|mcc|mnc|orientation|screenSize"
android:immersive="true">
<activity
android:theme="@style/NoDisplay"
android:label="@string/activity_label_empty"
android:name=".wizardmanager.WizardManager"
android:enabled="false"
android:exported="false"
android:excludeFromRecents="true"
android:configChanges="keyboard|keyboardHidden|mcc|mnc|orientation|screenSize"
android:immersive="true">
<intent-filter>
<action android:name="com.android.wizard.LOAD" />
<action android:name="com.android.wizard.NEXT" />
@@ -78,16 +81,17 @@
</intent-filter>
</activity>
<activity android:name=".SetupWizardActivity"
android:label="@string/activity_label_empty"
android:lockTaskMode="normal"
android:launchMode="singleTask"
android:excludeFromRecents="true"
android:configChanges="keyboard|keyboardHidden|mcc|mnc|orientation|screenSize"
android:immersive="true"
android:exported="true"
android:windowSoftInputMode="stateAlwaysHidden"
android:theme="@style/NoDisplay">
<activity
android:name=".SetupWizardActivity"
android:label="@string/activity_label_empty"
android:lockTaskMode="normal"
android:launchMode="singleTask"
android:excludeFromRecents="true"
android:configChanges="keyboard|keyboardHidden|mcc|mnc|orientation|screenSize"
android:immersive="true"
android:exported="true"
android:windowSoftInputMode="stateAlwaysHidden"
android:theme="@style/NoDisplay">
<intent-filter android:priority="9">
<action android:name="android.intent.action.MAIN" />
@@ -97,225 +101,243 @@
</intent-filter>
</activity>
<activity android:name=".BluetoothSetupActivity"
android:label="@string/activity_label_empty"
android:excludeFromRecents="true"
android:configChanges="mcc|mnc"
android:immersive="true"
android:exported="false"
android:windowSoftInputMode="stateAlwaysHidden">
<activity
android:name=".BluetoothSetupActivity"
android:label="@string/activity_label_empty"
android:excludeFromRecents="true"
android:configChanges="mcc|mnc"
android:immersive="true"
android:exported="false"
android:windowSoftInputMode="stateAlwaysHidden">
<intent-filter>
<action android:name="org.lineageos.setupwizard.LINEAGE_BLUETOOTH_SETUP" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<activity android:name=".WelcomeActivity"
android:label="@string/activity_label_empty"
android:excludeFromRecents="true"
android:configChanges="mcc|mnc"
android:immersive="true"
android:exported="false"
android:windowSoftInputMode="stateAlwaysHidden">
<activity
android:name=".WelcomeActivity"
android:label="@string/activity_label_empty"
android:excludeFromRecents="true"
android:configChanges="mcc|mnc"
android:immersive="true"
android:exported="false"
android:windowSoftInputMode="stateAlwaysHidden">
<intent-filter>
<action android:name="org.lineageos.setupwizard.LINEAGE_WELCOME" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<activity android:name=".LocaleActivity"
android:label="@string/activity_label_empty"
android:excludeFromRecents="true"
android:configChanges="mcc|mnc"
android:immersive="true"
android:exported="false"
android:windowSoftInputMode="stateAlwaysHidden">
<activity
android:name=".LocaleActivity"
android:label="@string/activity_label_empty"
android:excludeFromRecents="true"
android:configChanges="mcc|mnc"
android:immersive="true"
android:exported="false"
android:windowSoftInputMode="stateAlwaysHidden">
<intent-filter>
<action android:name="org.lineageos.setupwizard.LINEAGE_LOCALE" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<activity android:name=".DateTimeActivity"
android:label="@string/activity_label_empty"
android:excludeFromRecents="true"
android:configChanges="mcc|mnc"
android:immersive="true"
android:exported="false"
android:windowSoftInputMode="stateAlwaysHidden">
<activity
android:name=".DateTimeActivity"
android:label="@string/activity_label_empty"
android:excludeFromRecents="true"
android:configChanges="mcc|mnc"
android:immersive="true"
android:exported="false"
android:windowSoftInputMode="stateAlwaysHidden">
<intent-filter>
<action android:name="org.lineageos.setupwizard.LINEAGE_DATETIME" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<activity android:name=".SimMissingActivity"
android:label="@string/activity_label_empty"
android:excludeFromRecents="true"
android:configChanges="mcc|mnc"
android:immersive="true"
android:exported="false"
android:windowSoftInputMode="stateAlwaysHidden">
<activity
android:name=".SimMissingActivity"
android:label="@string/activity_label_empty"
android:excludeFromRecents="true"
android:configChanges="mcc|mnc"
android:immersive="true"
android:exported="false"
android:windowSoftInputMode="stateAlwaysHidden">
<intent-filter>
<action android:name="org.lineageos.setupwizard.LINEAGE_SIM_MISSING" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<activity android:name=".NetworkSetupActivity"
android:label="@string/activity_label_empty"
android:excludeFromRecents="true"
android:configChanges="mcc|mnc"
android:immersive="true"
android:exported="false"
android:windowSoftInputMode="stateAlwaysHidden">
<activity
android:name=".NetworkSetupActivity"
android:label="@string/activity_label_empty"
android:excludeFromRecents="true"
android:configChanges="mcc|mnc"
android:immersive="true"
android:exported="false"
android:windowSoftInputMode="stateAlwaysHidden">
<intent-filter>
<action android:name="org.lineageos.setupwizard.LINEAGE_NETWORK_SETUP" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<activity android:name=".LocationSettingsActivity"
android:label="@string/activity_label_empty"
android:excludeFromRecents="true"
android:configChanges="mcc|mnc"
android:immersive="true"
android:exported="false"
android:windowSoftInputMode="stateAlwaysHidden">
<activity
android:name=".LocationSettingsActivity"
android:label="@string/activity_label_empty"
android:excludeFromRecents="true"
android:configChanges="mcc|mnc"
android:immersive="true"
android:exported="false"
android:windowSoftInputMode="stateAlwaysHidden">
<intent-filter>
<action android:name="org.lineageos.setupwizard.LINEAGE_LOCATION_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<activity android:name=".UpdateRecoveryActivity"
android:label="@string/activity_label_empty"
android:excludeFromRecents="true"
android:configChanges="mcc|mnc"
android:immersive="true"
android:exported="true"
android:windowSoftInputMode="stateAlwaysHidden">
<activity
android:name=".UpdateRecoveryActivity"
android:label="@string/activity_label_empty"
android:excludeFromRecents="true"
android:configChanges="mcc|mnc"
android:immersive="true"
android:exported="true"
android:windowSoftInputMode="stateAlwaysHidden">
<intent-filter>
<action android:name="org.lineageos.setupwizard.LINEAGE_RECOVERY_UPDATE"/>
<category android:name="android.intent.category.DEFAULT"/>
<action android:name="org.lineageos.setupwizard.LINEAGE_RECOVERY_UPDATE" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<activity android:name=".DeviceSpecificActivity"
android:label="@string/activity_label_empty"
android:excludeFromRecents="true"
android:immersive="true"
android:exported="true"
android:windowSoftInputMode="stateAlwaysHidden">
<activity
android:name=".DeviceSpecificActivity"
android:label="@string/activity_label_empty"
android:excludeFromRecents="true"
android:immersive="true"
android:exported="true"
android:windowSoftInputMode="stateAlwaysHidden">
<intent-filter>
<action android:name="org.lineageos.setupwizard.DEVICE_SPECIFIC"/>
<category android:name="android.intent.category.DEFAULT"/>
<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"
android:configChanges="mcc|mnc"
android:immersive="true"
android:exported="true"
android:windowSoftInputMode="stateAlwaysHidden">
<activity
android:name=".LineageSettingsActivity"
android:label="@string/activity_label_empty"
android:excludeFromRecents="true"
android:configChanges="mcc|mnc"
android:immersive="true"
android:exported="true"
android:windowSoftInputMode="stateAlwaysHidden">
<intent-filter>
<action android:name="org.lineageos.setupwizard.LINEAGE_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<activity android:name=".NavigationSettingsActivity"
android:label="@string/activity_label_empty"
android:excludeFromRecents="true"
android:configChanges="mcc|mnc"
android:immersive="true"
android:exported="true"
android:windowSoftInputMode="stateAlwaysHidden">
<activity
android:name=".NavigationSettingsActivity"
android:label="@string/activity_label_empty"
android:excludeFromRecents="true"
android:configChanges="mcc|mnc"
android:immersive="true"
android:exported="true"
android:windowSoftInputMode="stateAlwaysHidden">
<intent-filter>
<action android:name="org.lineageos.setupwizard.NAVIGATION_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<activity android:name=".BiometricActivity"
android:label="@string/activity_label_empty"
android:excludeFromRecents="true"
android:configChanges="mcc|mnc"
android:immersive="true"
android:exported="false"
android:windowSoftInputMode="stateAlwaysHidden">
<activity
android:name=".BiometricActivity"
android:label="@string/activity_label_empty"
android:excludeFromRecents="true"
android:configChanges="mcc|mnc"
android:immersive="true"
android:exported="false"
android:windowSoftInputMode="stateAlwaysHidden">
<intent-filter>
<action android:name="org.lineageos.setupwizard.LINEAGE_BIOMETRIC_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<activity android:name=".ScreenLockActivity"
android:label="@string/activity_label_empty"
android:excludeFromRecents="true"
android:configChanges="mcc|mnc"
android:immersive="true"
android:exported="false"
android:windowSoftInputMode="stateAlwaysHidden">
<activity
android:name=".ScreenLockActivity"
android:label="@string/activity_label_empty"
android:excludeFromRecents="true"
android:configChanges="mcc|mnc"
android:immersive="true"
android:exported="false"
android:windowSoftInputMode="stateAlwaysHidden">
<intent-filter>
<action android:name="org.lineageos.setupwizard.LINEAGE_LOCKSCREEN_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<activity android:name=".backup.RestoreIntroActivity"
android:label="@string/activity_label_empty"
android:excludeFromRecents="true"
android:configChanges="mcc|mnc"
android:immersive="true"
android:exported="true"
android:windowSoftInputMode="stateAlwaysHidden">
<activity
android:name=".backup.RestoreIntroActivity"
android:label="@string/activity_label_empty"
android:excludeFromRecents="true"
android:configChanges="mcc|mnc"
android:immersive="true"
android:exported="true"
android:windowSoftInputMode="stateAlwaysHidden">
<intent-filter>
<action android:name="org.lineageos.setupwizard.LINEAGE_RESTORE_BACKUP"/>
<category android:name="android.intent.category.DEFAULT"/>
<action android:name="org.lineageos.setupwizard.LINEAGE_RESTORE_BACKUP" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<activity android:name=".ThemeSettingsActivity"
android:label="@string/activity_label_empty"
android:excludeFromRecents="true"
android:configChanges="mcc|mnc"
android:immersive="true"
android:exported="true"
android:windowSoftInputMode="stateAlwaysHidden">
<activity
android:name=".ThemeSettingsActivity"
android:label="@string/activity_label_empty"
android:excludeFromRecents="true"
android:configChanges="mcc|mnc"
android:immersive="true"
android:exported="true"
android:windowSoftInputMode="stateAlwaysHidden">
<intent-filter>
<action android:name="org.lineageos.setupwizard.THEME_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<activity android:name=".FinishActivity"
android:theme="@style/EdgeToEdgeWallpaperBackground"
android:label="@string/activity_label_empty"
android:excludeFromRecents="true"
android:configChanges="mcc|mnc"
android:immersive="true"
android:exported="true"
android:windowSoftInputMode="stateAlwaysHidden">
<activity
android:name=".FinishActivity"
android:theme="@style/EdgeToEdgeWallpaperBackground"
android:label="@string/activity_label_empty"
android:excludeFromRecents="true"
android:configChanges="mcc|mnc"
android:immersive="true"
android:exported="true"
android:windowSoftInputMode="stateAlwaysHidden">
<intent-filter>
<action android:name="org.lineageos.setupwizard.LINEAGE_SETUP_COMPLETE" />
<action android:name="org.lineageos.setupwizard.SETUP_FINISHED"/>
<action android:name="org.lineageos.setupwizard.SETUP_FINISHED" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<activity android:name=".SetupWizardTestActivity"
android:configChanges="keyboard|keyboardHidden|mcc|mnc|orientation|screenSize"
android:exported="false"
android:immersive="true"
android:label="@string/activity_label_empty"
android:launchMode="singleInstance"
android:theme="@style/NoDisplay"/>
<activity
android:name=".SetupWizardTestActivity"
android:configChanges="keyboard|keyboardHidden|mcc|mnc|orientation|screenSize"
android:exported="false"
android:immersive="true"
android:label="@string/activity_label_empty"
android:launchMode="singleInstance"
android:theme="@style/NoDisplay" />
<receiver android:name=".PartnerReceiver"
android:exported="true">
<receiver
android:name=".PartnerReceiver"
android:exported="true">
<intent-filter>
<action android:name="com.android.setupwizard.action.PARTNER_CUSTOMIZATION" />
<action android:name="com.google.android.tvsetup.action.PARTNER_CUSTOMIZATION" />
@@ -323,7 +345,8 @@
</intent-filter>
</receiver>
<service android:name=".SetupWizardExitWorker"
android:exported="false"/>
<service
android:name=".SetupWizardExitWorker"
android:exported="false" />
</application>
</manifest>

View File

@@ -16,16 +16,16 @@
-->
<permissions>
<privapp-permissions package="org.lineageos.setupwizard">
<permission name="android.permission.BACKUP"/>
<permission name="android.permission.CHANGE_COMPONENT_ENABLED_STATE"/>
<permission name="android.permission.CHANGE_CONFIGURATION"/>
<permission name="android.permission.GET_ACCOUNTS_PRIVILEGED"/>
<permission name="android.permission.INTERACT_ACROSS_USERS"/>
<permission name="android.permission.MANAGE_USERS"/>
<permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
<permission name="android.permission.SET_TIME"/>
<permission name="android.permission.SET_TIME_ZONE"/>
<permission name="android.permission.STATUS_BAR"/>
<permission name="android.permission.WRITE_SECURE_SETTINGS"/>
<permission name="android.permission.BACKUP" />
<permission name="android.permission.CHANGE_COMPONENT_ENABLED_STATE" />
<permission name="android.permission.CHANGE_CONFIGURATION" />
<permission name="android.permission.GET_ACCOUNTS_PRIVILEGED" />
<permission name="android.permission.INTERACT_ACROSS_USERS" />
<permission name="android.permission.MANAGE_USERS" />
<permission name="android.permission.READ_PRIVILEGED_PHONE_STATE" />
<permission name="android.permission.SET_TIME" />
<permission name="android.permission.SET_TIME_ZONE" />
<permission name="android.permission.STATUS_BAR" />
<permission name="android.permission.WRITE_SECURE_SETTINGS" />
</privapp-permissions>
</permissions>

View File

@@ -18,7 +18,9 @@
-->
<set xmlns:android="http://schemas.android.com/apk/res/android"
android:interpolator="@android:interpolator/decelerate_quad">
<alpha android:fromAlpha="0.0" android:toAlpha="1.0"
android:duration="@android:integer/config_shortAnimTime"/>
android:interpolator="@android:interpolator/decelerate_quad">
<alpha
android:fromAlpha="0.0"
android:toAlpha="1.0"
android:duration="@android:integer/config_shortAnimTime" />
</set>

View File

@@ -18,7 +18,9 @@
-->
<set xmlns:android="http://schemas.android.com/apk/res/android"
android:interpolator="@android:interpolator/accelerate_quad">
<alpha android:fromAlpha="1.0" android:toAlpha="0"
android:duration="@android:integer/config_shortAnimTime"/>
android:interpolator="@android:interpolator/accelerate_quad">
<alpha
android:fromAlpha="1.0"
android:toAlpha="0"
android:duration="@android:integer/config_shortAnimTime" />
</set>

View File

@@ -14,6 +14,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<shape xmlns:android="http://schemas.android.com/apk/res/android" >
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="?android:attr/colorBackground" />
</shape>

View File

@@ -14,7 +14,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<shape xmlns:android="http://schemas.android.com/apk/res/android" >
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/divider" />
<size android:width="316dp" android:height="1px"/>
<size
android:width="316dp"
android:height="1px" />
</shape>

View File

@@ -20,8 +20,7 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M0 0h24v24H0z" />
<path android:pathData="M0 0h24v24H0z" />
<path
android:fillColor="@color/black"
android:pathData="M19 3h-1V1h-2v2H8V1H6v2H5c-1.11 0-1.99 .9 -1.99 2L3 19c0 1.1 .89 2 2 2h14c1.1 0

View File

@@ -20,8 +20,7 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M0 0h24v24H0V0z" />
<path android:pathData="M0 0h24v24H0V0z" />
<path
android:fillColor="@color/black"
android:pathData="M11.8 12.5v-1l1.1-.8c.1-.1 .1 -.2 .1 -.3l-1-1.7c-.1-.1-.2-.2-.3-.1l-1.3 .4

View File

@@ -8,7 +8,7 @@
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
<path
android:pathData="M0,0h108v108h-108z"
android:fillColor="#ffffff"/>
<path
android:pathData="M0,0h108v108h-108z"
android:fillColor="#ffffff" />
</vector>

View File

@@ -9,25 +9,28 @@
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
<group>
<clip-path
android:pathData="M0,0h108v108h-108z"/>
<path
android:pathData="M53.671,54.898C53.707,54.605 53.744,54.312 53.744,54C53.744,53.688 53.707,53.395 53.671,53.102L55.651,51.598C55.834,51.47 55.87,51.213 55.761,51.012L53.872,47.84C53.762,47.638 53.506,47.565 53.304,47.638L50.957,48.555C50.462,48.188 49.931,47.895 49.362,47.657L48.995,45.218C48.995,44.998 48.794,44.833 48.556,44.833H44.797C44.559,44.833 44.357,44.998 44.32,45.218L43.954,47.638C43.386,47.858 42.854,48.188 42.359,48.537L40.012,47.62C39.792,47.528 39.554,47.62 39.444,47.822L37.556,50.993C37.445,51.213 37.5,51.452 37.684,51.598L39.664,53.102C39.627,53.395 39.609,53.707 39.609,54C39.609,54.312 39.646,54.605 39.682,54.898L37.684,56.42C37.5,56.548 37.464,56.805 37.574,57.007L39.462,60.178C39.572,60.38 39.829,60.453 40.03,60.38L42.377,59.463C42.872,59.83 43.404,60.123 43.972,60.362L44.339,62.782C44.357,63.002 44.559,63.167 44.797,63.167H48.574C48.812,63.167 49.014,63.002 49.032,62.782L49.399,60.362C49.967,60.142 50.499,59.812 50.994,59.463L53.34,60.38C53.561,60.472 53.799,60.38 53.909,60.178L55.797,57.007C55.907,56.805 55.87,56.567 55.687,56.42L53.671,54.898ZM46.667,57.208C44.852,57.208 43.367,55.778 43.367,54C43.367,52.222 44.852,50.792 46.667,50.792C48.482,50.792 49.967,52.222 49.967,54C49.967,55.778 48.5,57.208 46.667,57.208ZM66.834,33.852L48.5,33.833C46.484,33.833 44.834,35.483 44.834,37.5V43H48.5V41.167H66.834V66.833H48.5V65H44.834V70.5C44.834,72.517 46.484,74.167 48.5,74.167H66.834C68.851,74.167 70.501,72.517 70.501,70.5V37.5C70.501,35.483 68.851,33.852 66.834,33.852Z"
android:fillColor="#167C80"/>
<path
android:pathData="M28.54,28.54m-72,0a72,72 0,1 1,144 0a72,72 0,1 1,-144 0"
android:fillAlpha="0.6">
<aapt:attr name="android:fillColor">
<gradient
android:gradientRadius="72"
android:centerX="28.54"
android:centerY="28.54"
android:type="radial">
<item android:offset="0" android:color="#19FFFFFF"/>
<item android:offset="1" android:color="#00FFFFFF"/>
</gradient>
</aapt:attr>
</path>
</group>
<group>
<clip-path android:pathData="M0,0h108v108h-108z" />
<path
android:pathData="M53.671,54.898C53.707,54.605 53.744,54.312 53.744,54C53.744,53.688 53.707,53.395 53.671,53.102L55.651,51.598C55.834,51.47 55.87,51.213 55.761,51.012L53.872,47.84C53.762,47.638 53.506,47.565 53.304,47.638L50.957,48.555C50.462,48.188 49.931,47.895 49.362,47.657L48.995,45.218C48.995,44.998 48.794,44.833 48.556,44.833H44.797C44.559,44.833 44.357,44.998 44.32,45.218L43.954,47.638C43.386,47.858 42.854,48.188 42.359,48.537L40.012,47.62C39.792,47.528 39.554,47.62 39.444,47.822L37.556,50.993C37.445,51.213 37.5,51.452 37.684,51.598L39.664,53.102C39.627,53.395 39.609,53.707 39.609,54C39.609,54.312 39.646,54.605 39.682,54.898L37.684,56.42C37.5,56.548 37.464,56.805 37.574,57.007L39.462,60.178C39.572,60.38 39.829,60.453 40.03,60.38L42.377,59.463C42.872,59.83 43.404,60.123 43.972,60.362L44.339,62.782C44.357,63.002 44.559,63.167 44.797,63.167H48.574C48.812,63.167 49.014,63.002 49.032,62.782L49.399,60.362C49.967,60.142 50.499,59.812 50.994,59.463L53.34,60.38C53.561,60.472 53.799,60.38 53.909,60.178L55.797,57.007C55.907,56.805 55.87,56.567 55.687,56.42L53.671,54.898ZM46.667,57.208C44.852,57.208 43.367,55.778 43.367,54C43.367,52.222 44.852,50.792 46.667,50.792C48.482,50.792 49.967,52.222 49.967,54C49.967,55.778 48.5,57.208 46.667,57.208ZM66.834,33.852L48.5,33.833C46.484,33.833 44.834,35.483 44.834,37.5V43H48.5V41.167H66.834V66.833H48.5V65H44.834V70.5C44.834,72.517 46.484,74.167 48.5,74.167H66.834C68.851,74.167 70.501,72.517 70.501,70.5V37.5C70.501,35.483 68.851,33.852 66.834,33.852Z"
android:fillColor="#167C80" />
<path
android:pathData="M28.54,28.54m-72,0a72,72 0,1 1,144 0a72,72 0,1 1,-144 0"
android:fillAlpha="0.6">
<aapt:attr name="android:fillColor">
<gradient
android:gradientRadius="72"
android:centerX="28.54"
android:centerY="28.54"
android:type="radial">
<item
android:offset="0"
android:color="#19FFFFFF" />
<item
android:offset="1"
android:color="#00FFFFFF" />
</gradient>
</aapt:attr>
</path>
</group>
</vector>

View File

@@ -20,8 +20,7 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M0 0h24v24H0z" />
<path android:pathData="M0 0h24v24H0z" />
<path
android:fillColor="@color/black"
android:pathData="M12.87 15.07l-2.54-2.51 .03 -.03c1.74-1.94 2.98-4.17

View File

@@ -24,6 +24,5 @@
android:fillColor="@color/black"
android:pathData="M12 2C8.13 2 5 5.13 5 9c0 5.25 7 13 7 13s7-7.75 7-13c0-3.87-3.13-7-7-7zm0
9.5c-1.38 0-2.5-1.12-2.5-2.5s1.12-2.5 2.5-2.5 2.5 1.12 2.5 2.5-1.12 2.5-2.5 2.5z" />
<path
android:pathData="M0 0h24v24H0z" />
<path android:pathData="M0 0h24v24H0z" />
</vector>

View File

@@ -1,8 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:height="24dp"
android:width="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path android:fillColor="#000"
android:pathData="M17,13L12,18L7,13H10V9H14V13M19.35,10.03C18.67,6.59 15.64,4 12,4C9.11,4 6.6,5.64 5.35,8.03C2.34,8.36 0,10.9 0,14A6,6 0 0,0 6,20H19A5,5 0 0,0 24,15C24,12.36 21.95,10.22 19.35,10.03Z"/>
android:height="24dp"
android:width="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#000"
android:pathData="M17,13L12,18L7,13H10V9H14V13M19.35,10.03C18.67,6.59 15.64,4 12,4C9.11,4 6.6,5.64 5.35,8.03C2.34,8.36 0,10.9 0,14A6,6 0 0,0 6,20H19A5,5 0 0,0 24,15C24,12.36 21.95,10.22 19.35,10.03Z" />
</vector>

View File

@@ -15,11 +15,11 @@
limitations under the License.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="@color/black"
android:pathData="M17,1.01L7,1c-1.1,0 -2,0.9 -2,2v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2L19,3c0,-1.1 -0.9,-1.99 -2,-1.99zM17,19L7,19L7,5h10v14zM16,13h-3L13,8h-2v5L8,13l4,4 4,-4z"/>
android:pathData="M17,1.01L7,1c-1.1,0 -2,0.9 -2,2v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2L19,3c0,-1.1 -0.9,-1.99 -2,-1.99zM17,19L7,19L7,5h10v14zM16,13h-3L13,8h-2v5L8,13l4,4 4,-4z" />
</vector>

View File

@@ -15,11 +15,11 @@
limitations under the License.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@color/black"
android:pathData="M4,2v9c0,1.65 1.35,3 3,3h2v6c0,1.1 0.9,2 2,2h2c1.1,0 2,-0.9 2,-2v-6h2c1.65,0 3,-1.35 3,-3V2C20,2 4,2 4,2zM11,20v-6h2v6H11zM18,11c0,0.55 -0.45,1 -1,1h-2H9H7c-0.55,0 -1,-0.45 -1,-1v-0.93h12V11zM18,8.07H6V4h2.81v2.15h2V4h2.38v2.15h2V4H18V8.07z"/>
android:pathData="M4,2v9c0,1.65 1.35,3 3,3h2v6c0,1.1 0.9,2 2,2h2c1.1,0 2,-0.9 2,-2v-6h2c1.65,0 3,-1.35 3,-3V2C20,2 4,2 4,2zM11,20v-6h2v6H11zM18,11c0,0.55 -0.45,1 -1,1h-2H9H7c-0.55,0 -1,-0.45 -1,-1v-0.93h12V11zM18,8.07H6V4h2.81v2.15h2V4h2.38v2.15h2V4H18V8.07z" />
</vector>

View File

@@ -42,7 +42,7 @@
android:paddingTop="@dimen/content_margin_top"
android:paddingRight="@dimen/content_margin_left"
android:paddingLeft="@dimen/content_margin_left"
android:paddingBottom="0dp"/>
android:paddingBottom="0dp" />
<LinearLayout
android:layout_width="match_parent"
@@ -50,12 +50,14 @@
android:layout_weight="35"
android:gravity="center_vertical"
android:orientation="vertical">
<TextView
style="@style/WelcomeTitle"
android:id="@+id/welcome_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hyphenationFrequency="none" />
<Button
android:id="@+id/start"
android:layout_width="wrap_content"

View File

@@ -16,11 +16,11 @@
-->
<!-- Based on simple_list_item_2.xml in framework -->
<TwoLineListItem xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
android:mode="twoLine"
android:gravity="center_vertical">
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
android:mode="twoLine"
android:gravity="center_vertical">
<TextView
android:id="@android:id/text1"

View File

@@ -14,8 +14,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scaleType="fitXY"
android:src="@drawable/divider" />
<ImageView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scaleType="fitXY"
android:src="@drawable/divider" />

View File

@@ -16,11 +16,11 @@
limitations under the License.
-->
<com.google.android.setupdesign.GlifLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/setup_wizard_layout"
android:layout_width="match_parent"
android:layout_height="match_parent">
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/setup_wizard_layout"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:orientation="vertical"
@@ -28,10 +28,11 @@
android:layout_height="match_parent"
style="@style/SudContentFrame">
<View android:id="@+id/page"
<View
android:id="@+id/page"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"/>
android:layout_weight="1" />
<org.lineageos.setupwizard.NavigationLayout
android:id="@+id/navigation_bar"

View File

@@ -19,26 +19,29 @@
<merge xmlns:android="http://schemas.android.com/apk/res/android">
<ImageButton android:id="@+id/lp__increment"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:paddingTop="22dip"
android:paddingBottom="22dip"/>
<ImageButton
android:id="@+id/lp__increment"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:paddingTop="22dip"
android:paddingBottom="22dip" />
<view class="org.lineageos.setupwizard.widget.LocalePicker$CustomEditText"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="?android:attr/textColorPrimary"
android:id="@+id/localepicker_input"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:singleLine="true"
android:background="@null" />
<view
class="org.lineageos.setupwizard.widget.LocalePicker$CustomEditText"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="?android:attr/textColorPrimary"
android:id="@+id/localepicker_input"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:singleLine="true"
android:background="@null" />
<ImageButton android:id="@+id/lp__decrement"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:paddingTop="22dip"
android:paddingBottom="22dip"/>
<ImageButton
android:id="@+id/lp__decrement"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:paddingTop="22dip"
android:paddingBottom="22dip" />
</merge>

View File

@@ -15,19 +15,19 @@
limitations under the License.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:gravity="left"
android:paddingStart="16dp"
android:paddingTop="6dp"
android:paddingBottom="6dp"
android:paddingEnd="16dp">
android:orientation="horizontal"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:gravity="left"
android:paddingStart="16dp"
android:paddingTop="6dp"
android:paddingBottom="6dp"
android:paddingEnd="16dp">
<TextView
android:id="@+id/locale"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="left"
android:textAppearance="?android:attr/textAppearanceMedium"/>
android:textAppearance="?android:attr/textAppearanceMedium" />
</LinearLayout>

View File

@@ -48,7 +48,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="24dp"
android:saveEnabled="false"/>
android:saveEnabled="false" />
<TwoLineListItem
android:id="@+id/date_item"

View File

@@ -16,37 +16,37 @@
limitations under the License.
-->
<com.google.android.setupdesign.GlifLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/setup_wizard_layout"
android:layout_width="match_parent"
android:layout_height="match_parent">
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/setup_wizard_layout"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
<ProgressBar
android:id="@+id/progressBar1"
style="?android:attr/progressBarStyleHorizontal"
android:indeterminateOnly="true"
android:layout_width="match_parent"
android:layout_height="8dp"
android:paddingStart="0dp"
android:paddingEnd="0dp" />
<ProgressBar
android:id="@+id/progressBar1"
style="?android:attr/progressBarStyleHorizontal"
android:indeterminateOnly="true"
android:layout_width="match_parent"
android:layout_height="8dp"
android:paddingStart="0dp"
android:paddingEnd="0dp" />
<FrameLayout
android:id="@+id/page"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
style="@style/SudContentFrame"/>
<FrameLayout
android:id="@+id/page"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
style="@style/SudContentFrame" />
<com.google.android.setupdesign.view.NavigationBar
android:id="@+id/navigation_bar"
style="@style/SudNavBarTheme"
android:layout_width="match_parent"
android:layout_height="@dimen/sud_navbar_height" />
<com.google.android.setupdesign.view.NavigationBar
android:id="@+id/navigation_bar"
style="@style/SudNavBarTheme"
android:layout_width="match_parent"
android:layout_height="@dimen/sud_navbar_height" />
</LinearLayout>
</LinearLayout>
</com.google.android.setupdesign.GlifLayout>

View File

@@ -44,13 +44,13 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.airbnb.lottie.LottieAnimationView
android:id="@+id/navigation_illustration"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:lottie_rawRes="@raw/lottie_system_nav_fully_gestural"
app:lottie_autoPlay="true"
app:lottie_loop="true" />
<com.airbnb.lottie.LottieAnimationView
android:id="@+id/navigation_illustration"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:lottie_rawRes="@raw/lottie_system_nav_fully_gestural"
app:lottie_autoPlay="true"
app:lottie_loop="true" />
<RadioGroup
android:id="@+id/navigation_radio_group"

View File

@@ -36,7 +36,7 @@
<Space
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="2"/>
android:layout_weight="2" />
<ImageView
android:id="@+id/brand_logo"
@@ -49,7 +49,7 @@
<Space
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="0.5"/>
android:layout_weight="0.5" />
</LinearLayout>
<LinearLayout
@@ -74,7 +74,7 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:hyphenationFrequency="none"
android:paddingBottom="@dimen/welcome_content_container_padding_bottom"/>
android:paddingBottom="@dimen/welcome_content_container_padding_bottom" />
<LinearLayout
android:layout_width="fill_parent"

View File

@@ -4,6 +4,6 @@
SPDX-License-Identifier: Apache-2.0
-->
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@drawable/ic_launcher_background"/>
<foreground android:drawable="@drawable/ic_launcher_foreground"/>
<background android:drawable="@drawable/ic_launcher_background" />
<foreground android:drawable="@drawable/ic_launcher_foreground" />
</adaptive-icon>

View File

@@ -20,33 +20,49 @@
<WizardScript xmlns:wizard="http://schemas.android.com/apk/res/com.google.android.setupwizard"
wizard:firstAction="bluetooth_setup">
<WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_BLUETOOTH_SETUP;end" id="bluetooth_setup">
<WizardAction
wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_BLUETOOTH_SETUP;end"
id="bluetooth_setup">
<result wizard:action="welcome" />
</WizardAction>
<WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_WELCOME;end" id="welcome">
<WizardAction
wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_WELCOME;end"
id="welcome">
<result wizard:action="locale" />
</WizardAction>
<WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_LOCALE;end" id="locale">
<WizardAction
wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_LOCALE;end"
id="locale">
<result wizard:action="network_setup" />
</WizardAction>
<WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_NETWORK_SETUP;end" id="network_setup">
<WizardAction
wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_NETWORK_SETUP;end"
id="network_setup">
<result wizard:action="device_specific" />
</WizardAction>
<WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.DEVICE_SPECIFIC;end" id="device_specific">
<WizardAction
wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.DEVICE_SPECIFIC;end"
id="device_specific">
<result wizard:action="recovery_update" />
</WizardAction>
<WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_RECOVERY_UPDATE;end" id="recovery_update">
<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">
<WizardAction
wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_SETTINGS;end"
id="lineage_settings">
<result wizard:action="finish" />
</WizardAction>
<WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_SETUP_COMPLETE;end" id="finish" />
<WizardAction
wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_SETUP_COMPLETE;end"
id="finish" />
</WizardScript>

View File

@@ -20,66 +20,98 @@
<WizardScript xmlns:wizard="http://schemas.android.com/apk/res/com.google.android.setupwizard"
wizard:firstAction="bluetooth_setup">
<WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_BLUETOOTH_SETUP;end" id="bluetooth_setup">
<WizardAction
wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_BLUETOOTH_SETUP;end"
id="bluetooth_setup">
<result wizard:action="welcome" />
</WizardAction>
<WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_WELCOME;end" id="welcome">
<WizardAction
wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_WELCOME;end"
id="welcome">
<result wizard:action="locale" />
</WizardAction>
<WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_LOCALE;end" id="locale">
<WizardAction
wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_LOCALE;end"
id="locale">
<result wizard:action="sim_missing" />
</WizardAction>
<WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_SIM_MISSING;end" id="sim_missing">
<WizardAction
wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_SIM_MISSING;end"
id="sim_missing">
<result wizard:action="network_setup" />
</WizardAction>
<WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_NETWORK_SETUP;end" id="network_setup">
<WizardAction
wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_NETWORK_SETUP;end"
id="network_setup">
<result wizard:action="datetime" />
</WizardAction>
<WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_DATETIME;end" id="datetime">
<WizardAction
wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_DATETIME;end"
id="datetime">
<result wizard:action="restore" />
</WizardAction>
<WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_RESTORE_BACKUP;end" id="restore">
<WizardAction
wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_RESTORE_BACKUP;end"
id="restore">
<result wizard:action="location_settings" />
</WizardAction>
<WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_LOCATION_SETTINGS;end" id="location_settings">
<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">
<WizardAction
wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.DEVICE_SPECIFIC;end"
id="device_specific">
<result wizard:action="recovery_update" />
</WizardAction>
<WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_RECOVERY_UPDATE;end" id="recovery_update">
<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">
<WizardAction
wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_SETTINGS;end"
id="lineage_settings">
<result wizard:action="lockscreen_settings" />
</WizardAction>
<WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_LOCKSCREEN_SETTINGS;end" id="lockscreen_settings">
<WizardAction
wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_LOCKSCREEN_SETTINGS;end"
id="lockscreen_settings">
<result wizard:action="biometric_settings" />
</WizardAction>
<WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_BIOMETRIC_SETTINGS;end" id="biometric_settings">
<WizardAction
wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_BIOMETRIC_SETTINGS;end"
id="biometric_settings">
<result wizard:action="theme_settings" />
</WizardAction>
<WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.THEME_SETTINGS;end" id="theme_settings">
<WizardAction
wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.THEME_SETTINGS;end"
id="theme_settings">
<result wizard:action="navigation_settings" />
</WizardAction>
<WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.NAVIGATION_SETTINGS;end" id="navigation_settings">
<WizardAction
wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.NAVIGATION_SETTINGS;end"
id="navigation_settings">
<result wizard:action="finish" />
</WizardAction>
<WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_SETUP_COMPLETE;end" id="finish" />
<WizardAction
wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_SETUP_COMPLETE;end"
id="finish" />
</WizardScript>

View File

@@ -18,20 +18,28 @@
-->
<WizardScript xmlns:wizard="http://schemas.android.com/apk/res/com.google.android.setupwizard"
wizard:firstAction="welcome">
wizard:firstAction="welcome">
<WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_WELCOME;end" id="welcome">
<WizardAction
wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_WELCOME;end"
id="welcome">
<result wizard:action="restore" />
</WizardAction>
<WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_RESTORE_BACKUP;end" id="restore">
<WizardAction
wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_RESTORE_BACKUP;end"
id="restore">
<result wizard:action="location_settings" />
</WizardAction>
<WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_LOCATION_SETTINGS;end" id="location_settings">
<WizardAction
wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_LOCATION_SETTINGS;end"
id="location_settings">
<result wizard:action="finish" />
</WizardAction>
<WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_SETUP_COMPLETE;end" id="finish" />
<WizardAction
wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_SETUP_COMPLETE;end"
id="finish" />
</WizardScript>

View File

@@ -17,36 +17,52 @@
-->
<WizardScript xmlns:wizard="http://schemas.android.com/apk/res/com.google.android.setupwizard"
wizard:firstAction="welcome">
wizard:firstAction="welcome">
<WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_WELCOME;end" id="welcome">
<WizardAction
wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_WELCOME;end"
id="welcome">
<result wizard:action="restore" />
</WizardAction>
<WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_RESTORE_BACKUP;end" id="restore">
<WizardAction
wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_RESTORE_BACKUP;end"
id="restore">
<result wizard:action="location_settings" />
</WizardAction>
<WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_LOCATION_SETTINGS;end" id="location_settings">
<WizardAction
wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_LOCATION_SETTINGS;end"
id="location_settings">
<result wizard:action="lockscreen_settings" />
</WizardAction>
<WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_LOCKSCREEN_SETTINGS;end" id="lockscreen_settings">
<WizardAction
wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_LOCKSCREEN_SETTINGS;end"
id="lockscreen_settings">
<result wizard:action="biometric_settings" />
</WizardAction>
<WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_BIOMETRIC_SETTINGS;end" id="biometric_settings">
<WizardAction
wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_BIOMETRIC_SETTINGS;end"
id="biometric_settings">
<result wizard:action="theme_settings" />
</WizardAction>
<WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.THEME_SETTINGS;end" id="theme_settings">
<WizardAction
wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.THEME_SETTINGS;end"
id="theme_settings">
<result wizard:action="navigation_settings" />
</WizardAction>
<WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.NAVIGATION_SETTINGS;end" id="navigation_settings">
<WizardAction
wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.NAVIGATION_SETTINGS;end"
id="navigation_settings">
<result wizard:action="finish" />
</WizardAction>
<WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_SETUP_COMPLETE;end" id="finish" />
<WizardAction
wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_SETUP_COMPLETE;end"
id="finish" />
</WizardScript>

View File

@@ -30,7 +30,7 @@
<attr name="internalMinWidth" format="dimension" />
<attr name="internalMaxWidth" format="dimension" />
<attr name="internalLayout" format="reference" />
<attr name="virtualButtonPressedDrawable" format="reference"/>
<attr name="virtualButtonPressedDrawable" format="reference" />
</declare-styleable>
<declare-styleable name="NavigationLayout">

View File

@@ -231,7 +231,8 @@ public class FinishActivity extends BaseSetupWizardActivity {
try {
overlayManager.setEnabledExclusiveInCategory(selectedNavMode, USER_CURRENT);
} catch (Exception e) {}
} catch (Exception e) {
}
}
}

View File

@@ -32,7 +32,9 @@ public class NavigationLayout extends RelativeLayout {
*/
public interface NavigationBarListener {
void onNavigateBack();
void onNavigateNext();
void onSkip();
}
@@ -48,7 +50,7 @@ public class NavigationLayout extends RelativeLayout {
FooterButtonStyleUtils.applySecondaryButtonPartnerResource(context, mSkipButton, true);
TypedArray a = context.getTheme().obtainStyledAttributes(
attrs, R.styleable.NavigationLayout, 0, 0);
attrs, R.styleable.NavigationLayout, 0, 0);
final boolean showSkipButton;
try {
showSkipButton = a.getBoolean(

View File

@@ -109,10 +109,8 @@ public class NavigationSettingsActivity extends BaseSetupWizardActivity {
mHideGesturalHint.setVisibility(View.GONE);
}
radioGroup.setOnCheckedChangeListener(new OnCheckedChangeListener() {
@Override
public void onCheckedChanged(RadioGroup group, int checkedId) {
switch (checkedId) {
radioGroup.setOnCheckedChangeListener((group, checkedId) -> {
switch (checkedId) {
case R.id.radio_gesture:
mSelection = NAV_BAR_MODE_GESTURAL_OVERLAY;
navigationIllustration
@@ -129,16 +127,15 @@ public class NavigationSettingsActivity extends BaseSetupWizardActivity {
navigationIllustration.setAnimation(R.raw.lottie_system_nav_3_button);
hideHintCheckBox();
break;
}
navigationIllustration.playAnimation();
}
navigationIllustration.playAnimation();
});
}
private void revealHintCheckbox() {
if (mIsTaskbarEnabled) {
return;
return;
}
mHideGesturalHint.animate().cancel();
@@ -150,14 +147,14 @@ public class NavigationSettingsActivity extends BaseSetupWizardActivity {
mHideGesturalHint.setVisibility(View.VISIBLE);
mHideGesturalHint.setAlpha(0.0f);
mHideGesturalHint.animate()
.translationY(0)
.alpha(1.0f)
.setListener(null);
.translationY(0)
.alpha(1.0f)
.setListener(null);
}
private void hideHintCheckBox() {
if (mIsTaskbarEnabled) {
return;
return;
}
if (mHideGesturalHint.getVisibility() == View.INVISIBLE) {
@@ -165,15 +162,15 @@ public class NavigationSettingsActivity extends BaseSetupWizardActivity {
}
mHideGesturalHint.animate()
.translationY(-mHideGesturalHint.getHeight())
.alpha(0.0f)
.setListener(new AnimatorListenerAdapter() {
@Override
public void onAnimationEnd(Animator animation) {
super.onAnimationEnd(animation);
mHideGesturalHint.setVisibility(View.INVISIBLE);
}
});
.translationY(-mHideGesturalHint.getHeight())
.alpha(0.0f)
.setListener(new AnimatorListenerAdapter() {
@Override
public void onAnimationEnd(Animator animation) {
super.onAnimationEnd(animation);
mHideGesturalHint.setVisibility(View.INVISIBLE);
}
});
}
@Override