Chaohui Wang
52b723beef
Revert "[Settings] Adjusting the control of display sequence (part 2)"
...
This reverts commit 6b379cd7cf
.
Bug: 277162513
Test: Manual
Change-Id: Iea61c06d328626a96c13c4c9f8a11f8329401b35
2023-04-22 08:47:20 +08:00
Bill Yi
51a04e12bf
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I627c552f8da0bc57708bffa767acfdb1f4fe9e12
2023-04-21 17:25:02 -07:00
Bill Yi
71c7b5f54c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I747a6dd6b0d5c4b2d23e7334887745ec86c51c11
2023-04-21 17:19:35 -07:00
Bill Yi
5c646d4394
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I127281eb9e0cd43de528e58fe5db67ae55fe10b1
2023-04-21 17:16:56 -07:00
Xin Li
974f0f3762
[automerger skipped] Merge "Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994" into stage-aosp-master am: f64573ee7c
-s ours am: 57c5a99b9f
-s ours am: eb2cb56f9b
-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: If38dfd0871f7cf5717c12806c0f76d580ea0f57f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-21 23:14:42 +00:00
Xin Li
fe8a6baae3
[automerger skipped] Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994 am: 752715c5ca
-s ours am: b27298c4fe
-s ours am: ce8657848c
-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: I4aa4bbfb486036d7ac61943b48310d49ca89b5dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-21 23:11:50 +00:00
Xin Li
eb2cb56f9b
[automerger skipped] Merge "Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994" into stage-aosp-master am: f64573ee7c
-s ours am: 57c5a99b9f
-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: I4127df037d90c6b9ac4c9a63a7cc02ff967abf3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-21 22:36:27 +00:00
Xin Li
ce8657848c
[automerger skipped] Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994 am: 752715c5ca
-s ours am: b27298c4fe
-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: I28a18e0f9c9d0f394026476f10b620286a877786
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-21 22:34:06 +00:00
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
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
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
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
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
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
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
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
0c1838807d
Merge "Fix BatteryChartPreferenceControllerTest Fail" into udc-dev
2023-04-21 05:57:43 +00: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
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
Yuxin Hu
77b9ebf525
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: I61ce5d1606e66479820abf0a15efc390dba80cae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 21:20:18 +00:00
Jagrut Desai
c36081b833
Adding support for calling into SystemNavigationGestureSettings
...
For taskbar pinning feasture we need to link user to navigation mode system settings,
this CL will create
- New NavigationModeSettingsActivity
- Intent Filter to invoke SystemNavigationGestureSettings
Test: Manual
Bug: 279069606
Flag: not needed
Change-Id: I55b47d158d18bcb075329f795f15b2e6fc2ea810
2023-04-20 13:55:47 -07:00
Tetiana Meronyk
be328cb743
Merge "Add confirmation dialog when granting/revoking admin privileges." into udc-dev am: 84da171439
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22618756
Change-Id: I9ea8083d6b24522f8771977a15d4e06d3059d204
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 20:15:02 +00:00
Ken Lin
947f9f2553
Merge "Smooth Display description error" into udc-dev am: 24a5a1c824
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22693748
Change-Id: Ia06e9e7f22400e884bd3effdb6995564f2b116df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 20:12:54 +00:00
Elliot Sisteron
18fd113737
Merge "Launch work profile entries intent in the profile parent." into udc-dev am: 0a506448b8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22714062
Change-Id: I937ff5894ffb7f000824044981cedc3b2eb63080
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 20:12:44 +00:00
Treehugger Robot
72823d814d
Merge "Change battery usage dropdown list item texts from "Breakdown by ..." to "By ..."" into udc-dev am: 8609ef2291
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22753624
Change-Id: Ib73a0321690d7b5f62125052b40497a0c4dbadbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 20:12:34 +00:00
Treehugger Robot
36ed86a6c5
Merge "Update the proper App battery usage string on App info page" into udc-dev am: bc67d885ec
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22753622
Change-Id: Ifa36325db77fe06b13ec95310b07b2df03d4ce29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 20:12:17 +00:00
ykhung
89573cd826
Update battery tip main icon into materiel theme design am: ff65a02ff8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22746582
Change-Id: I29e3e2aeff9595443fbb83be7ef7a2f95a4aa475
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 20:12:08 +00:00
Karishma Vakil
9ae6caac07
Merge "[Safety Labels] Enable safety label change notifications flag by default in Settings code" into udc-dev am: 85e5174132
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22748283
Change-Id: Id06452bb09dd23cbaa2e6803ec92c0cb293a7f7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 20:12:01 +00:00
Chaohui Wang
7d063294d8
Merge "Fix button label missing in the SIM card pop ups" into udc-dev am: ac2dc8dd01
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22731782
Change-Id: Ib03b3040068455718a580b59d288390e0ef4d37a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 20:11:52 +00:00
TreeHugger Robot
63b579aa52
Merge "[BiometricsV2] Fix fingerprint add another fail" into udc-dev am: d21225790b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22740561
Change-Id: I3fea57afdfaafdfe7a96fa82c28c86c4f68a91ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 20:11:43 +00:00
TreeHugger Robot
0b2f7c967a
Merge "Fix RTL display problem in Open by default" into udc-dev am: fb52240afe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22700244
Change-Id: I27756cc3637a0e3a841e9a07303685e774b3f350
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 20:11:33 +00:00
Becca Hughes
5f5c6ed682
DO NOT MERGE Live update cred man settings am: d8b74b5c39
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22746581
Change-Id: I30fa4a6571c425085144a6b78362c15ac51745c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 20:11:23 +00:00
Bill Yi
36502b6afe
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 367bedb886
-s ours am: 3e8d5a6747
-s ours am: c205fe957a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696133
Change-Id: Ia797c4eca1ad0591509d48c3e892da86dd5f37a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 20:10:29 +00:00
Julia Tuttle
e81af0ad4e
Merge "Clarify full screen intent permission text" into udc-dev am: 8af4cf48ea
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22680610
Change-Id: Ib434b5e4190dd486f7bf55378bc14950c6132dbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 19:57:38 +00:00
Bill Yi
e69c91f7e4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b660ca5570
-s ours am: 34a76b5ade
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696128
Change-Id: I2ec5126d97ac337e1c7f59c1f65ce211ca12d589
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 19:42:53 +00:00
Yuxin Hu
76e769cdb0
Merge "Add permission to use GPU service APIs" into udc-dev
2023-04-20 18:05:47 +00:00
Bill Yi
dc6f992c92
Merge changes from topic "tc_change_23041807_35" into tm-qpr-dev-plus-aosp am: 7d7a461c85
am: 436870a9f8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696133
Change-Id: I2aca004596e6269d472b572a195366d374041850
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 17:00:18 +00:00
Bill Yi
2079f856fa
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 4ff10a38f4
am: 7fc6abdfb9
-s ours am: c173d9de53
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696133
Change-Id: If245d64ee814f43d70e645098738d9eaf3a0d467
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 17:00:03 +00:00
Diya Bera
06a58409b5
Merge "Adding owners" am: b1aabec0db
am: 49ea4e5d22
am: 8a31106496
am: 6fbfec99c8
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2546170
Change-Id: Id79d4e7f1b40509ec145627a86a892d4b3d68d1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 16:59:02 +00:00
Bill Yi
4f7dc016bc
Merge changes from topic "tc_change_23041807_28" into udc-dev am: ddff8a4b4d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696128
Change-Id: I8e49a528c978f01a04dd990e46b9ab7526c2eb36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 16:54:52 +00:00
Bill Yi
de86fc18b4
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 488128bd1d
am: dc1e24b89e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696128
Change-Id: Ifdeea72838e3264d3bf8814ab4ae24863e7d35ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 16:54:43 +00:00
Tetiana Meronyk
84da171439
Merge "Add confirmation dialog when granting/revoking admin privileges." into udc-dev
2023-04-20 15:12:57 +00:00