Commit Graph

101150 Commits

Author SHA1 Message Date
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
cff01f86ae Merge "Move the "Dark theme" preference into the "Color and Motion" page." into tm-dev am: a92e6d8987 am: 3aae0b58d9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17050402

Change-Id: I9adc3117f979dbda390f19675691ddf46af41b34
2022-03-06 17:08:51 +00:00
PETER LIANG
7e8bb4619b 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: I15c8fc71a54898a0ee8207f910d24fa088df605a
2022-03-06 16:46:47 +00: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
bd0f0e127c Merge "Remove no reference code" into tm-dev am: 73b858db47 am: d39dbd2bf9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17071790

Change-Id: Ifca138abd22e36d62df8f5272b6bafe6d9b7d0cb
2022-03-05 08:06:56 +00:00
TreeHugger Robot
b8fe10e1b1 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: Ifd9ce6c876105fa1db0256b33ef308ae7e65b1da
2022-03-05 07:42:19 +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
6723980f66 Merge "Apply proper icon tinting to dream icons" into tm-dev am: ccf275d55c am: 0bd1cdbee2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17086911

Change-Id: Ib0eeb282d22e52a8564821fc5c35e2a0a7ab44fe
2022-03-05 01:44:47 +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
c0d5dc01d5 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: I50f660d919be39e696c61b414fcb7780de21d30f
2022-03-05 01:22:50 +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
05bb13f94e Fix bug where dream preview image s not reset. am: eddf2b1345 am: f044d6a4e6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17083780

Change-Id: I5c58b6dbd11bd79cc7baf246ce37843bdb738b14
2022-03-04 23:19:36 +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
213ffe1c3b 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: I4e0bbcd4648ab313679faff06f61161098f5d244
2022-03-04 22:56:21 +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
e57896bb4a Merge "Introduce developer option for Stylus handwriting" into tm-dev am: a10dc5280d am: f4a312d1c5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16972176

Change-Id: Ie542956d9da05857c925643f7c536e658f0c5e06
2022-03-04 18:54:55 +00: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
Taran Singh
2c52b9d3de 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: I7ee37918aa8ae20fd7ba5520a522b569e0f43d2c
2022-03-04 18:32:17 +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
TreeHugger Robot
21d7d18a41 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-03-04 17:00:07 +00:00
Yasin Kilicdere
a30b27657b Revert "Remove the fallback AddSupervisedUserActivity."
This reverts commit 86f3500439.

Reason for revert: Real flow is not ready yet, so we still need the fallback activity.

Change-Id: I34dc5386ff8c18a62b4b11e25fd355a62602329f
2022-03-04 15:44:42 +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
28beed394e Merge "Remove InterfaceState and Role @IntDef from TetheredSettings." am: ebebc5e1e9 am: 39bc6f906f am: 60dfd4e89f am: 602ea501a6 am: 1bf408cb37
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2007411

Change-Id: I069d27ad15e199a7061928350d36c0b25ded3f9e
2022-03-04 09:46:06 +00:00
Xiao Ma
c82d7c9d22 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: I5a7d5891529db39df54a9a02cdae5d86ae86bac2
2022-03-04 09:24:27 +00: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
c9589e9aef Merge "Add dynamic color support" into tm-dev am: f578c547ad am: 76c04b7202
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17077606

Change-Id: I1d82087edf6ad6f7580ec8b9faf95c0ad27eda1b
2022-03-04 07:45:39 +00:00
Cn Chen
fdc5fdbf49 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: I7a125c9fc71af01616c0d229ff2095af11a0d952
2022-03-04 07:23:29 +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
ee152cf9de [automerger skipped] Merge "Add summary and footer message for the ScreenResolutionFragment." into tm-dev am: c8f9f36273 am: 784bbc2cde -s ours
am skip reason: Merged-In Iee1e74d3d4de81500b2abe62bc7e9bd69f55452c with SHA-1 372bbdcf9c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17071745

Change-Id: I981ffa7d4a82f150bb6b055c87a0ceabfd7b9bfb
2022-03-04 06:40:51 +00:00
SongFerng Wang
ffe068c1cf Merge "[MEP] psim's logical slot index is 0" into tm-dev am: eeb16a306f am: 791f961dcb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17070544

Change-Id: I2f94175562a9d55786f976ef3c2cafd327a590a2
2022-03-04 06:40:34 +00:00
Jason Chiu
d5eb038581 Merge "Remove Flashlight from search results while the hardware is unavailable" into tm-dev am: 306964cc65 am: 6fbfe9474c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17077605

Change-Id: Id3175a51bd9da98b58431ddd789b8738bab88b1f
2022-03-04 06:40:19 +00:00
Amy Hsu
98722e5040 [automerger skipped] Merge "Add summary and footer message for the ScreenResolutionFragment." into tm-dev am: c8f9f36273 -s ours
am skip reason: Merged-In Iee1e74d3d4de81500b2abe62bc7e9bd69f55452c with SHA-1 d633cd6b32 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17071745

Change-Id: I56fc20cd8e0df25458883550b5720a52656662a6
2022-03-04 06:30:43 +00:00
Amy Hsu
f5f1e3b9bd [automerger skipped] Add summary and footer message for the ScreenResolutionFragment. am: 372bbdcf9c -s ours
am skip reason: Merged-In Iee1e74d3d4de81500b2abe62bc7e9bd69f55452c with SHA-1 d633cd6b32 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17071745

Change-Id: Ic4a2d3aeddc87a9cf4a764cfe72c4f1cd577ca85
2022-03-04 06:30:41 +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
1747f6b266 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: Ic18f18f2b64e477c51dda8521aa2375eceec26c8
2022-03-04 06:20:25 +00:00
Jason Chiu
4013f4e0e0 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: I0273580976343a53c14cf4e06d7e69cfb20f57ef
2022-03-04 06:20:12 +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