danielwbhuang
55a3d089f9
Fix Multiple UI issues
...
1. Use edge-to-edge UI
2. Use new color token
3. Put text in the middle of the button
Bug:279163958
Bug:278504911
Test: manual
Change-Id: I189e9da2251f7d204ddc18680d3d1ec4638fa2db
2023-05-04 08:56:41 +00:00
Chaohui Wang
c16a088a73
Log app special permission change for SPA
...
Align with current logging and no package name.
Bug: 280575002
Test: Manually with App Op Permission pages
Change-Id: Ia0dde06769b1e08f8cec7cb1d87a8ca1baa80068
2023-05-04 16:36:02 +08:00
Treehugger Robot
54de6fd80b
Merge "Support incompatible charger state in the battery main page" into udc-dev
2023-05-04 08:28:57 +00:00
Chaohui Wang
678b1d5fa4
Merge "Fix SettingsDumpServiceTest" into udc-dev
2023-05-04 07:39:14 +00:00
Hao Dong
1c9288fa24
Merge "Call onFaceStrengthChanged() only when authenticators registered." into udc-dev
2023-05-04 07:00:40 +00:00
Hao Dong
6e8434b793
Call onFaceStrengthChanged() only when authenticators registered.
...
Test: atest FaceEnrollIntroductionTest
Test: manually tested face enroll introduction page
Bug: 280384533
Change-Id: Iac9506d8430459aa399ac8efd3f41cbc6e67260d
Merged-In: Iac9506d8430459aa399ac8efd3f41cbc6e67260d
2023-05-04 06:59:53 +00:00
ykhung
c234196bc1
Support incompatible charger state in the battery main page
...
https://screenshot.googleplex.com/PrSzAtMAhsyqbsR
Bug: 271775549
Test: make test RunSettingsRoboTests
Change-Id: I0bb912eaab9c8837eaa3a9b998b3ebb5a8e6f99f
2023-05-04 14:57:07 +08:00
Chaohui Wang
e2b9d0680e
Fix SettingsDumpServiceTest
...
SettingsDumpService behavior changed in
Change I9d7fe2e763b9e5840ee76c5eb00bc88288e7ee41
After behavior changed, PrintWriter was wrapped in IndentingPrintWriter,
it's harder to mock the PrintWriter, so check the result directly.
Fix: 280068083
Test: RobolectricTest
Change-Id: I92a7b931c93df4cd9e9c3e47b91a9750df936f15
2023-05-04 14:20:33 +08:00
SongFerng Wang
197eb39cde
Merge "Shows main_battery information for not untethered device" into udc-dev
2023-05-04 05:47:59 +00:00
Treehugger Robot
c537439f3a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 11ba47eebb -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22974823
Change-Id: I19e3f9ad92a238698ffce7cad4d08c3d90199df6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 05:04:04 +00:00
Bill Yi
c7e5bc37f1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dc96a91fff -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22974823
Change-Id: Id79f748013e887d8a73f16f386675844449512d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 05:03:44 +00:00
Tom Hsu
692d0a45ef
Merge "[Settings] Fix NPE from updating subinfo changed." into udc-dev am: 99e03458fa am: f23adec53e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954342
Change-Id: I1c67affd1b29c19925cc966589c12e2beccfb053
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 04:45:47 +00:00
TreeHugger Robot
700e460908
Merge "Add Tapjacking Protection for all screens extends StorageWizardBase in Settings." into udc-dev am: 7bf4c8f9f5 am: 2c750a41f4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23001477
Change-Id: I4225ad17510c125b59696f6caf78459f8ae161a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 04:44:49 +00:00
Treehugger Robot
f4c61c812a
Merge "Fix testNonIndexableKeys_existInXmlLayout" into udc-dev am: e71643efac am: 7e99eaa9bc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981573
Change-Id: I4c015dba412ce513992e60cb20164da5ffdc3816
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 04:44:37 +00:00
Tom Hsu
f23adec53e
Merge "[Settings] Fix NPE from updating subinfo changed." into udc-dev am: 99e03458fa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954342
Change-Id: Iff62b8e3b4e60e501a34cbd4bb12914490b0857c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 04:43:06 +00:00
Treehugger Robot
11ba47eebb
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-05-04 04:36:13 +00:00
Tom Hsu
99e03458fa
Merge "[Settings] Fix NPE from updating subinfo changed." into udc-dev
2023-05-04 04:21:51 +00:00
TreeHugger Robot
2c750a41f4
Merge "Add Tapjacking Protection for all screens extends StorageWizardBase in Settings." into udc-dev am: 7bf4c8f9f5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23001477
Change-Id: I831234e174a614c1b6ce20f9ae6a70cfe9b92b01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 04:21:34 +00:00
TreeHugger Robot
7bf4c8f9f5
Merge "Add Tapjacking Protection for all screens extends StorageWizardBase in Settings." into udc-dev
2023-05-04 04:09:13 +00:00
Treehugger Robot
7e99eaa9bc
Merge "Fix testNonIndexableKeys_existInXmlLayout" into udc-dev am: e71643efac
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981573
Change-Id: I04ced0608e4e782af915767ff477cca01b369d93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 04:00:30 +00:00
Treehugger Robot
e71643efac
Merge "Fix testNonIndexableKeys_existInXmlLayout" into udc-dev
2023-05-04 03:15:40 +00:00
Lin Yuan
fbd437f883
[automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234 am: 062a9ca549 am: f86d507407 am: d8321f5df7 am: ae2dd3d513 am: 9e84690fb7 am: dac4ef66d9 am: 19eb02122b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203
Change-Id: Ifd1dc47361a410e25bc37ad928836cc8bd13845f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 03:13:34 +00:00
Lin Yuan
451d363161
[automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234 am: 062a9ca549 am: f86d507407 am: d8321f5df7 am: eb3be1fa5b am: d2ddc84c14 am: ba360fb0a8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203
Change-Id: I1e7993a52503d2d205f824bc61ab84ef87a71de9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 03:13:25 +00:00
Chaohui Wang
f51e1422f3
Update for getSystemPackageNames
...
Param showInstantApps is removed.
Bug: 280280596
Test: Unit Tests
Change-Id: Ib58176d9beefb2d2bdf8c7c969e2cc96bb64f8e7
2023-05-04 02:33:10 +00:00
Lin Yuan
19eb02122b
[automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234 am: 062a9ca549 am: f86d507407 am: d8321f5df7 am: ae2dd3d513 am: 9e84690fb7 am: dac4ef66d9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203
Change-Id: Ib80f670072c0374a62799565be55c60717a52f55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 02:27:50 +00:00
Lin Yuan
ba360fb0a8
[automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234 am: 062a9ca549 am: f86d507407 am: d8321f5df7 am: eb3be1fa5b am: d2ddc84c14
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203
Change-Id: Id91a0044b2863e3cc0d454ac520bddd37f93efba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 02:27:32 +00:00
Lin Yuan
dac4ef66d9
[automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234 am: 062a9ca549 am: f86d507407 am: d8321f5df7 am: ae2dd3d513 am: 9e84690fb7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203
Change-Id: Ia36438aa214a976c0b98eeecec0db054298a8bb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 02:25:07 +00:00
Lin Yuan
9e84690fb7
[automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234 am: 062a9ca549 am: f86d507407 am: d8321f5df7 am: ae2dd3d513
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203
Change-Id: I0521342515969ccb2d46b9e9159d29b998713cd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 01:41:25 +00:00
Lin Yuan
d2ddc84c14
[automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234 am: 062a9ca549 am: f86d507407 am: d8321f5df7 am: eb3be1fa5b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203
Change-Id: I69571348ce67c5a5572a5fb5c15d31c88fb26a4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 01:37:49 +00:00
Treehugger Robot
1f1a6ee337
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 7b5293a704 -s ours am: a1b3c500fd -s ours am: e46c4e5a87 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964411
Change-Id: I9e674cdc7e4089c5281fe00ea7e7e678331a7edd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 01:16:39 +00:00
Lin Yuan
ae2dd3d513
[automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234 am: 062a9ca549 am: f86d507407 am: d8321f5df7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203
Change-Id: I3a9a9ef33b0a7fd985861a85d63d5078d3fe5aa9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 00:53:38 +00:00
Lin Yuan
eb3be1fa5b
[automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234 am: 062a9ca549 am: f86d507407 am: d8321f5df7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203
Change-Id: Iff01dd3f1528b2ded54b281c1f810293093f2ff4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 00:52:56 +00:00
Treehugger Robot
e46c4e5a87
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 7b5293a704 -s ours am: a1b3c500fd -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964411
Change-Id: Ie8baab558556cc4ed06ffcb8b79caa3779990aad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 00:28:23 +00:00
Lin Yuan
d8321f5df7
[automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234 am: 062a9ca549 am: f86d507407
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203
Change-Id: I23d09d7f0c376493ba30ac38577d196b69d46335
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 00:02:52 +00:00
Treehugger Robot
a1b3c500fd
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 7b5293a704 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964411
Change-Id: I17e41ec494a5893cb8eb1f3b8dfbeb46e28d7310
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 23:46:47 +00:00
Lin Yuan
f86d507407
[automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234 am: 062a9ca549
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203
Change-Id: I7884ced3a0a1d29508127fbc263197c20f6ff0d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 23:23:36 +00:00
Lucas Silva
ccabc4e880
Update DreamAdapter to set icon tint colors in xml
...
Setting in xml makes it easier to customize the colors in the SUW vs
normal views.
Bug: 279914654
Test: opened dream settings and verified colors
Change-Id: I367677426b8b538cca19dfdc5d343f66b8f89dba
2023-05-03 18:22:58 -04:00
Bill Yi
537989bfa6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e23f6ea87c -s ours am: 8b08d034f0 -s ours am: c4204c0ef5 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964412
Change-Id: I248841ab481044ab5241596408f67ea6d7e438a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 22:16:54 +00:00
Treehugger Robot
38ea3da507
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 1c79500a0d -s ours am: 4195ac4a28 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22974865
Change-Id: I645d1c84894d93c1b2db984a1e41d61ab040c08e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 22:13:56 +00:00
Bill Yi
b4ab4fd7f6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 86c5b0816b -s ours am: 56cb3df78d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22974865
Change-Id: I81db371b50cc2f85cfd6bf22b8ae077c933dd8bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 22:13:53 +00:00
Treehugger Robot
9147bf15e7
Merge changes from topic "tc_change_23050307_28" into udc-dev am: 954afa9586 am: 79c090dd85
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964411
Change-Id: I4c2d7a67015ec5b9fa7f931eb5c908e3d15274e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 22:12:30 +00:00
Bill Yi
c4204c0ef5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e23f6ea87c -s ours am: 8b08d034f0 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964412
Change-Id: Ia545578de8ee5ec1147a7c47d0f07c51eedc0fac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 22:12:29 +00:00
Bill Yi
c8076ba7b3
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 437972564f am: aa9489179b -s ours am: 2658b9338f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964411
Change-Id: I70f5045f3048b5d8a1b2afc0a0f6350126c49d28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 22:12:25 +00:00
Treehugger Robot
20bbc6456c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: f4ca8c6033 -s ours am: d25d75be91 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22974870
Change-Id: I4d2a2cf0e1a19d307ce8819c64da7021e802c62e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 22:12:06 +00:00
Bill Yi
8cef29d5c4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5c7368b683 -s ours am: afc79889f6 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22974870
Change-Id: I1e1ce4d3fd6b731aa9965986713ddbbedd78f856
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 22:12:03 +00:00
Treehugger Robot
4195ac4a28
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 1c79500a0d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22974865
Change-Id: I1dbc044b56e00fa91ae7bc49b59935d965d3ec08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 22:11:59 +00:00
Bill Yi
56cb3df78d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 86c5b0816b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22974865
Change-Id: I70725f091a2da02f8303c8fa1e3af0da89156959
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 22:11:52 +00:00
Treehugger Robot
79c090dd85
Merge changes from topic "tc_change_23050307_28" into udc-dev am: 954afa9586
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964411
Change-Id: I1af2ab2bf8673b338b10542099519c98ac6cc777
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:50:06 +00:00
Bill Yi
2658b9338f
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 437972564f am: aa9489179b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964411
Change-Id: Ie2e88d5a7767dcfbb631795bab3bd667cf6df57b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:49:59 +00:00
Treehugger Robot
d25d75be91
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: f4ca8c6033 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22974870
Change-Id: Icb1b76e223533802998bd976b5e45f0f67801d6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:49:24 +00:00