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: c04510b030
-s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 84c81f27dc
-s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: ba1e5f7d00
-s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4d76486764
-s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 363f246acd
-s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f14bb1c1be
-s ours
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
Treehugger Robot
3d8a22a257
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: Id9ef8071049d8570e3229d5dfc0d1113eb9e70d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 01:47:20 +00:00
Bill Yi
6d99f76e84
[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: I6924d7e200abc434ad93c335b40b79fb62ca49b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 01:47:15 +00:00
Treehugger Robot
b9faf7089d
Merge changes from topic "tc_change_23041807_29" into udc-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6c08eb4631
Import translations. DO NOT MERGE ANYWHERE
2023-04-19 01:43:57 +00:00
Sunny Shao
b0b8ca7e1c
Fix RTL display problem in Open by default
...
- setTextDirection for ListView ih the verified links dialog.
- setCompoundDrawables for TextView in the supported link dialog.
Fixes: 277082703
Fixes: 277084378
Test: manual review
Change-Id: Ib42ed2f04785a5f1803b9d2d95055e4208c9e88f
2023-04-19 09:07:50 +08:00
Becca Hughes
3ac6b141a4
Merge "Rollback decision to merge by package name"
2023-04-19 00:08:57 +00:00
Yuxin Hu
0927e2af1d
Add permission to use GPU service APIs
...
Allow Settings UI to access GPU service APIs,
this allows Developer option UI to toggle ANGLE
as the default system GLES driver.
Bug: b/270994705
Test: m;
Change-Id: I0a6c0bbe03482e4746e0d2a52ce247f4469baaa9
2023-04-18 22:58:39 +00:00
Diya Bera
33fab7e415
Adding owners
...
Test: N/A
Bug: 278741020
Change-Id: Ife62f56fd0e3c83427347365a1eebfad3ec3ed6d
2023-04-18 22:56:31 +00:00
Becca Hughes
ca542c90cd
Rollback decision to merge by package name
...
At the moment settings aggregates by
package name and it has been decided that
we should do per-service instead.
Test: atest & manual
Bug: 278598419
Change-Id: I6b7c8adac4957f1c3382044208e1642d0b6e3fab
2023-04-18 22:15:50 +00:00
Linyu He
f47ecfc82b
Merge "Revert "List apps which requested the TURN_SCREEN_ON appOp permi..."" into udc-dev am: e346dc6779
am: e6c3d5d893
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22715841
Change-Id: I5bbdec5717bc387c305974a7bfccbd513fecb123
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-18 20:19:25 +00:00
Treehugger Robot
f2160f276e
Merge "Revert "Destroy activity in onStop()"" into udc-dev am: 6112e583d7
am: 4ec47457ec
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22691451
Change-Id: Ic9cb5e121608b2fe7368c72275db9a31d412b713
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-18 20:16:16 +00:00
Linyu He
e6c3d5d893
Merge "Revert "List apps which requested the TURN_SCREEN_ON appOp permi..."" into udc-dev am: e346dc6779
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22715841
Change-Id: I0a228f9c512ee444a245e67b10a83849e53ed51b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-18 20:04:09 +00:00