Automerger Merge Worker
eafb5594fe
Merge changes from topic "am-3324be7194124a63b43a64e9b5596abe"
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 16148bb1bb956f1001fb630293f38df99e3203517fc901a9ede8971c92c5000f82ddbf825c3da34d5bd7827d1eb1a3ff160080169f481e4cd3e99f74
2023-04-19 06:45:30 +00:00
Bill Yi
5f5bbed59b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 16148bb1bb -s ours am: 956f1001fb -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696134
Change-Id: I34d00cfb2c7bed7f46f7e8e93b3dc80d60483834
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 06:44:20 +00:00
Bill Yi
7d3b1ec887
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 630293f38d -s ours am: f99e320351 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696134
Change-Id: I2ef85c608abe4b09a6bf70414ec86a56cf13b535
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 06:44:13 +00:00
Bill Yi
8d4bb55f4a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 16148bb1bb -s ours am: a3d465081c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696134
Change-Id: I547f7d944e304d284238f306a080464c63fde8b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 06:44:05 +00:00
Bill Yi
fab2ce4721
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7fc901a9ed -s ours am: e8971c92c5 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696132
Change-Id: I4b9d727aba15a389e5fe2948b5d6ea83e337dfc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 06:44:03 +00:00
Bill Yi
7c4b335598
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 630293f38d -s ours am: 1ab0953e8f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696134
Change-Id: If4d8a02a252f4dd516e175b4acb8cbf986fa0a88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 06:43:58 +00:00
Bill Yi
bc8a415353
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 000f82ddbf -s ours am: 825c3da34d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696132
Change-Id: I2327a926433591ac38c45d1c3fb776d4fe6ff15c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 06:43:48 +00:00
Bill Yi
949ca50d5c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7fc901a9ed -s ours am: bc5e8d9f68 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696132
Change-Id: Ib5ca4452cf330169d6dc4eadf53a2e41c7208b19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 06:43:48 +00:00
Bill Yi
a11e1c2328
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 000f82ddbf -s ours am: 59c2d1b5ed -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696132
Change-Id: Ib3ecbb54a3acfed71c207282ed905935c5ab0964
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 06:43:38 +00:00
Bill Yi
88df82c60a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 5bd7827d1e -s ours am: b1a3ff1600 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696130
Change-Id: I0a4b8c006449d3448e22f93e1f5d4c14030fc950
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 06:43:31 +00:00
Bill Yi
de62eea80b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 5bd7827d1e -s ours am: d0a2e9fe6b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696130
Change-Id: Ic076a9c1ffe086a6afd0fb5ddccf673197a5efea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 06:43:17 +00:00
Bill Yi
dcd8de2e0e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 80169f481e -s ours am: 4cd3e99f74 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696130
Change-Id: Ic10c6177bdab820bb9c3ddb5511dd5b97bd1d821
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 06:43:11 +00:00
Bill Yi
7e60926f08
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 80169f481e -s ours am: 1067dfedf0 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696130
Change-Id: I209da27c1867125087de0ff481050e1d3896d79c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 06:42:55 +00:00
ykhung
ab07b53ea1
Fix banner tip buttons visibility and update incompatible tip
...
Fix the battery settings banner tip buttons visibility not reset issue
and update the incompatible charging tip into the colored primary button
Bug: 246960554
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.*
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.widget.CardPreferenceTest
Change-Id: I9b72fccc7838d974d3b60d0f9684780841623cbb
2023-04-19 06:24:51 +00:00
Zoey Chen
446909b4da
Merge "[Settings] Remove the large space when searching language" into udc-dev am: 5614c1e7dc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22713802
Change-Id: I43ce70f1d87fab7093f429b5462fa296f57febb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 05:50:30 +00:00
Zoey Chen
84a7e78630
Merge "[Settings] Remove the large space when searching language" into udc-dev am: 5614c1e7dc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22713802
Change-Id: Ia71fe1086c3cff95a909507770409d84dedcd024
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 05:47:06 +00:00
Bill Yi
a3d465081c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 16148bb1bb -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696134
Change-Id: Iafb69c48922b83ec80ab6f0c15d7b91cd4258387
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 05:45:33 +00:00
Bill Yi
1ab0953e8f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 630293f38d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696134
Change-Id: Ie3eeb57357c8264f5b16848e724d23f59d791c01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 05:45:27 +00:00
Bill Yi
bc5e8d9f68
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7fc901a9ed -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696132
Change-Id: I4469947383923e11fb91efdb786c211e2a98d6ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 05:45:15 +00:00
Bill Yi
59c2d1b5ed
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 000f82ddbf -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696132
Change-Id: I053e455105db28b1fe2a9fc0c9e86e85c2fd5688
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 05:45:02 +00:00
Bill Yi
d0a2e9fe6b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 5bd7827d1e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696130
Change-Id: I81629a7373bb6c8c69651e8ebb5391c10adc916d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 05:44:41 +00:00
Bill Yi
1067dfedf0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 80169f481e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696130
Change-Id: Ia4ef6165e70b273da968d15e6c66b163950521d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 05:44:24 +00:00
Bill Yi
956f1001fb
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 16148bb1bb -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696134
Change-Id: Ie81f5599817d22524385f696547f38d7aac1f636
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 05:40:39 +00:00
Bill Yi
f99e320351
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 630293f38d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696134
Change-Id: I57243eb7e8a721413556490dfbeb8c1e5d195aa6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 05:40:30 +00:00
Bill Yi
e8971c92c5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7fc901a9ed -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696132
Change-Id: Ie25abe3450df2ef4755b4541aa9b26bd070b576f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 05:40:22 +00:00
Bill Yi
825c3da34d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 000f82ddbf -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696132
Change-Id: I9b1147149ac65845a75dcb4da5aa6ee2588a4e50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 05:39:57 +00:00
Bill Yi
b1a3ff1600
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 5bd7827d1e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696130
Change-Id: I6860552138d10e6f692a4731e7f4cf1de17c1eb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 05:39:37 +00:00
Bill Yi
4cd3e99f74
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 80169f481e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696130
Change-Id: I920208c679fdc692aa73d6b0df6210b113d95c65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 05:39:21 +00:00
Zoey Chen
5614c1e7dc
Merge "[Settings] Remove the large space when searching language" into udc-dev
2023-04-19 05:19:56 +00:00
Bill Yi
16148bb1bb
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-04-19 04:54:01 +00:00
Bill Yi
7fc901a9ed
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-04-19 04:54:01 +00:00
Bill Yi
5bd7827d1e
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-04-19 04:54:01 +00:00
ot904699
f1f4097f20
Fix uninstall button can't click problem
...
Install CtsVerifier.apk and CtsEmptyDeviceAdmin.apk. When CtsEmptyDeviceAdmin is active device administrator, “Uninstall” button can’t click, we can’t uninstall the apk.
Compared with Android T, the ability to uninstall Active admin's apk is disabled by default on Android U. Make this cts test pass after modifying the setup code
Bug: 277545241
Test: manually
1. Enter the CtsVerifier apk
2. Click “Device Admin Uninstall Test”
3. Click “ENABLE ADMIN”, then click “Activate this device admin app”
4. Click “LAUNCH SETTINGS”
(cherry picked from https://partner-android-review.googlesource.com/q/commit:67ecb5aef52d18332402d88a418aa4b87d047b87 )
Merged-In: I200cfe56a3529e9c6ee5eebf4b2606237608a4b2
Change-Id: I200cfe56a3529e9c6ee5eebf4b2606237608a4b2
2023-04-19 03:21:53 +00:00
Chaohui Wang
4c02f5b5b5
Fix button label missing in the SIM card pop ups
...
Use Button instead of TextView, so Button role is applied.
Fix: 261994361
Test: Manually with Talkback on
Change-Id: I8a342e15af6193000bd3b1aa34b1acf671f47739
2023-04-19 11:08:42 +08:00
Treehugger Robot
d5afbf4bbc
Merge changes from topic "tc_change_23041807_29" into udc-dev am: b9faf7089d am: 520803758a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696129
Change-Id: I1a36762a0d1e95dc29c8edffa88f68ed0b56cf36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 02:29:52 +00:00
Bill Yi
a59fc3db5e
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6c08eb4631 am: e1bef672d7 -s ours am: 7a75e2eea3 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696129
Change-Id: I4454552ce90ccff6c69688eebb976dea052f2c0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 02:29:46 +00:00
Automerger Merge Worker
99a4643297
Merge changes from topic "am-9cb8f90b609744158faaa6220542aead"
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: c04510b03084c81f27dcba1e5f7d004d76486764363f246acdf14bb1c1be
2023-04-19 02:29:05 +00:00
Treehugger Robot
f1fd481d5a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: c04510b030 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22703367
Change-Id: I6af644137a9a6f27a7aacb5009a711bbf8e1e588
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 02:28:32 +00:00
Bill Yi
0ec6c3c905
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 84c81f27dc -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22703367
Change-Id: I51230460e12bdaeb8185e33d825129313ad9ee87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 02:28:30 +00:00
Treehugger Robot
8059b59f1f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: ba1e5f7d00 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22701740
Change-Id: I97296ff1b9b1dc130cd60e25cb374ed8a2f7754c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 02:28:27 +00:00
Bill Yi
101387bda0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4d76486764 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22701740
Change-Id: Id4642912225744527bb48a2e834548b87082c0c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 02:28:05 +00:00
Treehugger Robot
cc8d99cbc3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 363f246acd -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22701732
Change-Id: Ie450e46fd541e8717cb241575134f5cb997c2bd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 02:27:51 +00:00
Treehugger Robot
54e0fca0b7
Merge changes from topic "tc_change_23041807_29" into udc-dev am: b9faf7089d am: 3d8a22a257
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696129
Change-Id: I452011ff7735a83bdd5a8e91b2ab2c0e84e73864
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 02:27:33 +00:00
Bill Yi
06fd9f0035
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f14bb1c1be -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22701732
Change-Id: Idef2b53000992305de841fa8514d6a7a0f8a1acb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 02:27:17 +00:00
Bill Yi
e61e563140
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6c08eb4631 am: e1bef672d7 -s ours am: 6d99f76e84 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696129
Change-Id: I7a4ef7bc06793bd2ac82d00b73f9b55765d025b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 02:26:34 +00:00
Treehugger Robot
520803758a
Merge changes from topic "tc_change_23041807_29" into udc-dev am: b9faf7089d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696129
Change-Id: I25b8c46633526be2b7562f4bfef198fe84febf05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 01:53:42 +00:00
Bill Yi
7a75e2eea3
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6c08eb4631 am: e1bef672d7 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696129
Change-Id: I2156a63f31fea0a141f4ee93307d7b2a64faa906
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 01:53:34 +00:00
Treehugger Robot
c04510b030
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-04-19 01:47:24 +00:00
Treehugger Robot
ba1e5f7d00
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-04-19 01:47:24 +00:00
Treehugger Robot
363f246acd
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-04-19 01:47:24 +00:00
