Curtis Belmonte
|
0117e8a80f
|
Merge "Revert "Turn on the transition flag"" into sc-dev am: 5ece4babd3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14471733
Change-Id: Iba9854a104ba9b427868d3d66731fc3e76383664
|
2021-05-08 07:47:12 +00:00 |
|
Edgar Wang
|
1f8a8893ae
|
Merge "Rename PreferenceTheme.SettingsBase to PreferenceTheme.SettingsLib" into sc-dev am: 9da824db15
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456003
Change-Id: I9b4a13836656ebb2180012ad415759798a12c32a
|
2021-05-08 07:40:10 +00:00 |
|
Curtis Belmonte
|
5ece4babd3
|
Merge "Revert "Turn on the transition flag"" into sc-dev
|
2021-05-08 07:38:45 +00:00 |
|
Edgar Wang
|
86c6693356
|
Merge "Rename PreferenceTheme.SettingsBase to PreferenceTheme.SettingsLib" into sc-dev am: 9da824db15
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456003
Change-Id: I97fad1a947cb387bea84b1c828db6052e29f5d98
|
2021-05-08 07:38:15 +00:00 |
|
Edgar Wang
|
9da824db15
|
Merge "Rename PreferenceTheme.SettingsBase to PreferenceTheme.SettingsLib" into sc-dev
|
2021-05-08 07:29:36 +00:00 |
|
Xin Li
|
bb6f5b264f
|
DO NOT MERGE - Merge RQ2A.210505.003.
Bug: 187544653
Merged-In: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Change-Id: I9a8ebe5b65b682015225c8c1ba9de1984bac7a8d
|
2021-05-07 23:32:36 -07:00 |
|
TreeHugger Robot
|
c658dfe610
|
Merge "Controls/Wallet privacy settings" into sc-dev am: 67fd37c837 am: 8f26c5c25f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14470513
Change-Id: I02b09f381f10d6b6db740a1ffc3d9d2609efd556
|
2021-05-08 03:35:36 +00:00 |
|
Xin Li
|
1c0267e8c4
|
[automerger skipped] Merge "DO NOT MERGE - Mark RQ2A.210105.001 as merged." am: 6811428c9c -s ours am: 1b68f3bfd3 -s ours am: a7d220aad7 -s ours am: e49a0d1b4e -s ours am: 93c8398216 -s ours
am skip reason: Merged-In Ic91dd36f6de39ef79f1ced90083e1c5c7836c651 with SHA-1 6f3630c393 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1700268
Change-Id: I194a49ce5bccf4cd3659af604938eb6da6ed4f67
|
2021-05-08 03:34:30 +00:00 |
|
TreeHugger Robot
|
8f26c5c25f
|
Merge "Controls/Wallet privacy settings" into sc-dev am: 67fd37c837
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14470513
Change-Id: I099c72366483528bb281bb87aa2525c457e3f380
|
2021-05-08 03:07:58 +00:00 |
|
Xin Li
|
93c8398216
|
[automerger skipped] Merge "DO NOT MERGE - Mark RQ2A.210105.001 as merged." am: 6811428c9c -s ours am: 1b68f3bfd3 -s ours am: a7d220aad7 -s ours am: e49a0d1b4e -s ours
am skip reason: Merged-In Ic91dd36f6de39ef79f1ced90083e1c5c7836c651 with SHA-1 6f3630c393 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1700268
Change-Id: I41b74e3aae1cde711444bd1bef977867e63747d9
|
2021-05-08 03:06:32 +00:00 |
|
TreeHugger Robot
|
017d6997ed
|
Merge "Controls/Wallet privacy settings" into sc-dev am: 67fd37c837
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14470513
Change-Id: I4e0cc31f000e11a247e6d6aef90a7c19b45b89be
|
2021-05-08 03:05:38 +00:00 |
|
Xin Li
|
84242a0d66
|
[automerger skipped] Merge "DO NOT MERGE - Mark RQ2A.210105.001 as merged." am: 6811428c9c -s ours am: 1b68f3bfd3 -s ours am: a7d220aad7 -s ours am: e49a0d1b4e -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1700268
Change-Id: I9079c82ca9f3b97edbffc5ef9558d67924511b58
|
2021-05-08 03:03:34 +00:00 |
|
TreeHugger Robot
|
67fd37c837
|
Merge "Controls/Wallet privacy settings" into sc-dev
|
2021-05-08 02:46:54 +00:00 |
|
Xin Li
|
e49a0d1b4e
|
[automerger skipped] Merge "DO NOT MERGE - Mark RQ2A.210105.001 as merged." am: 6811428c9c -s ours am: 1b68f3bfd3 -s ours am: a7d220aad7 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1700268
Change-Id: I6d1066d472d9b053a19ac80c8dba094d0017a271
|
2021-05-08 02:37:05 +00:00 |
|
Xin Li
|
a7d220aad7
|
[automerger skipped] Merge "DO NOT MERGE - Mark RQ2A.210105.001 as merged." am: 6811428c9c -s ours am: 1b68f3bfd3 -s ours
am skip reason: Merged-In Ic91dd36f6de39ef79f1ced90083e1c5c7836c651 with SHA-1 6f3630c393 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1700268
Change-Id: I810710363abf4ab5cffa5d3c05095468716d2466
|
2021-05-08 02:13:47 +00:00 |
|
Xin Li
|
1b68f3bfd3
|
[automerger skipped] Merge "DO NOT MERGE - Mark RQ2A.210105.001 as merged." am: 6811428c9c -s ours
am skip reason: Merged-In Ic91dd36f6de39ef79f1ced90083e1c5c7836c651 with SHA-1 6f3630c393 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1700268
Change-Id: Ifc6c1d5d1192a56c9f33ded1a984e1d4b73157c9
|
2021-05-08 01:48:55 +00:00 |
|
Xin Li
|
6811428c9c
|
Merge "DO NOT MERGE - Mark RQ2A.210105.001 as merged."
|
2021-05-08 01:28:18 +00:00 |
|
TreeHugger Robot
|
bb837f1ec0
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 31e0f46d87 -s ours am: 2332a37557 -s ours am: 0c847ab549 -s ours am: 7eee3839c9 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14469856
Change-Id: Ia2b2e2f45cdb91353b23e75e17756f1701876280
|
2021-05-07 23:59:59 +00:00 |
|
Bill Yi
|
23c2c7dc7f
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5ced13c831 -s ours am: d32b02b4b4 -s ours am: 8d2d27953d -s ours am: 07eb180b1a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14469860
Change-Id: I0ce25c84adcecdc4c7a9c154aeaa94b49a197b30
|
2021-05-07 23:59:54 +00:00 |
|
TreeHugger Robot
|
af8c6c83da
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 2450eeb436 -s ours am: fc9217fca5 -s ours am: b3c02e1811 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14469644
Change-Id: Ib59e3e7ae0b2bf1dc266fd332c4cf9b615cf4d02
|
2021-05-07 23:59:47 +00:00 |
|
Bill Yi
|
e9e254a992
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b5d257a72d -s ours am: bd905bff88 -s ours am: cc4940cc2a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14469653
Change-Id: Ibd2c549b9645c510466d1cbd2544739a72a81008
|
2021-05-07 23:59:11 +00:00 |
|
TreeHugger Robot
|
7eee3839c9
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 31e0f46d87 -s ours am: 2332a37557 -s ours am: 0c847ab549 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14469856
Change-Id: Iabe7a67f2dd1be3faf2f31d9eecfc781ee688ed3
|
2021-05-07 23:46:22 +00:00 |
|
Bill Yi
|
07eb180b1a
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5ced13c831 -s ours am: d32b02b4b4 -s ours am: 8d2d27953d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14469860
Change-Id: I7464ef189a859de3e7e0f3ef8bd23433fcd16afd
|
2021-05-07 23:46:19 +00:00 |
|
TreeHugger Robot
|
b3c02e1811
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 2450eeb436 -s ours am: fc9217fca5 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14469644
Change-Id: Iab045fcf3c6f030d4099e2b1a47fea175eb976ba
|
2021-05-07 23:46:16 +00:00 |
|
Bill Yi
|
cc4940cc2a
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b5d257a72d -s ours am: bd905bff88 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14469653
Change-Id: Ia081b7aeb60617f1197379cd78c6019b5f1ebbca
|
2021-05-07 23:46:13 +00:00 |
|
TreeHugger Robot
|
9bad64997d
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 31e0f46d87 -s ours am: 2332a37557 -s ours am: 0c847ab549 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14469856
Change-Id: Icfeedc843fc3e0bd1d140d355a4207c76ac5a83f
|
2021-05-07 23:45:17 +00:00 |
|
Bill Yi
|
b5a424b154
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5ced13c831 -s ours am: d32b02b4b4 -s ours am: 8d2d27953d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14469860
Change-Id: I06ba39f37f68c027e3675a643508ffb4c316eef1
|
2021-05-07 23:45:00 +00:00 |
|
TreeHugger Robot
|
2991325544
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 2450eeb436 -s ours am: fc9217fca5 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14469644
Change-Id: I21fb35dbe46b46231eb914cabd17df92a73df59b
|
2021-05-07 23:44:48 +00:00 |
|
Bill Yi
|
abfbda2698
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b5d257a72d -s ours am: bd905bff88 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14469653
Change-Id: I435c33132f9c0d7f46dd813fc9edbdc7b5299ea3
|
2021-05-07 23:44:33 +00:00 |
|
TreeHugger Robot
|
0c847ab549
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 31e0f46d87 -s ours am: 2332a37557 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14469856
Change-Id: I1ac1d36b4343b3d008d21090ee9ac69caae48460
|
2021-05-07 23:36:59 +00:00 |
|
Bill Yi
|
8d2d27953d
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5ced13c831 -s ours am: d32b02b4b4 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14469860
Change-Id: I82d19d77c91088c415ec95a3c9ecf794893eac2a
|
2021-05-07 23:36:52 +00:00 |
|
TreeHugger Robot
|
fc9217fca5
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 2450eeb436 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14469644
Change-Id: Ie591b4ce89aaf28b338d6f854f06e13444e5acd7
|
2021-05-07 23:28:02 +00:00 |
|
Bill Yi
|
bd905bff88
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b5d257a72d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14469653
Change-Id: If064a2ddcfb826ccfacfe5b9ec2b96ad89d04384
|
2021-05-07 23:27:34 +00:00 |
|
TreeHugger Robot
|
2332a37557
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 31e0f46d87 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14469856
Change-Id: I3b468892d531003b9ada3fac1ffb0b54866e61e9
|
2021-05-07 23:19:54 +00:00 |
|
Bill Yi
|
d32b02b4b4
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5ced13c831 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14469860
Change-Id: I9e49484d667bbe12c60fc975be09cf477e090877
|
2021-05-07 23:19:11 +00:00 |
|
TreeHugger Robot
|
2450eeb436
|
Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod
|
2021-05-07 23:17:12 +00:00 |
|
TreeHugger Robot
|
31e0f46d87
|
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
|
2021-05-07 23:07:35 +00:00 |
|
Curtis Belmonte
|
1e1b259445
|
Revert "Turn on the transition flag"
This reverts commit 1be773da62.
Reason for revert: b/187517936
Fixes: 187517936
Change-Id: I57d0a7a16bdb76e105b0febd43bdf81521e69e3a
|
2021-05-07 22:43:05 +00:00 |
|
Xin Li
|
7df22b02ca
|
DO NOT MERGE - Mark RQ2A.210105.001 as merged.
Bug: 180401296
Merged-In: Ic91dd36f6de39ef79f1ced90083e1c5c7836c651
Change-Id: I82a9266b107ebaf80b897deb8066e6976642644b
|
2021-05-07 14:32:28 -07:00 |
|
TreeHugger Robot
|
5bdef1f980
|
Merge "Prevent multi-sensor enrollment from doing nothing." into sc-dev am: 0842cc9adc am: 4fbf1990bf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14463204
Change-Id: I02630a93f9cba60dc7368dca2a819c24903225ee
|
2021-05-07 21:00:31 +00:00 |
|
TreeHugger Robot
|
4fbf1990bf
|
Merge "Prevent multi-sensor enrollment from doing nothing." into sc-dev am: 0842cc9adc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14463204
Change-Id: I2d828a873e008d056f453053dac8e921599c5ac8
|
2021-05-07 20:43:21 +00:00 |
|
TreeHugger Robot
|
4b12334524
|
Merge "Prevent multi-sensor enrollment from doing nothing." into sc-dev am: 0842cc9adc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14463204
Change-Id: Ibe6d65df7be6a66db8c6fd8d29f22b81d9af569f
|
2021-05-07 20:42:38 +00:00 |
|
TreeHugger Robot
|
0842cc9adc
|
Merge "Prevent multi-sensor enrollment from doing nothing." into sc-dev
|
2021-05-07 20:25:35 +00:00 |
|
Julia Reynolds
|
540ad99d88
|
Fix work profile setting appearing too often
That is, when the user didn't have work profile
Test: robotests, manual
Fixes: 187520760
Change-Id: I9394359a6bc278d58ef13b30f8ce99cbaa595c25
|
2021-05-07 15:02:54 -04:00 |
|
Matt Pietal
|
a13e30c11a
|
Controls/Wallet privacy settings
Addressing feedback from ag/14353975
Fixes: 185597511
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.display
Change-Id: I4de5b7f94d4be44820b1fa463d97f4f098f64bff
|
2021-05-07 14:54:54 -04:00 |
|
Julia Reynolds
|
2fe3273f3a
|
Handle NLS metadata when provided as strings
Test: atest
Bug: 181175697
Change-Id: I40d935ffb7c1fb9f978160d28297da84412501fb
|
2021-05-07 18:37:10 +00:00 |
|
ykhung
|
246884a4e9
|
Fix corner case IndexOutOfBound exception for null content am: bf5dd80d4f am: 985c9a3d42
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456006
Change-Id: Ib9b9497532285903f7a931432c7a2a5cff622f38
|
2021-05-07 18:08:43 +00:00 |
|
ykhung
|
985c9a3d42
|
Fix corner case IndexOutOfBound exception for null content am: bf5dd80d4f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456006
Change-Id: Iec922589d53bad35cc4aab891850f05948a28f55
|
2021-05-07 17:52:13 +00:00 |
|
ykhung
|
dc424283be
|
Fix corner case IndexOutOfBound exception for null content am: bf5dd80d4f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456006
Change-Id: Ie0d7ecbc943442473dd540bc6962966f67c8098c
|
2021-05-07 17:49:51 +00:00 |
|
ykhung
|
bf5dd80d4f
|
Fix corner case IndexOutOfBound exception for null content
Bug: 184807417
Test: make SettingsRoboTests
Change-Id: Icf35b4084bcea62c2879a100d1b35b5448d8276d
|
2021-05-08 01:15:21 +08:00 |
|