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 |
|
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 |
|
Curtis Belmonte
|
873b52cb69
|
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: I58463c76cbf2b8f764bc5891524001c76c47cfb9
|
2021-06-08 19:42:13 +00:00 |
|
Curtis Belmonte
|
0f1d52acb9
|
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: Ibae403e665aabe9093ec2ad8fc8665828c310cf4
|
2021-06-08 19:36:53 +00:00 |
|
Curtis Belmonte
|
99faae35fc
|
Merge "Fix color and asset name for large face enroll icon" into sc-dev
|
2021-06-08 19:36:05 +00:00 |
|
Matt Casey
|
9f962fea7b
|
Merge "Update system settings to honor device defaults for assistant invocation" into sc-dev am: fc10ab9c98
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14843840
Change-Id: I7d4e1e0e613c4e5cd449f1401332a3803a27b760
|
2021-06-08 19:35:44 +00:00 |
|
Matt Casey
|
eaaff9bf24
|
Merge "Update system settings to honor device defaults for assistant invocation" into sc-dev am: fc10ab9c98
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14843840
Change-Id: I5f0b97408748f38827486bc169b4bf134d00aa1e
|
2021-06-08 19:33:30 +00:00 |
|
Matt Casey
|
ac1a9c59a2
|
Merge "Update system settings to honor device defaults for assistant invocation" into sc-dev am: fc10ab9c98
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14843840
Change-Id: I73d3ecd7950d90593acf5118baf536a3dc62974a
|
2021-06-08 19:29:44 +00:00 |
|
Matt Casey
|
fc10ab9c98
|
Merge "Update system settings to honor device defaults for assistant invocation" into sc-dev
|
2021-06-08 19:02:06 +00:00 |
|
Chen Xu
|
3b8c6118c1
|
UK emergency alert app rename
Bug: 179052608
Test: Build
Change-Id: Ic9d4e1138113e3c90abb27ba0a72d2ed07528c1e
(cherry picked from commit f7e3d57023)
Merged-in: Ic9d4e1138113e3c90abb27ba0a72d2ed07528c1e
|
2021-06-08 18:09:46 +00:00 |
|
YUKAI HUNG
|
e730fb0b6f
|
Merge "Remove BatteryTipPolicyTest first to avoid blocking presubmit" into sc-dev am: f7b90c3a7f am: 2cf56db2a2 am: dce903863e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880237
Change-Id: If842c9a9c8cda975493300e05c79d85ec3583145
|
2021-06-08 14:25:47 +00:00 |
|
YUKAI HUNG
|
444cb3ebdf
|
Merge "Remove BatteryTipPolicyTest first to avoid blocking presubmit" into sc-dev am: f7b90c3a7f am: 6c971a8a99 am: 982a0d906b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880237
Change-Id: I950f34c546a6468d38969fa7721ce6f83de61033
|
2021-06-08 14:25:23 +00:00 |
|
YUKAI HUNG
|
dce903863e
|
Merge "Remove BatteryTipPolicyTest first to avoid blocking presubmit" into sc-dev am: f7b90c3a7f am: 2cf56db2a2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880237
Change-Id: I0121183c2ea453b3dd8cf538488983d78b617665
|
2021-06-08 14:12:14 +00:00 |
|
YUKAI HUNG
|
982a0d906b
|
Merge "Remove BatteryTipPolicyTest first to avoid blocking presubmit" into sc-dev am: f7b90c3a7f am: 6c971a8a99
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880237
Change-Id: I8ba952a04dc2e327fb2309f9adc0aed24a806a4c
|
2021-06-08 14:11:10 +00:00 |
|
YUKAI HUNG
|
b7f3344b58
|
Merge "Remove BatteryTipPolicyTest first to avoid blocking presubmit" into sc-dev am: f7b90c3a7f am: 85d03642f9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880237
Change-Id: I6029a1829a27d1da0f43c2eb3af74802ae385c6c
|
2021-06-08 14:10:41 +00:00 |
|
YUKAI HUNG
|
6c971a8a99
|
Merge "Remove BatteryTipPolicyTest first to avoid blocking presubmit" into sc-dev am: f7b90c3a7f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880237
Change-Id: I13b27a08eaf329121524220071d2cec3e5be8684
|
2021-06-08 13:53:10 +00:00 |
|
YUKAI HUNG
|
2cf56db2a2
|
Merge "Remove BatteryTipPolicyTest first to avoid blocking presubmit" into sc-dev am: f7b90c3a7f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880237
Change-Id: I60f676042c197acb6744ec547e9629b960e5eddd
|
2021-06-08 13:51:43 +00:00 |
|
YUKAI HUNG
|
85d03642f9
|
Merge "Remove BatteryTipPolicyTest first to avoid blocking presubmit" into sc-dev am: f7b90c3a7f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880237
Change-Id: I8b2cf8978fd2abcc0ddf298ec4eee91ccb485ece
|
2021-06-08 13:51:38 +00:00 |
|
YUKAI HUNG
|
f7b90c3a7f
|
Merge "Remove BatteryTipPolicyTest first to avoid blocking presubmit" into sc-dev
|
2021-06-08 13:42:04 +00:00 |
|
ykhung
|
ae1797ec46
|
Remove BatteryTipPolicyTest first to avoid blocking presubmit
Bug: 190150515
Test: make SettingsGoogleRoboTests
Change-Id: If97e0853d7904919f54f4c4b970380f6fb40efc6
|
2021-06-08 19:04:55 +08:00 |
|
Giuliano Procida
|
a3957d783d
|
Merge "Revert "Apply SettingsLib SeekBarPreference to Settings"" into sc-dev am: ef0e09f7a3 am: 4c611865bf am: 0ac18fa8cb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880698
Change-Id: I38aa6b7c67bfaccd7e131acfa6bc49100bd8a3dd
|
2021-06-08 10:26:54 +00:00 |
|
Giuliano Procida
|
58a35e7c2c
|
Merge "Revert "Apply SettingsLib SeekBarPreference to Settings"" into sc-dev am: ef0e09f7a3 am: 13ba3ea00d am: 70bf492313
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880698
Change-Id: I7d8df09b40bea2e25830926403fcdd398459bc08
|
2021-06-08 10:25:44 +00:00 |
|
Giuliano Procida
|
0ac18fa8cb
|
Merge "Revert "Apply SettingsLib SeekBarPreference to Settings"" into sc-dev am: ef0e09f7a3 am: 4c611865bf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880698
Change-Id: Id8797d6f1a0949c0ca07a26bc39d8550c93d7f30
|
2021-06-08 10:10:59 +00:00 |
|
Giuliano Procida
|
70bf492313
|
Merge "Revert "Apply SettingsLib SeekBarPreference to Settings"" into sc-dev am: ef0e09f7a3 am: 13ba3ea00d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880698
Change-Id: I2207001939d269a292a6ce1b37cf49aad886b910
|
2021-06-08 10:05:12 +00:00 |
|
Giuliano Procida
|
7362a2b843
|
Merge "Revert "Apply SettingsLib SeekBarPreference to Settings"" into sc-dev am: ef0e09f7a3 am: d26cb5c9a9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880698
Change-Id: Id629bec6759ee8611f842d7ee7c840fe077a298e
|
2021-06-08 10:04:28 +00:00 |
|
Giuliano Procida
|
4c611865bf
|
Merge "Revert "Apply SettingsLib SeekBarPreference to Settings"" into sc-dev am: ef0e09f7a3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880698
Change-Id: I710ece36912d159c641bbc2e2c72db8830c23563
|
2021-06-08 10:04:18 +00:00 |
|
Giuliano Procida
|
d26cb5c9a9
|
Merge "Revert "Apply SettingsLib SeekBarPreference to Settings"" into sc-dev am: ef0e09f7a3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880698
Change-Id: I10a2dae0b29c97daaf39699d859b7a7e3d899ec6
|
2021-06-08 10:02:46 +00:00 |
|
Giuliano Procida
|
13ba3ea00d
|
Merge "Revert "Apply SettingsLib SeekBarPreference to Settings"" into sc-dev am: ef0e09f7a3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880698
Change-Id: I528cb33907aab069a37fecf24c39de614b5bc0f2
|
2021-06-08 10:02:19 +00:00 |
|
Giuliano Procida
|
ef0e09f7a3
|
Merge "Revert "Apply SettingsLib SeekBarPreference to Settings"" into sc-dev
|
2021-06-08 09:55:58 +00:00 |
|
Zoey Chen
|
95e7faeda8
|
Merge "[Provider Model] Should not show WiFi call if all sims do not support it." into sc-dev am: bef9945917 am: cdb94b55dc am: 567020518e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14860439
Change-Id: I71d16df32cb18b3de135dc2070f2f2ed4d400e0b
|
2021-06-08 09:55:38 +00:00 |
|
Zoey Chen
|
be176f6409
|
Merge "[Provider Model] Should not show WiFi call if all sims do not support it." into sc-dev am: bef9945917 am: 45e7dcb29d am: 7c962586d2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14860439
Change-Id: Ibf03b877a6f3552a455d135feb3f24f96612812e
|
2021-06-08 09:55:21 +00:00 |
|