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
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
ebe313f746
Merge "Change magnify typing setting item's string." into tm-dev am: 1adba841e1
am: 5e5acb2dc6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17050395
Change-Id: I5f9920ce1622a3a2c3a44e3ac0e98c59e99635ae
2022-03-04 04:41:56 +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
a1a49817ec
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: I175270133231064e084b31eb8c34fe67c871bd51
2022-03-04 04:18:28 +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
0bf3518b23
[automerge] Use android.app.AlertDialog in SetupChooseLockGeneric 2p: cd517a654a
am: e39120e45c
am: 94e495c664
am: 119ecdf838
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17052922
Change-Id: I2be6b5b6f685546b34d7a3f5bdbccd87c74da416
2022-03-04 03:46:15 +00: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
657dd566ef
[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: Id6ce2635c8c68ba6216ea7d142d43fdd036c1a1a
2022-03-04 03:11:52 +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
561dae3e52
Merge "Fix that symbol at top left corner mismatch with remaining options in vision settings." into tm-dev am: ca3a45ebd3
am: 278d6bb342
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17046258
Change-Id: I1da070de38c852cbb56b111a550ea2ebc5e73044
2022-03-04 01:45:04 +00:00
Amy Hsu
75b30a469c
[automerger skipped] Merge "Add ScreenResolutionController to Settings app" into tm-dev am: 27ad4dcf23
am: b38fac221d
-s ours
...
am skip reason: Merged-In I46d3be3b82ca512b8672efaa489df2cdaab26d6d with SHA-1 0dea418d57
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17046255
Change-Id: I50fe88270a2417b7a8b56e3498f6163a452826b3
2022-03-04 01:44:50 +00:00
TreeHugger Robot
aaa96bc887
[automerger skipped] Merge "[SafetyCenter] Update Settings to align with renamed SafetyCenterManager APIs" into tm-dev am: 5ccb07df85
-s ours am: 5663decd9b
-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: I206983fbf56236b15ceb400cdaa6bb77a670e3fc
2022-03-04 01:44:38 +00:00
Karishma Vakil
c30da6d134
[automerger skipped] [SafetyCenter] Update Settings to align with renamed SafetyCenterManager APIs am: e23cd8ad0b
-s ours am: eafa5b0666
-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: I7f6425921f93e83142b8a5572da87451b4f3ad9c
2022-03-04 01:44:34 +00:00
PETER LIANG
69c7484596
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: I17ae8d83a2629e64458f500c5000f8f15d8094b6
2022-03-04 01:24:32 +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
Amy Hsu
970595deb2
[automerger skipped] Merge "Add ScreenResolutionController to Settings app" into tm-dev am: 27ad4dcf23
-s ours
...
am skip reason: Merged-In I46d3be3b82ca512b8672efaa489df2cdaab26d6d with SHA-1 b7b6ed91cf
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17046255
Change-Id: Ib28fcf2d27e95d82dbf607a71351603b571a7fed
2022-03-04 01:24:11 +00:00
Amy Hsu
552d9fc08c
[automerger skipped] Add ScreenResolutionController to Settings app am: 0dea418d57
-s ours
...
am skip reason: Merged-In I46d3be3b82ca512b8672efaa489df2cdaab26d6d with SHA-1 b7b6ed91cf
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17046255
Change-Id: I1558a0c9c2eeb76e4cd7791e7a58345223487f06
2022-03-04 01:24:06 +00:00
TreeHugger Robot
b5c665e2c1
[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: Ia9e0fdcb7f61cd8b4920673c43bc0845a90428d3
2022-03-04 01:23:17 +00:00
Karishma Vakil
314d6893d1
[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: If080f0a78180708df3ca989546838c07086e84eb
2022-03-04 01:23:16 +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
PETER LIANG
ca3a45ebd3
Merge "Fix that symbol at top left corner mismatch with remaining options in vision settings." into tm-dev
2022-03-04 01:21:58 +00:00
Amy Hsu
27ad4dcf23
Merge "Add ScreenResolutionController to Settings app" into tm-dev
2022-03-04 01:08:00 +00:00
TreeHugger Robot
5ccb07df85
Merge "[SafetyCenter] Update Settings to align with renamed SafetyCenterManager APIs" into tm-dev
2022-03-04 00:57:08 +00:00
Yasin Kilicdere
413157cfe5
[automerger skipped] Merge "Fix Guest string was not translated in UMS.userWithName()" into tm-dev am: 9f54f436d1
am: caf7556e20
-s ours
...
am skip reason: Merged-In I92acad938d79e21b45af99cc76ff411022b61f1b with SHA-1 3fc4642ab4
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17070265
Change-Id: I3c84dac09527213021a2c2ff505b0c717754db56
2022-03-04 00:50:13 +00:00
Yasin Kilicdere
caf7556e20
Merge "Fix Guest string was not translated in UMS.userWithName()" into tm-dev am: 9f54f436d1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17070265
Change-Id: I7df4cec3b8687f4fdfabb892db8e626086dacc85
2022-03-04 00:29:07 +00:00