Commit Graph

124348 Commits

Author SHA1 Message Date
Xin Li
57c5a99b9f [automerger skipped] Merge "Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994" into stage-aosp-master am: f64573ee7c -s ours
am skip reason: Merged-In I07d10fb2cb1cb267bc78b0be2c930d7dec9d9c76 with SHA-1 a568dc677b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22726134

Change-Id: Ica592b8926aca252eb1384319bd886b633ac185f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 18:18:31 +00:00
Xin Li
b27298c4fe [automerger skipped] Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994 am: 752715c5ca -s ours
am skip reason: Merged-In I07d10fb2cb1cb267bc78b0be2c930d7dec9d9c76 with SHA-1 a568dc677b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22726134

Change-Id: I384b965aecd6723b49042933cd1116365da09f57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 18:15:13 +00:00
Xin Li
f64573ee7c Merge "Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994" into stage-aosp-master 2023-04-21 17:40:03 +00:00
Jagrut Desai
857adef229 Merge "Adding support for calling into SystemNavigationGestureSettings" into udc-dev am: eea8283783 am: 2146420ddf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22773634

Change-Id: I1788c4d327ccc1bf233436da827ebbe3df337117
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 17:39:28 +00:00
Jagrut Desai
5750a04d1a Merge "Adding support for calling into SystemNavigationGestureSettings" into udc-dev am: eea8283783 am: 00906998af
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22773634

Change-Id: I94b6f2bdf88678c2a2b69447a3b2a24d03f1fa62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 17:36:48 +00:00
Jagrut Desai
00906998af Merge "Adding support for calling into SystemNavigationGestureSettings" into udc-dev am: eea8283783
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22773634

Change-Id: I8d8a79246658fd74fef0d536a750bd4cd6ae74f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 16:58:26 +00:00
Jagrut Desai
2146420ddf Merge "Adding support for calling into SystemNavigationGestureSettings" into udc-dev am: eea8283783
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22773634

Change-Id: I52091f5f80e53ac7a2545a7fd7bde6a8db5b4976
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 16:55:59 +00:00
Randy Pfohl
f572cc569e Ensure we launch gesture tutorial as new task
test: built for two pane device and verified it opens full screen
bug: 278918583
Change-Id: Icee33cb4a931e3037eab8e0146eddca55a5fd09d
2023-04-21 16:53:04 +00:00
Jagrut Desai
eea8283783 Merge "Adding support for calling into SystemNavigationGestureSettings" into udc-dev 2023-04-21 16:16:31 +00:00
Presubmit Automerger Backend
56c8b39d51 [automerge] Replace the SlicePreference with Preference 2p: 794fc58235
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22755956

Bug: 270544054
Change-Id: I88bb34649b2a1da21e6a3a36d90bd32c17ffb5ae
2023-04-21 15:08:44 +00:00
SongFerngWang
794fc58235 Replace the SlicePreference with Preference
The Settings' 2 panel did not support SlicePreference, since it
always open activity with NEW_TASK and it casues the settings can't
set new page at right side.

Bug: 270544054
Test: build pass. local test: the phone pair the buds with fastpair, and
then check the slice preferences.
atest BlockingPrefWithSliceControllerTest (pass)

Change-Id: I0e8abfd284492f04ab322a5bed13741fc6b25b34
2023-04-21 23:08:06 +08:00
Ioana Alexandru
e18a7140f3 Add keywords for AOD setting.
Used the WiFi slice for inspiration: ag/6793584

Also added "ambient" to the keywords, since "ambient display" is another
phrase used for AOD.

Bug: 279029717
Test: manually checked that the setting shows up when searching for
"aod"
Change-Id: I8a3a4a6635c9724565426b859722242d2bae9e49
2023-04-21 12:54:56 +00:00
Automerger Merge Worker
8fd79cc038 Merge "Merge "List apps which requested the TURN_SCREEN_ON appOp permission" into udc-dev am: 134bea1957 am: 92dbbe576e" 2023-04-21 10:38:41 +00:00
Philip Junker
e88780c9a2 Merge "List apps which requested the TURN_SCREEN_ON appOp permission" into udc-dev am: 134bea1957 am: 92dbbe576e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22724663

Change-Id: I71eecd6aab2759fc683cf269dad4b97efb0c60ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 10:37:55 +00:00
Philip Junker
9e34ccd80f Merge "List apps which requested the TURN_SCREEN_ON appOp permission" into udc-dev am: 134bea1957 am: a9e09ac0ce
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22724663

Change-Id: I5d184e66b6581e5eeb6620ed0d17fc493384e602
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 10:37:38 +00:00
Philip Junker
a9e09ac0ce Merge "List apps which requested the TURN_SCREEN_ON appOp permission" into udc-dev am: 134bea1957
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22724663

Change-Id: I7edb0846e9d07ad966fdb3753d02481d4b959cfb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 10:20:25 +00:00
Philip Junker
92dbbe576e Merge "List apps which requested the TURN_SCREEN_ON appOp permission" into udc-dev am: 134bea1957
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22724663

Change-Id: Iebc8f31e8fac4bddee8687c124c56c3883784b08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 10:20:24 +00:00
Philip Junker
134bea1957 Merge "List apps which requested the TURN_SCREEN_ON appOp permission" into udc-dev 2023-04-21 10:07:47 +00:00
Bill Lin
563a6cfa47 Merge "Add Null check FingerprintSettings#updateAddPreference()" into udc-dev am: a958fc79c8 am: cb8fea4125
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22668309

Change-Id: I371d1ecc46da805667f77951d148e184611d62a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 08:35:52 +00:00
Bill Lin
ffe7901613 Merge "Add Null check FingerprintSettings#updateAddPreference()" into udc-dev am: a958fc79c8 am: 73b4163534
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22668309

Change-Id: I289891a055dc36b7df2158de3ef0a12666c80a31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 08:31:07 +00:00
Bill Lin
cb8fea4125 Merge "Add Null check FingerprintSettings#updateAddPreference()" into udc-dev am: a958fc79c8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22668309

Change-Id: I6fe18e9aba304628a45c48eb58e2b234053ff072
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 08:13:08 +00:00
Bill Lin
73b4163534 Merge "Add Null check FingerprintSettings#updateAddPreference()" into udc-dev am: a958fc79c8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22668309

Change-Id: I99ec5143d6367180b2a33262b50b07724dbacc6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 08:13:02 +00:00
Automerger Merge Worker
77cd3e4dba Merge changes from topic "am-d0afe5da0ab5418285b38d27ffa2f92d"
* changes:
  [automerger skipped] Merge "Back up the smooth display setting" into udc-dev am: 85d5e3efb8 -s ours am: 1fc920d0cf -s ours
  [automerger skipped] Back up the smooth display setting am: 5c42659602 -s ours am: 157fe7c4b7 -s ours
2023-04-21 08:12:42 +00:00
Piotr Wilczyński
b9c74127b5 [automerger skipped] Merge "Back up the smooth display setting" into udc-dev am: 85d5e3efb8 -s ours am: 1fc920d0cf -s ours
am skip reason: Merged-In Ib2cb2dd100f06f5452083b7606109a486e795a0e with SHA-1 af320436fb is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21957485

Change-Id: Ia247228af654d1f73e77d6c85d772c94683213ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 08:11:56 +00:00
Piotr Wilczyński
3ad5f33f08 [automerger skipped] Merge "Back up the smooth display setting" into udc-dev am: 85d5e3efb8 am: 55110e699e -s ours
am skip reason: Merged-In Ib2cb2dd100f06f5452083b7606109a486e795a0e with SHA-1 af320436fb is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21957485

Change-Id: I1c5b28081da4782ac5e97384acd8fd15da6e891b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 08:11:28 +00:00
Piotr Wilczyński
0207b007eb [automerger skipped] Back up the smooth display setting am: 5c42659602 -s ours am: 157fe7c4b7 -s ours
am skip reason: Merged-In Ib2cb2dd100f06f5452083b7606109a486e795a0e with SHA-1 af320436fb is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21957485

Change-Id: I258ddffd14f39e2662bf8b77e613d80e30700457
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 08:11:09 +00:00
Piotr Wilczyński
55110e699e Merge "Back up the smooth display setting" into udc-dev am: 85d5e3efb8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21957485

Change-Id: Ie2d6effc0447df1c0048df01f6be1c90f1d19a1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 07:56:50 +00:00
Piotr Wilczyński
1fc920d0cf [automerger skipped] Merge "Back up the smooth display setting" into udc-dev am: 85d5e3efb8 -s ours
am skip reason: Merged-In Ib2cb2dd100f06f5452083b7606109a486e795a0e with SHA-1 af320436fb is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21957485

Change-Id: Id32d9d31e5776e0d88c76ccde881fa337b1ad283
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 07:56:31 +00:00
Piotr Wilczyński
157fe7c4b7 [automerger skipped] Back up the smooth display setting am: 5c42659602 -s ours
am skip reason: Merged-In Ib2cb2dd100f06f5452083b7606109a486e795a0e with SHA-1 af320436fb is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21957485

Change-Id: I7b3e7d7d1d4096680a38656f18e29e2d86e83036
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 07:56:28 +00:00
Bill Lin
a958fc79c8 Merge "Add Null check FingerprintSettings#updateAddPreference()" into udc-dev 2023-04-21 07:35:55 +00:00
Piotr Wilczyński
85d5e3efb8 Merge "Back up the smooth display setting" into udc-dev 2023-04-21 07:31:47 +00:00
Automerger Merge Worker
5e5212839f Merge "Merge "Fix BatteryChartPreferenceControllerTest Fail" into udc-dev am: 0c1838807d am: 4334ccb662" 2023-04-21 07:06:52 +00:00
Treehugger Robot
c356942122 Merge "Fix BatteryChartPreferenceControllerTest Fail" into udc-dev am: 0c1838807d am: 4f3e5c3a67
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22779517

Change-Id: I9714b0bf6eec68e81e2ee1dba7df96d5aaa7db9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 07:06:10 +00:00
Treehugger Robot
8dc1c2600e Merge "Fix BatteryChartPreferenceControllerTest Fail" into udc-dev am: 0c1838807d am: 4334ccb662
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22779517

Change-Id: I6aeca930d43a9a20bd3acd1b24cab76e1b576376
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 07:06:03 +00:00
Zaiyue Xue
aea4d365a6 Fix b/279120121: Unplug 100% Pixel phone won't reset the battery usage data when the phone is just started.
Bug: 279120121
Fix: 279120121
Test: manual
Change-Id: Ie793266f8453a2902d7e16e5c58443a3c7bf55ef
2023-04-21 14:43:10 +08:00
Treehugger Robot
4334ccb662 Merge "Fix BatteryChartPreferenceControllerTest Fail" into udc-dev am: 0c1838807d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22779517

Change-Id: Ib98306fe33abe1520124309d84c13580e0c57a04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 06:28:02 +00:00
Treehugger Robot
4f3e5c3a67 Merge "Fix BatteryChartPreferenceControllerTest Fail" into udc-dev am: 0c1838807d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22779517

Change-Id: Id83eadb6177a8424a0a28d87633971f7fd58e858
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 06:27:59 +00:00
Treehugger Robot
0c1838807d Merge "Fix BatteryChartPreferenceControllerTest Fail" into udc-dev 2023-04-21 05:57:43 +00:00
TreeHugger Robot
29ca96abbe Merge "[Settings] Dialog does not show full msg and title in landscape mode" into udc-dev am: 06a4e06291 am: e7a1f12ea0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22747102

Change-Id: I9d50709a44e16e4476ee19f7143561669e5d4def
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 05:44:03 +00:00
TreeHugger Robot
6697ace351 Merge "[Settings] Dialog does not show full msg and title in landscape mode" into udc-dev am: 06a4e06291 am: c49f871054
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22747102

Change-Id: I6e29d1464b7e9697dab861a4931219b534b545aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 05:43:48 +00:00
Weng Su
bf0e8c1dc7 Restart Wi-Fi tethering automatically if configuration change
- When the Wi-Fi Hotspot is already started, if the user changes the configuration, the Wi-Fi Hotspot will be restarted automatically.

- When the Wi-Fi hotspot restarts, display a circle on the screen to indicate that it is processing.

Bug: 245258763
Test: manual test
atest -c WifiTetherSettingsTest \
         WifiHotspotSpeedSettingsTest
atest -c WifiHotspotRepositoryTest \
         WifiHotspotSecuritySettingsTest \
         WifiHotspotSecurityViewModelTest \
         WifiHotspotSpeedViewModelTest \
         WifiTetherViewModelTest

Change-Id: I6fdd5892916703095f28d0589ebc3b7dd59fcd61
2023-04-21 13:06:44 +08:00
TreeHugger Robot
e7a1f12ea0 Merge "[Settings] Dialog does not show full msg and title in landscape mode" into udc-dev am: 06a4e06291
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22747102

Change-Id: Iae6ef0f7100dde1b24cffbb2fc447fec14597f12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 05:05:11 +00:00
TreeHugger Robot
c49f871054 Merge "[Settings] Dialog does not show full msg and title in landscape mode" into udc-dev am: 06a4e06291
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22747102

Change-Id: Ic68000e73a6ea830c39820400ca5da9aec2d3435
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 05:04:03 +00:00
TreeHugger Robot
06a4e06291 Merge "[Settings] Dialog does not show full msg and title in landscape mode" into udc-dev 2023-04-21 04:28:19 +00:00
Zaiyue Xue
74d8a4b745 Fix BatteryChartPreferenceControllerTest Fail
Bug: 279107937
Fix: 279107937
Test: presubmit
Change-Id: Ie5597361e4c3c90737b8dcfc302fc3aad94ea476
2023-04-21 11:12:14 +08:00
lbill
8e12f5257d Add Null check FingerprintSettings#updateAddPreference()
When fingerprint finish enrollment, user click Done
The flow would be:
-> wm_finish_activity
-> relaunch_resume_activity
-> wm_on_destroy_called
-> wm_on_create_called
-> wm_on_start_called
-> wm_on_activity_result_called
   In U, we need to add NPE check when updateAddPreference()
   earlier then addFingerprintItemPreferences()
-> wm_on_resume_called

Bug: 275519315
Test: manual enroll SFPS, in FingerprintEnrollEnrolling,
      rotate device, then complete the enrollment
      verify the flow never crash and user can see enrolled
      fingerprint in FingerprintSettings

Change-Id: Ia262741aeceeb36eefd159ad2ca1c9fa0e061d54
2023-04-21 02:24:43 +00:00
Daniel Norman
c14d26462b Adds TEST_MAPPING for Settings > Accessibility unit tests.
This initial TEST_MAPPING file is postsubmit only until we validate
which tests are stable enough to be moved to presubmit and which need
fixes.

Bug: 267225211
Test: atest --test-mapping packages/apps/Settings/src/com/android/settings/accessibility
Change-Id: I5e5f337d4ea7618ab92d3daa5171fd8ee1508c59
2023-04-20 22:04:11 +00:00
Yuxin Hu
fd5aaae591 Merge "Add permission to use GPU service APIs" into udc-dev am: 76e769cdb0 am: 77b9ebf525
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22638748

Change-Id: I42c582cceb36b02aa28013ccfe5fad19435d233e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-20 21:27:42 +00:00
Yuxin Hu
09f0850e96 Merge "Add permission to use GPU service APIs" into udc-dev am: 76e769cdb0 am: 518a3ae57a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22638748

Change-Id: Ifd8fe23c5ca7c449c96cea037f40f959d863d0fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-20 21:24:51 +00:00
Yuxin Hu
518a3ae57a Merge "Add permission to use GPU service APIs" into udc-dev am: 76e769cdb0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22638748

Change-Id: Ib87b1532a8256e18529d665378f56c0033e9cc35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-20 21:23:19 +00:00