Chaohui Wang
18e2057de2
Merge "Fix Other default preferences alignment" am: c73dfdb858
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2010297
Change-Id: Ifa8dfd7f0d452b9e8e47e719eefadf26eee4309f
2022-03-07 12:41:09 +00:00
Chaohui Wang
c73dfdb858
Merge "Fix Other default preferences alignment"
2022-03-07 12:21:12 +00:00
Yuri Ufimtsev
f15bebe6c3
Inject different User IDs into biometric utils
...
Test: atest SettingsUnitTests
Bug: 222217132
Change-Id: I7939d78817f53814d0f8fb4636231a4833fbe26a
2022-03-07 10:04:25 +00:00
Chaohui Wang
71f2d6d44c
Fix Other default preferences alignment
...
Bug: 222333696
Change-Id: Icdcfff728c891b81d3976f3d625aa93b5154198c
Test: Manual on Pixel device
2022-03-07 09:36:14 +00:00
SongFerng Wang
b5e8c78adb
Merge "In E+E, the user can't enable the PSIM" into tm-dev am: bdd37ce348
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17092188
Change-Id: I001b72a18faa2a29279cf74a2fec1f633d3f7451
2022-03-07 07:55:29 +00:00
SongFerng Wang
bdd37ce348
Merge "In E+E, the user can't enable the PSIM" into tm-dev
2022-03-07 07:32:57 +00:00
TreeHugger Robot
e2daf9fe76
Merge "p2p: Close the channel when onStop is called." into tm-dev am: 8f8e9c98f4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16986446
Change-Id: Ie6c1ac6d7df31802f8b4e791bd01bf0abd587697
2022-03-07 06:59:41 +00:00
TreeHugger Robot
8f8e9c98f4
Merge "p2p: Close the channel when onStop is called." into tm-dev
2022-03-07 06:40:05 +00:00
Stanley Wang
0b84af4f7d
Merge "Fix the problem that the autofill could be searched." into tm-dev am: 96d82e3d05
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17043948
Change-Id: Id21ed0f41820ff296c9d46099857edb2ad49a5f5
2022-03-07 06:28:39 +00:00
Stanley Wang
96d82e3d05
Merge "Fix the problem that the autofill could be searched." into tm-dev
2022-03-07 06:11:52 +00:00
SongFerngWang
68cfaafe73
In E+E, the user can't enable the PSIM
...
In the E+E and there is the empty slot, the user can't enable PSIM.
Since the settings can't set the correct simSlotMapping.
Bug: 222231991
Test: atest UiccSlotUtilTest (All passes) and Build pass
Change-Id: Ia261e3b41c6c4a43a5429815d93ae9f6ff16f0ec
2022-03-07 12:44:00 +08:00
Jimmy Chen
78a0f6f98e
p2p: Close the channel when onStop is called.
...
P2P dialog is moved to an indenpendent activity, it will push Settings
to background and trigger onPause(). As P2P dialog is a Dialog Activity,
it won't trigger onStop, but SoftAp and NAN activity will. Moving
channel closing to onStop to adapt to new P2P dialog design.
Bug: 219406778
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiP2pSettingsTest
create a p2p connection between 2 devices with this build.
Change-Id: I2fab5aa1021ec1a993f811c7310079db9d7f03c0
2022-03-07 10:44:04 +08:00
PETER LIANG
3aae0b58d9
Merge "Move the "Dark theme" preference into the "Color and Motion" page." into tm-dev am: a92e6d8987
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17050402
Change-Id: Id7daa4a35a37fc52804532a65c0775ff1ba879b2
2022-03-06 16:45:33 +00:00
PETER LIANG
a92e6d8987
Merge "Move the "Dark theme" preference into the "Color and Motion" page." into tm-dev
2022-03-06 16:23:08 +00:00
TreeHugger Robot
d39dbd2bf9
Merge "Remove no reference code" into tm-dev am: 73b858db47
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17071790
Change-Id: I8dde2311841502b7a803a26d84df86dbcff5b3e0
2022-03-05 07:41:07 +00:00
TreeHugger Robot
73b858db47
Merge "Remove no reference code" into tm-dev
2022-03-05 07:16:22 +00:00
TreeHugger Robot
0bd1cdbee2
Merge "Apply proper icon tinting to dream icons" into tm-dev am: ccf275d55c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17086911
Change-Id: I99bd75c2e1ec33bd523f44bcefdd4a53f11332f8
2022-03-05 01:22:56 +00:00
TreeHugger Robot
ccf275d55c
Merge "Apply proper icon tinting to dream icons" into tm-dev
2022-03-05 00:53:57 +00:00
Lucas Silva
f044d6a4e6
Fix bug where dream preview image s not reset. am: eddf2b1345
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17083780
Change-Id: I64bbedb1ca48abf2c15857ea9f5418620e417f5d
2022-03-04 22:56:36 +00:00
Lucas Silva
cf7338c1cf
Apply proper icon tinting to dream icons
...
Test: locally on device
Bug: 222754771
Change-Id: I2998a37db4221f6beaeca591532ccc35d0992b86
2022-03-04 17:50:56 -05:00
Lucas Silva
eddf2b1345
Fix bug where dream preview image s not reset.
...
When the view is recycled, there may be an old preview image in the view
which should be cleared.
Bug: 222705951
Test: locally on device
Change-Id: I4bb1c176a9a6d04fd41780fa2da09ca685b87d26
2022-03-04 15:35:26 -05:00
Taran Singh
f4a312d1c5
Merge "Introduce developer option for Stylus handwriting" into tm-dev am: a10dc5280d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16972176
Change-Id: Id0eb05463067ae69cddca56e2ffa80f8d62f4152
2022-03-04 18:32:29 +00:00
Yasin Kilicdere
4e31442a72
Update UI to show feedback while creating Guest from Settings.
...
Make UM.createGuest call async and show "Creating new guest" dialog during.
Bug: 219741250
Test: Manual
Change-Id: I7e3497fef283a4c13719a12b962866f88e9e5a50
2022-03-04 18:24:56 +00:00
Taran Singh
a10dc5280d
Merge "Introduce developer option for Stylus handwriting" into tm-dev
2022-03-04 18:21:20 +00:00
Tsung-Mao Fang
6af43b1412
Remove no reference code
...
- Remove ControllerTask and ControllerFutureTask.
- Remove ControllerTaskTest and ControllerFutureTaskTest.
Fixes: 222661474
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.dashboard
Change-Id: I36f4e723c40aa59ecb3b087cab11f2a744540812
2022-03-04 20:28:28 +08:00
Xiao Ma
1bf408cb37
Merge "Remove InterfaceState and Role @IntDef from TetheredSettings." am: ebebc5e1e9
am: 39bc6f906f
am: 60dfd4e89f
am: 602ea501a6
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2007411
Change-Id: I6985a37c4ac53638c4c663f5f3c0a7d386a3a390
2022-03-04 09:23:14 +00:00
Xiao Ma
602ea501a6
Merge "Remove InterfaceState and Role @IntDef from TetheredSettings." am: ebebc5e1e9
am: 39bc6f906f
am: 60dfd4e89f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2007411
Change-Id: Ide96b958cd24eb08aac39fd58d6d9d681b9686b0
2022-03-04 09:01:52 +00:00
Xiao Ma
60dfd4e89f
Merge "Remove InterfaceState and Role @IntDef from TetheredSettings." am: ebebc5e1e9
am: 39bc6f906f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2007411
Change-Id: I87aa662e232eff08faa456b1de2507683684b564
2022-03-04 08:41:05 +00:00
Xiao Ma
39bc6f906f
Merge "Remove InterfaceState and Role @IntDef from TetheredSettings." am: ebebc5e1e9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2007411
Change-Id: Ica6d4fa97c90e7af1607b3bcb9ceddc6ff0d9c58
2022-03-04 08:19:17 +00:00
Xiao Ma
ebebc5e1e9
Merge "Remove InterfaceState and Role @IntDef from TetheredSettings."
2022-03-04 08:00:01 +00:00
Cn Chen
76c04b7202
Merge "Add dynamic color support" into tm-dev am: f578c547ad
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17077606
Change-Id: I24c12cf10c653f406e35935dabdb5dbdacb46802
2022-03-04 07:21:38 +00:00
Cn Chen
f578c547ad
Merge "Add dynamic color support" into tm-dev
2022-03-04 07:03:17 +00:00
Amy Hsu
784bbc2cde
Merge "Add summary and footer message for the ScreenResolutionFragment." into tm-dev am: c8f9f36273
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17071745
Change-Id: If360c8fe27adfd629b982dc780d0846f80d1343a
2022-03-04 06:29:48 +00:00
Amy Hsu
c8f9f36273
Merge "Add summary and footer message for the ScreenResolutionFragment." into tm-dev
2022-03-04 06:24:08 +00:00
SongFerng Wang
791f961dcb
Merge "[MEP] psim's logical slot index is 0" into tm-dev am: eeb16a306f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17070544
Change-Id: I99674c0307af607d6553db9785b35e4f5a89ecd9
2022-03-04 06:19:18 +00:00
Jason Chiu
6fbfe9474c
Merge "Remove Flashlight from search results while the hardware is unavailable" into tm-dev am: 306964cc65
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17077605
Change-Id: I96e44c4b0ee8468198b35204e1dc02c8b2ef1a79
2022-03-04 06:18:46 +00:00
Xiao Ma
bb0a8f2523
Remove InterfaceState and Role @IntDef from TetheredSettings.
...
@InterfaceState and @Role won't be exposed as module-lib APIs from
EthernetManager after migration, which are not visible for Settings
code, remove them as well.
Bug: 210586283
Test: m Settings
Change-Id: I49f0e8401681e66d6f5853c8eb3205fcef803c25
2022-03-04 06:09:33 +00:00
SongFerng Wang
eeb16a306f
Merge "[MEP] psim's logical slot index is 0" into tm-dev
2022-03-04 05:57:55 +00:00
Jason Chiu
306964cc65
Merge "Remove Flashlight from search results while the hardware is unavailable" into tm-dev
2022-03-04 05:56:38 +00:00
TreeHugger Robot
5e5acb2dc6
Merge "Change magnify typing setting item's string." into tm-dev am: 1adba841e1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17050395
Change-Id: If3cf747919bd0b74baa93efd86aeb40e1ebb6cab
2022-03-04 04:18:36 +00:00
TreeHugger Robot
1adba841e1
Merge "Change magnify typing setting item's string." into tm-dev
2022-03-04 04:00:14 +00:00
cnchen
3aff4b1513
Add dynamic color support
...
(before)https://hsv.googleplex.com/6220707954425856
(after)https://hsv.googleplex.com/6270261408038912
Bug: 209889556
Test: see the hsv above
Change-Id: Ifee0392c189dbe7210ba2561355e2c275e7cb7fe
2022-03-04 11:58:26 +08:00
Jason Chiu
705276771a
Remove Flashlight from search results while the hardware is unavailable
...
Test: manual
Fix: 222599976
Change-Id: I353b872f9e56f5e00026e95933125c345636bbd2
2022-03-04 11:49:29 +08:00
Presubmit Automerger Backend
119ecdf838
[automerge] Use android.app.AlertDialog in SetupChooseLockGeneric 2p: cd517a654a
am: e39120e45c
am: 94e495c664
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17052922
Change-Id: I3a264afd379f6e682250de744b1b15f5c5141e2c
2022-03-04 03:11:53 +00:00
Presubmit Automerger Backend
94e495c664
[automerge] Use android.app.AlertDialog in SetupChooseLockGeneric 2p: cd517a654a
am: e39120e45c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17052922
Change-Id: Iec0a0fb6c595a7e1f416dd3c3937085989caf4f5
2022-03-04 02:50:17 +00:00
Amy Hsu
372bbdcf9c
Add summary and footer message for the ScreenResolutionFragment.
...
Bug: b/199559703
Test: Check resolution switch UI in Settings app
atest SettingsUnitTests:ScreenResolutionControllerTest
atest SettingsUnitTests:ScreenResolutionFragmentTest
Change-Id: Iee1e74d3d4de81500b2abe62bc7e9bd69f55452c
(cherry picked from commit d633cd6b32
)
Merged-In: Iee1e74d3d4de81500b2abe62bc7e9bd69f55452c
2022-03-04 02:45:15 +00:00
PETER LIANG
278d6bb342
Merge "Fix that symbol at top left corner mismatch with remaining options in vision settings." into tm-dev am: ca3a45ebd3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17046258
Change-Id: I7dbac3c2a168218a9830360448909f874be3fda8
2022-03-04 01:24:28 +00:00
Amy Hsu
b38fac221d
Merge "Add ScreenResolutionController to Settings app" into tm-dev am: 27ad4dcf23
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17046255
Change-Id: I586caad6daed97f3516e67a8c201af668e5b0634
2022-03-04 01:24:14 +00:00
TreeHugger Robot
5663decd9b
[automerger skipped] Merge "[SafetyCenter] Update Settings to align with renamed SafetyCenterManager APIs" into tm-dev am: 5ccb07df85
-s ours
...
am skip reason: Merged-In Ieaa1c9d04a0a9805abb10025f170cd9283b4a906 with SHA-1 9540b9b15b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16965145
Change-Id: I185594dfe970883870d52fbe66305b2e159b3e34
2022-03-04 01:22:36 +00:00
Karishma Vakil
eafa5b0666
[automerger skipped] [SafetyCenter] Update Settings to align with renamed SafetyCenterManager APIs am: e23cd8ad0b
-s ours
...
am skip reason: Merged-In Ieaa1c9d04a0a9805abb10025f170cd9283b4a906 with SHA-1 9540b9b15b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16965145
Change-Id: I581392bcef14d0834a5d67c766817d62131825a4
2022-03-04 01:22:34 +00:00