Bill Yi
8b66811498
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1f660bf994
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15309024
Change-Id: I27fd22e38caac8c1830c8af4f7a4c608c74b0035
2021-07-16 15:15:54 +00:00
Bill Yi
b31e7319ed
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2962edd9b0
-s ours am: aef4593a74
-s ours am: d74db1c939
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15309026
Change-Id: I345858053f5278cd198191a2b5fb8bcf226f39f4
2021-07-16 15:15:43 +00:00
TreeHugger Robot
fc9714007b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 026fba52e8
-s ours am: 72d510e78a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15309028
Change-Id: Ie98fe8029c2ec028a4b05c4ebfb1adecf0a24f49
2021-07-16 15:15:26 +00:00
Bill Yi
f2172047ac
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2962edd9b0
-s ours am: aef4593a74
-s ours am: d7444103b7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15309026
Change-Id: I40e6bbf05a568520ea51fb22312a6dbcc8535a3b
2021-07-16 15:15:05 +00:00
TreeHugger Robot
92e8d024ec
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 026fba52e8
-s ours am: 04407bd0b3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15309028
Change-Id: I191468bc682fafa126fc5355ae9d2b6d7a0b0747
2021-07-16 15:14:59 +00:00
Bill Yi
12463d37c0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2962edd9b0
-s ours am: aef4593a74
-s ours am: 728315f696
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15309026
Change-Id: Ie1b4bdb0504dd6333c901cd2da7c1b6adf7394fc
2021-07-16 15:05:43 +00:00
TreeHugger Robot
03f23b726b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 026fba52e8
-s ours am: a0cee9f717
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15309028
Change-Id: Id8b3b3c626031a5b34326cb32c25bd2a56a715c6
2021-07-16 15:05:37 +00:00
Bill Yi
728315f696
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2962edd9b0
-s ours am: aef4593a74
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15309026
Change-Id: Ic88e2a9fddd1a07d7be96483e426310635dfa16c
2021-07-16 15:05:30 +00:00
TreeHugger Robot
9b9bcd450a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 1a87f6494f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15309025
Change-Id: I63ce58117a6fe11a7c5f4839687ea247d6be8c7f
2021-07-16 15:05:28 +00:00
Bill Yi
d7444103b7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2962edd9b0
-s ours am: aef4593a74
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15309026
Change-Id: I56b73e4bee6fb85692bceb9b7dfeff4f20008de9
2021-07-16 15:00:43 +00:00
TreeHugger Robot
04407bd0b3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 026fba52e8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15309028
Change-Id: Ia3efc9a014a0926eb958af335f346e843617fee3
2021-07-16 15:00:29 +00:00
TreeHugger Robot
d1b1083a35
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: bc60dff6bf
-s ours am: 0fe7a8176a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15309029
Change-Id: Ic9197dfdde00f9be65d12a797a211dd1708a9cb9
2021-07-16 15:00:13 +00:00
Bill Yi
d74db1c939
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2962edd9b0
-s ours am: aef4593a74
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15309026
Change-Id: I6636912484fe19d521a98c18fa4e19cf48816e9a
2021-07-16 14:59:54 +00:00
TreeHugger Robot
a0cee9f717
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 026fba52e8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15309028
Change-Id: I756d81a8f8f7302cbde9d9e207fd27c9476b4b79
2021-07-16 14:59:41 +00:00
Bill Yi
aef4593a74
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2962edd9b0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15309026
Change-Id: I5ac7dc76a303bb3ce71b1b4daf19b67d4dc76eeb
2021-07-16 14:59:40 +00:00
TreeHugger Robot
72d510e78a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 026fba52e8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15309028
Change-Id: I42efbb54eda951275302b201b59acd6337100911
2021-07-16 14:59:37 +00:00
TreeHugger Robot
1a87f6494f
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2021-07-16 14:52:22 +00:00
TreeHugger Robot
1f0d7193b0
Merge "Import translations. DO NOT MERGE ANYWHERE"
2021-07-16 14:52:12 +00:00
TreeHugger Robot
026fba52e8
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-07-16 14:46:30 +00:00
TreeHugger Robot
0fe7a8176a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: bc60dff6bf
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15309029
Change-Id: I599e1fd675a3de86cb41a6a42c734af35d8e947c
2021-07-16 14:44:59 +00:00
TreeHugger Robot
bc60dff6bf
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-07-16 14:31:28 +00:00
Stanley Wang
1fcdafbcda
Fix the problem that the SIM status and IMEI after the "Build number".
...
- Adding the SIM status and IMEI items of SIM2 to the PreferenceScreen
can not put these items in the correct categories. We have to put
these items directly into the correct categories.
Fix: 193384705
Test: robotest and see the UI
Merged-In: I2de7ee72fc1315eeef01288b386f8756ca366e33
Change-Id: I9472ecd604afe2f2e2eaf08c92ec11e439e8fc1d
2021-07-16 22:03:54 +08:00
Stanley Wang
e039077efd
Merge "Fix the problem that the SIM status and IMEI after the "Build number"."
2021-07-16 12:59:17 +00:00
Stanley Wang
74cde9c569
Merge "Update the illustrations of System navigation page." into sc-dev am: c916876cc7
am: 69a9d7aa11
am: 15738313b2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15297631
Change-Id: I804e97c554f15cd48164b467630b0aba15d26fb5
2021-07-16 12:30:09 +00:00
Stanley Wang
30a7eea2fd
Merge "Update the illustrations of System navigation page." into sc-dev am: c916876cc7
am: 21a148d9fe
am: 89f82c126b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15297631
Change-Id: Ib34841f6aa2e7608ce069eee9db24c6129d68f03
2021-07-16 12:29:53 +00:00
Stanley Wang
15738313b2
Merge "Update the illustrations of System navigation page." into sc-dev am: c916876cc7
am: 69a9d7aa11
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15297631
Change-Id: I1122c56ed939fe9eeaaf213d52b08f4cd5fd1be7
2021-07-16 12:15:34 +00:00
Stanley Wang
89f82c126b
Merge "Update the illustrations of System navigation page." into sc-dev am: c916876cc7
am: 21a148d9fe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15297631
Change-Id: Id188157c1f68ff6227458ff6771910ecd40d4cae
2021-07-16 12:15:12 +00:00
Stanley Wang
12fd312660
Merge "Update the illustrations of System navigation page." into sc-dev am: c916876cc7
am: c7459e9ec1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15297631
Change-Id: Ia7089bb61f85cbddd08f21da37f1f37cacb8904e
2021-07-16 12:14:47 +00:00
Stanley Wang
21a148d9fe
Merge "Update the illustrations of System navigation page." into sc-dev am: c916876cc7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15297631
Change-Id: Ifdc3f6d19e74290c2ff6ccb037590861627d6f5e
2021-07-16 11:55:24 +00:00
Stanley Wang
c7459e9ec1
Merge "Update the illustrations of System navigation page." into sc-dev am: c916876cc7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15297631
Change-Id: Idb8abbe0559f777a01923ada2b79f55fe7213c2b
2021-07-16 11:54:38 +00:00
Stanley Wang
69a9d7aa11
Merge "Update the illustrations of System navigation page." into sc-dev am: c916876cc7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15297631
Change-Id: I287a6788e9ff460ab58a1c61e019be0cf37480a6
2021-07-16 11:54:13 +00:00
Stanley Wang
9c63c415ea
Fix the problem that the SIM status and IMEI after the "Build number".
...
- Adding the SIM status and IMEI items of SIM2 to the PreferenceScreen
can not put these items in the correct categories. We have to put
these items directly into the correct categories.
Bug: 193384705
Test: robotest and see the UI
Change-Id: I2de7ee72fc1315eeef01288b386f8756ca366e33
2021-07-16 19:44:25 +08:00
Stanley Wang
c916876cc7
Merge "Update the illustrations of System navigation page." into sc-dev
2021-07-16 11:37:51 +00:00
Bill Yi
165a3c9880
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I162d0b3f065d8dd902a251aa847c4367b1dc1767
2021-07-16 09:19:39 +00:00
Bill Yi
8165043546
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If9f25bb8fe9349790b04162a6d09c5ef5183e2e4
2021-07-16 09:15:26 +00:00
Bill Yi
f9cccd900f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I0a4dec292485f58d7ee2b1a96d862486819c2b72
2021-07-16 09:11:08 +00:00
Bill Yi
2962edd9b0
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I601456c1a376a98531d455c0c292bf57fb696dbd
2021-07-16 09:01:39 +00:00
Bill Yi
783ad2b74e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I19360b0a8f018f68de38dc04be164ab789c38e29
2021-07-16 08:50:32 +00:00
Bill Yi
1f660bf994
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7e85df20c7b2befdee0d43ecbabaac82452c0249
2021-07-16 08:46:43 +00:00
Menghan Li
5cdaaed04c
Merge "Provides TC ID for shortcut title in AccessibilityShortcutPreferenceFragment" into sc-v2-dev am: 77b8431156
am: 7c011ae5c0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15297637
Change-Id: Ib1bbfc97929be4de656a70e1afa0e353c5ac6c88
2021-07-16 06:20:43 +00:00
Wesley.CW Wang
7e9fdf69a4
Update dark theme battery info error text color
...
screenshot: https://screenshot.googleplex.com/8UyMj5q7tLJ2uA8.png
Bug: 187611525
Test: make SettingsRoboTests
Change-Id: Iefec51d9ca6d27c9173af0756301f4278e928433
2021-07-16 14:17:46 +08:00
Menghan Li
7c011ae5c0
Merge "Provides TC ID for shortcut title in AccessibilityShortcutPreferenceFragment" into sc-v2-dev am: 77b8431156
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15297637
Change-Id: I81c5f633fb3c1f94056136777fab23b0ab97d6eb
2021-07-16 06:08:25 +00:00
Menghan Li
77b8431156
Merge "Provides TC ID for shortcut title in AccessibilityShortcutPreferenceFragment" into sc-v2-dev
2021-07-16 05:54:31 +00:00
Edgar Wang
8fc818709d
Find the double twist sensor using the type instead of the name
...
Bug: 192565190
Test: manual & robotest
Change-Id: Ib2b4b39f75667700c503b49f114887a61f7603a6
2021-07-16 04:12:41 +00:00
Beth Thibodeau
1eddd35553
Merge "Remove lockdown toggle" into sc-dev am: 20e57d33ff
am: fb3af25ce1
am: 8e65092ee9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15290234
Change-Id: Ie74e3f63f2fdc1a8bb4ea9913df5d2d2381a333f
2021-07-16 02:38:06 +00:00
TreeHugger Robot
5334c472ac
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: bcccb92239
-s ours am: cdfe31e4cf
-s ours am: 91e57d79fc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15302651
Change-Id: I9e79a8eb09f21664a019cac811989395be76a9e3
2021-07-16 02:36:47 +00:00
Curtis Belmonte
4948cd3466
Merge "Use correct choose lock password/pattern subtitles" into sc-dev am: 4aa06d7639
am: 0378dfff5a
am: 88b1052394
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15302650
Change-Id: I9b02755395575cca8b383ee55d245dbb373fe641
2021-07-16 02:36:42 +00:00
TreeHugger Robot
5bdccf5f6e
Merge "Disable the mic/cam toggles when admin disallows" into sc-dev am: caa670fad4
am: e36357fd71
am: 8ce3b2f8a1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15089520
Change-Id: I49f87a8101df08e6f231fad1e1b8d0db49b0d39d
2021-07-16 02:36:10 +00:00
Beth Thibodeau
8e65092ee9
Merge "Remove lockdown toggle" into sc-dev am: 20e57d33ff
am: fb3af25ce1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15290234
Change-Id: I7978ec3a1686df7594431b9f413bda6b53f3916e
2021-07-16 02:15:18 +00:00
TreeHugger Robot
91e57d79fc
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: bcccb92239
-s ours am: cdfe31e4cf
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15302651
Change-Id: Ie64f39a579a8627236b2d9214ae67aed3309ef15
2021-07-16 02:13:40 +00:00