diff --git a/Android.bp b/Android.bp index 907ff12bc86..32b1c90b3c5 100644 --- a/Android.bp +++ b/Android.bp @@ -55,6 +55,7 @@ android_library { srcs: [ "src/**/*.java", "src/**/*.kt", + "src/**/*.aidl", ], exclude_srcs: [ "src/com/android/settings/biometrics/fingerprint2/lib/**/*.kt", @@ -91,8 +92,10 @@ android_library { "WindowManager-Shell-shared-desktopMode", // Settings dependencies + "google_battery", "FingerprintManagerInteractor", "MediaDrmSettingsFlagsLib", + "ReverseWirelessCharging", "Settings-change-ids", "SettingsLib", "SettingsLibActivityEmbedding", diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 2295ee3dd1a..4d94a50f03b 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -148,11 +148,13 @@ + + + + + + + + + + @@ -628,6 +644,7 @@ @@ -2210,6 +2227,23 @@ android:value="@string/menu_key_safety_center"/> + + + + + + + + + + + + + + + + + + + + + + + @@ -3032,6 +3086,12 @@ android:enableOnBackInvokedCallback="false" android:windowSoftInputMode="stateVisible|adjustResize"/> + + @@ -5321,6 +5382,12 @@ android:value="@string/menu_key_apps"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/drawable/baseline_wifi.xml b/res/drawable/baseline_wifi.xml new file mode 100644 index 00000000000..e8b85e7ced0 --- /dev/null +++ b/res/drawable/baseline_wifi.xml @@ -0,0 +1,10 @@ + + + diff --git a/res/drawable/baseline_wifi_glif.xml b/res/drawable/baseline_wifi_glif.xml new file mode 100644 index 00000000000..3f12842b089 --- /dev/null +++ b/res/drawable/baseline_wifi_glif.xml @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/res/drawable/ic_launcher_foreground.xml b/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 00000000000..3a707cae45d --- /dev/null +++ b/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + diff --git a/res/drawable/ic_settings_install.xml b/res/drawable/ic_settings_install.xml index 5bd5e300eae..eefecc242a4 100644 --- a/res/drawable/ic_settings_install.xml +++ b/res/drawable/ic_settings_install.xml @@ -18,7 +18,8 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24"> + android:viewportHeight="24" + android:tint="?android:attr/colorControlNormal"> diff --git a/res/layout/choose_biometric_second_factor_pin.xml b/res/layout/choose_biometric_second_factor_pin.xml new file mode 100644 index 00000000000..c2eb13ae537 --- /dev/null +++ b/res/layout/choose_biometric_second_factor_pin.xml @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/layout/duress_password_setup.xml b/res/layout/duress_password_setup.xml new file mode 100644 index 00000000000..a708b3fc3e5 --- /dev/null +++ b/res/layout/duress_password_setup.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + diff --git a/res/layout/settings_main_prefs.xml b/res/layout/settings_main_prefs.xml index 48352e2efa0..5111332bfbe 100644 --- a/res/layout/settings_main_prefs.xml +++ b/res/layout/settings_main_prefs.xml @@ -34,40 +34,38 @@ android:layout_height="0dp" android:layout_weight="1"/> - - -