Commit Graph

88308 Commits

Author SHA1 Message Date
Menghan Li
87fd9a6816 Merge "Move DialogEumn into AccessibilityDialogUtils" into sc-dev am: 0a9d2385f0 am: f9934b37d3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14860441

Change-Id: I66b8de764f6b69a40264a122100e81c8adc169d9
2021-06-09 06:04:09 +00:00
Tsung-Mao Fang
72aa238948 Merge "Remove the large space when searching region list" into sc-dev am: 0a8ab3a543 am: 5371a47dcc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880232

Change-Id: I6d0ab930d9406f7097dc35979f9799055ab0cb62
2021-06-09 06:04:00 +00:00
Menghan Li
f9934b37d3 Merge "Move DialogEumn into AccessibilityDialogUtils" into sc-dev am: 0a9d2385f0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14860441

Change-Id: I33c8ef3b4ae7bbd5027416376a27d192a38faaf2
2021-06-09 05:49:21 +00:00
Tsung-Mao Fang
5371a47dcc Merge "Remove the large space when searching region list" into sc-dev am: 0a8ab3a543
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880232

Change-Id: I5167ded98e1546b5cbbb5ce609dd8c7adc62b393
2021-06-09 05:49:16 +00:00
Menghan Li
0a9d2385f0 Merge "Move DialogEumn into AccessibilityDialogUtils" into sc-dev 2021-06-09 05:41:00 +00:00
Tsung-Mao Fang
0a8ab3a543 Merge "Remove the large space when searching region list" into sc-dev 2021-06-09 05:34:23 +00:00
Edgar Wang
989df60cf4 Merge "Move Power menu from Gesture to System Settings" into sc-dev am: b62dedf9c8 am: 7e4e3c0bfb am: 4e090c959c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880631

Change-Id: Id39fc27f7d227b29e6c1608ac6afa30a50abdbb6
2021-06-09 04:45:03 +00:00
TreeHugger Robot
6d6c97cfae Merge "Fix AppBatteryPreferenceControllerTest test fail" into sc-dev am: 75d3635712 am: e4629ec709 am: 962a1e51fc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14860446

Change-Id: Idf58c4f135b12166690fa20bb93c61d4f3f35705
2021-06-09 04:44:02 +00:00
Edgar Wang
9ab7f14b16 Merge "Move Power menu from Gesture to System Settings" into sc-dev am: b62dedf9c8 am: ceff426418 am: 5d52c14d82
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880631

Change-Id: Id3e43508faadb379aa20b1732b5052d58fc89c83
2021-06-09 04:43:27 +00:00
TreeHugger Robot
6a168e836a Merge "Fix AppBatteryPreferenceControllerTest test fail" into sc-dev am: 75d3635712 am: 38965b8a66 am: 978559b93e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14860446

Change-Id: I062546f2638d133b04f1acb9bb84264f3067cd37
2021-06-09 04:43:08 +00:00
Edgar Wang
a1b7d68957 Merge "Move Power menu from Gesture to System Settings" into sc-dev am: b62dedf9c8 am: da4651e7c3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880631

Change-Id: Ibe6e6b41e1ad2276cf39afe69d946ddee397e4f3
2021-06-09 04:29:19 +00:00
TreeHugger Robot
c6050c893e Merge "Fix AppBatteryPreferenceControllerTest test fail" into sc-dev am: 75d3635712 am: 18fb8ec7aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14860446

Change-Id: I2dade4d55a82a92df15e726af992bb5931f94e84
2021-06-09 04:28:21 +00:00
Edgar Wang
4e090c959c Merge "Move Power menu from Gesture to System Settings" into sc-dev am: b62dedf9c8 am: 7e4e3c0bfb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880631

Change-Id: I117fe188e5d987a5671dba3139d513254ef947e6
2021-06-09 04:24:27 +00:00
TreeHugger Robot
962a1e51fc Merge "Fix AppBatteryPreferenceControllerTest test fail" into sc-dev am: 75d3635712 am: e4629ec709
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14860446

Change-Id: Ibfc8297b98691848d903617657364f3869e8993a
2021-06-09 04:23:25 +00:00
Edgar Wang
5d52c14d82 Merge "Move Power menu from Gesture to System Settings" into sc-dev am: b62dedf9c8 am: ceff426418
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880631

Change-Id: I8983c6838cc6a6bfb27a75a6e53ff87cce8586e2
2021-06-09 04:22:43 +00:00
TreeHugger Robot
978559b93e Merge "Fix AppBatteryPreferenceControllerTest test fail" into sc-dev am: 75d3635712 am: 38965b8a66
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14860446

Change-Id: Ib03a514f82a966ee885fcc70322654c610e400d9
2021-06-09 04:22:26 +00:00
Edgar Wang
da4651e7c3 Merge "Move Power menu from Gesture to System Settings" into sc-dev am: b62dedf9c8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880631

Change-Id: Icb5e999702daf38255788df00635f40b0df7c6f7
2021-06-09 04:09:04 +00:00
TreeHugger Robot
18fb8ec7aa Merge "Fix AppBatteryPreferenceControllerTest test fail" into sc-dev am: 75d3635712
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14860446

Change-Id: I7819e71116a096ffe0be80b5b274538ecf371a08
2021-06-09 04:08:24 +00:00
Edgar Wang
ceff426418 Merge "Move Power menu from Gesture to System Settings" into sc-dev am: b62dedf9c8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880631

Change-Id: I98704f6b1c936bbff4b21b53e080bb79e8fcfb42
2021-06-09 04:03:07 +00:00
TreeHugger Robot
38965b8a66 Merge "Fix AppBatteryPreferenceControllerTest test fail" into sc-dev am: 75d3635712
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14860446

Change-Id: Ia719b13569cc498ffdbf9472c1adc27a9c47a998
2021-06-09 04:02:52 +00:00
Edgar Wang
7e4e3c0bfb Merge "Move Power menu from Gesture to System Settings" into sc-dev am: b62dedf9c8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880631

Change-Id: I8b2fa2bfea2c1b775e3b249020a53a58363f435b
2021-06-09 04:01:48 +00:00
TreeHugger Robot
e4629ec709 Merge "Fix AppBatteryPreferenceControllerTest test fail" into sc-dev am: 75d3635712
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14860446

Change-Id: I3aa2df4ff6def5f12a28036ee6b866bb4ebd8f57
2021-06-09 04:01:25 +00:00
Edgar Wang
b62dedf9c8 Merge "Move Power menu from Gesture to System Settings" into sc-dev 2021-06-09 03:42:44 +00:00
TreeHugger Robot
75d3635712 Merge "Fix AppBatteryPreferenceControllerTest test fail" into sc-dev 2021-06-09 03:30:10 +00:00
Sarah Chin
7bbaa40ab6 Merge "Add NR SA OVERRIDE_NETWORK_TYPE_NR_ADVANCED for TelephonyDisplayInfo" am: 8222d88548 am: 5a173dad6c am: afd5c21606 am: 7cef9a286c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1681974

Change-Id: I8c80cd5c85885517d55be6f7b819457b2b4469d3
2021-06-08 22:39:57 +00:00
Sarah Chin
7cef9a286c Merge "Add NR SA OVERRIDE_NETWORK_TYPE_NR_ADVANCED for TelephonyDisplayInfo" am: 8222d88548 am: 5a173dad6c am: afd5c21606
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1681974

Change-Id: Iae38a6a6d6c5e55768cdf915413670f159f2f3ec
2021-06-08 22:31:14 +00:00
Sarah Chin
afd5c21606 Merge "Add NR SA OVERRIDE_NETWORK_TYPE_NR_ADVANCED for TelephonyDisplayInfo" am: 8222d88548 am: 5a173dad6c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1681974

Change-Id: Ibfd65d9a29f0167035093db1e0fee59a5064a466
2021-06-08 21:45:35 +00:00
Sarah Chin
5a173dad6c Merge "Add NR SA OVERRIDE_NETWORK_TYPE_NR_ADVANCED for TelephonyDisplayInfo" am: 8222d88548
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1681974

Change-Id: I467a109a5387e4d1bc0da4e83c6e12ceea24d6bf
2021-06-08 21:10:17 +00:00
Chen Xu
d2a9efc828 [automerger skipped] Merge "UK emergency alert app rename" into rvc-qpr-dev am: 3bdcdae23f am: 35e1f0d189 am: 665c496449 -s ours am: c327eb2f9f -s ours
am skip reason: Merged-In Ic9d4e1138113e3c90abb27ba0a72d2ed07528c1e with SHA-1 3b8c6118c1 is already in history

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

Change-Id: Ia44ebc3793a59268988ac0973ac4e2dc31a58ac2
2021-06-08 21:07:45 +00:00
Chen Xu
4e67c04104 [automerger skipped] Merge "UK emergency alert app rename" into rvc-qpr-dev am: 3bdcdae23f am: 35e1f0d189 am: 4198a5f6e1 am: c516408579 -s ours
am skip reason: Merged-In Ic9d4e1138113e3c90abb27ba0a72d2ed07528c1e with SHA-1 3b8c6118c1 is already in history

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

Change-Id: I492883bf361faa0104c1b371f68d8e6c28cbf343
2021-06-08 21:07:29 +00:00
Sarah Chin
8222d88548 Merge "Add NR SA OVERRIDE_NETWORK_TYPE_NR_ADVANCED for TelephonyDisplayInfo" 2021-06-08 20:47:10 +00:00
Chen Xu
c327eb2f9f [automerger skipped] Merge "UK emergency alert app rename" into rvc-qpr-dev am: 3bdcdae23f am: 35e1f0d189 am: 665c496449 -s ours
am skip reason: Merged-In Ic9d4e1138113e3c90abb27ba0a72d2ed07528c1e with SHA-1 3b8c6118c1 is already in history

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

Change-Id: I82b9bbad4b5fb6b48c07d1117f774bef9ca43abc
2021-06-08 20:44:57 +00:00
Chen Xu
c516408579 Merge "UK emergency alert app rename" into rvc-qpr-dev am: 3bdcdae23f am: 35e1f0d189 am: 4198a5f6e1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14645166

Change-Id: Iecdad5f2aca082dc59b75032857b8593f27a9e30
2021-06-08 20:43:26 +00:00
Chen Xu
e6237e631d [automerger skipped] Merge "UK emergency alert app rename" into rvc-qpr-dev am: 3bdcdae23f am: 35e1f0d189 am: 73f147787e -s ours
am skip reason: Merged-In Ic9d4e1138113e3c90abb27ba0a72d2ed07528c1e with SHA-1 f7e3d57023 is already in history

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

Change-Id: I63a87b5a61d223bd41e809c78801507f8a425ebb
2021-06-08 20:42:39 +00:00
Chen Xu
4198a5f6e1 Merge "UK emergency alert app rename" into rvc-qpr-dev am: 3bdcdae23f am: 35e1f0d189
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14645166

Change-Id: Iff7a47659fb1c667193d286109e1c01a575e025f
2021-06-08 20:23:44 +00:00
Chen Xu
73f147787e Merge "UK emergency alert app rename" into rvc-qpr-dev am: 3bdcdae23f am: 35e1f0d189
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14645166

Change-Id: If87642a05644da97cfee0b6cf4df0805e9c3638c
2021-06-08 20:22:14 +00:00
Chen Xu
665c496449 Merge "UK emergency alert app rename" into rvc-qpr-dev am: 3bdcdae23f am: 35e1f0d189
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14645166

Change-Id: Ia51097c7d0144d8eb7aba9ee31339ecd81ded445
2021-06-08 20:21:59 +00:00
Curtis Belmonte
6535cf58df Merge "Fix color and asset name for large face enroll icon" into sc-dev am: 99faae35fc am: 0f1d52acb9 am: 46d49468c9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14887393

Change-Id: Ic5f80143d16d2316f80fb23ec6d96da9e2055e43
2021-06-08 20:20:05 +00:00
Matt Casey
95271620fe Merge "Update system settings to honor device defaults for assistant invocation" into sc-dev am: fc10ab9c98 am: 9f962fea7b am: 67691f371c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14843840

Change-Id: I96f32b3f6b1ff4a47ac783d271c01c60a3b9f77c
2021-06-08 20:19:02 +00:00
Curtis Belmonte
ac972d829c Merge "Fix color and asset name for large face enroll icon" into sc-dev am: 99faae35fc am: 539ded515c am: ff0d166c36
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14887393

Change-Id: If7ef1d2544809577c637d190449f81d802b9e9b1
2021-06-08 20:16:06 +00:00
Matt Casey
f1b7cf56e4 Merge "Update system settings to honor device defaults for assistant invocation" into sc-dev am: fc10ab9c98 am: ac1a9c59a2 am: 2bea4a428d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14843840

Change-Id: Ic8ff2cc390d64adf55bfda151aae7fbb00e9da60
2021-06-08 20:15:43 +00:00
Chen Xu
35e1f0d189 Merge "UK emergency alert app rename" into rvc-qpr-dev am: 3bdcdae23f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14645166

Change-Id: Ia624be832a8e3f2764db2f8f5529b64a91e5b2a2
2021-06-08 20:06:21 +00:00
Curtis Belmonte
46d49468c9 Merge "Fix color and asset name for large face enroll icon" into sc-dev am: 99faae35fc am: 0f1d52acb9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14887393

Change-Id: Idab59c619c6ece1b072e09fb2d571e8cae3c3615
2021-06-08 19:59:30 +00:00
Matt Casey
67691f371c Merge "Update system settings to honor device defaults for assistant invocation" into sc-dev am: fc10ab9c98 am: 9f962fea7b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14843840

Change-Id: Ic3da2015a2ae4782ad108a631b432159bd2745dc
2021-06-08 19:59:18 +00:00
Curtis Belmonte
aa8db47c7b Merge "Fix color and asset name for large face enroll icon" into sc-dev am: 99faae35fc am: 873b52cb69
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14887393

Change-Id: I03d0513a44f054af5d2a49fbdd405cfbc227c3c3
2021-06-08 19:59:05 +00:00
Matt Casey
644b57d003 Merge "Update system settings to honor device defaults for assistant invocation" into sc-dev am: fc10ab9c98 am: eaaff9bf24
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14843840

Change-Id: Ic159ec4279f66aed983600f1801e11e5b2b7c761
2021-06-08 19:58:49 +00:00
Curtis Belmonte
ff0d166c36 Merge "Fix color and asset name for large face enroll icon" into sc-dev am: 99faae35fc am: 539ded515c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14887393

Change-Id: Ibd7744cbecc2c5d780ab358ef196926107e96b11
2021-06-08 19:53:47 +00:00
Matt Casey
2bea4a428d Merge "Update system settings to honor device defaults for assistant invocation" into sc-dev am: fc10ab9c98 am: ac1a9c59a2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14843840

Change-Id: I0082769fcbeb8a10f501bf5f43d82fa9c708829a
2021-06-08 19:52:35 +00:00
Chen Xu
3bdcdae23f Merge "UK emergency alert app rename" into rvc-qpr-dev 2021-06-08 19:50:39 +00:00
Curtis Belmonte
539ded515c Merge "Fix color and asset name for large face enroll icon" into sc-dev am: 99faae35fc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14887393

Change-Id: I22bb5932933f71c20417b267c1cad3841bed7652
2021-06-08 19:42:14 +00:00