Commit Graph

100628 Commits

Author SHA1 Message Date
SongFerng Wang
d2f3b44d6a Merge "[MEP] The condition of "null point check" is wrong" 2022-03-01 15:02:19 +00:00
Julia Reynolds
c8e5e7259b Merge "Disable app toggle for some T+ apps" into tm-dev am: 40caac3c9e am: 0f4cde548d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17002650

Change-Id: I2dbce0c5f3f252a87b22385b96a4420f2a9588a7
2022-03-01 14:31:10 +00:00
Julia Reynolds
97420bf2c9 Merge "Disable app toggle for some T+ apps" into tm-dev am: 40caac3c9e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17002650

Change-Id: Iefc69ed63d3ffd516a73c90d86ef502327934318
2022-03-01 14:10:12 +00:00
Julia Reynolds
0f4cde548d Merge "Disable app toggle for some T+ apps" into tm-dev am: 40caac3c9e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17002650

Change-Id: Ia545dd5cc281ed8b185eb681d3902cc14718c87f
2022-03-01 14:08:59 +00:00
Julia Reynolds
40caac3c9e Merge "Disable app toggle for some T+ apps" into tm-dev 2022-03-01 13:42:26 +00:00
Tsung-Mao Fang
bf19198b95 [automerger skipped] Merge "Make homepage search bar remain persistent when scrolling" into tm-dev am: c0c6944e95 am: 1805277c2a -s ours
am skip reason: Merged-In Ice88c1bb324780e72332dd810e654b1d17daafae with SHA-1 bcfd5b3d65 is already in history

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

Change-Id: Ia2bcc7263eeb6204759e99610084bdcc698310ff
2022-03-01 09:16:42 +00:00
Tsung-Mao Fang
7cf627c625 [automerger skipped] Merge "Make homepage search bar remain persistent when scrolling" into tm-dev am: c0c6944e95 -s ours
am skip reason: Merged-In Ice88c1bb324780e72332dd810e654b1d17daafae with SHA-1 7cf0819b41 is already in history

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

Change-Id: Iaad38e0ef1fa8a18fdc633ef7a1a791951616862
2022-03-01 08:56:13 +00:00
Jason Chiu
1d37be08dd [automerger skipped] Make homepage search bar remain persistent when scrolling am: bcfd5b3d65 -s ours
am skip reason: Merged-In Ice88c1bb324780e72332dd810e654b1d17daafae with SHA-1 7cf0819b41 is already in history

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

Change-Id: Ida06e34ce386fa371019742f8e6dbdd43292678a
2022-03-01 08:56:11 +00:00
Tsung-Mao Fang
1805277c2a Merge "Make homepage search bar remain persistent when scrolling" into tm-dev am: c0c6944e95
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17033477

Change-Id: I85fe91d08983dfb15a571fc0aae69607e886c8e7
2022-03-01 08:55:13 +00:00
Tsung-Mao Fang
c0c6944e95 Merge "Make homepage search bar remain persistent when scrolling" into tm-dev 2022-03-01 08:30:38 +00:00
Marie Matheson
c427b1950e Merge "On Settings lockscreen changes send new safety status to Safety Center." into tm-dev am: 1a2adf5115 am: 5d99918559
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17007073

Change-Id: I7dc4afe432439956d4602ac2129f9c3aca69b26b
2022-03-01 07:58:58 +00:00
SongFerngWang
f64b2c09c0 [MEP] The condition of "null point check" is wrong
The condition of "null point check" is wrong at the
SimSlotChangeHandler.

Bug: 222035986
Test: Build pass. maunal test.
Change-Id: I1b81faf082163643c1d17eae2f66d75b450288fe
2022-03-01 15:46:28 +08:00
Marie Matheson
fa49b11c8f Merge "On Settings lockscreen changes send new safety status to Safety Center." into tm-dev am: 1a2adf5115
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17007073

Change-Id: Ic80770fd10d2d30c1e8f43989196b787451dfe4e
2022-03-01 07:37:55 +00:00
Marie Matheson
5d99918559 Merge "On Settings lockscreen changes send new safety status to Safety Center." into tm-dev am: 1a2adf5115
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17007073

Change-Id: I423f58d70dc5151e5dd61ffdd229020c909a1af0
2022-03-01 07:36:38 +00:00
Jason Chiu
bcfd5b3d65 Make homepage search bar remain persistent when scrolling
- Modify the scroll flag
- Add a background to avoid overlapping

Fix: 218825541
Test: visual
Change-Id: Ice88c1bb324780e72332dd810e654b1d17daafae
Merged-in: Ice88c1bb324780e72332dd810e654b1d17daafae
(cherry picked from commit 7cf0819b41)
2022-03-01 07:30:08 +00:00
Marie Matheson
1a2adf5115 Merge "On Settings lockscreen changes send new safety status to Safety Center." into tm-dev 2022-03-01 07:18:02 +00:00
Tsung-Mao Fang
38c32a8f3f Merge "Media permission update for Android T" into tm-dev am: 27bef200be am: 7bedb65b99
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16972172

Change-Id: Iaf46336b1962275eb20adf26f27bf336eaf33846
2022-03-01 04:05:42 +00:00
Tsung-Mao Fang
be8c6ce724 Merge "Media permission update for Android T" into tm-dev am: 27bef200be
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16972172

Change-Id: Id19f23a3de163a0859418d3e9fc86654cd370221
2022-03-01 03:45:24 +00:00
Tsung-Mao Fang
7bedb65b99 Merge "Media permission update for Android T" into tm-dev am: 27bef200be
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16972172

Change-Id: Ia3accf8a97fa774868f462b972be7421301f1e97
2022-03-01 03:44:57 +00:00
Tsung-Mao Fang
27bef200be Merge "Media permission update for Android T" into tm-dev 2022-03-01 03:27:00 +00:00
TreeHugger Robot
283911bdc8 Merge "Enable touch feedback settings when the phone is in silent mode" into tm-dev am: f73af73a1a am: d16c71ad9a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16980963

Change-Id: I13cc8e55760475ba4f3ee870160c465133414dfe
2022-02-28 23:00:21 +00:00
TreeHugger Robot
d16c71ad9a Merge "Enable touch feedback settings when the phone is in silent mode" into tm-dev am: f73af73a1a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16980963

Change-Id: I8006ca90c64caceec0452bbda22e8aeeeedecac5
2022-02-28 22:54:33 +00:00
TreeHugger Robot
b0f4fd347f Merge "Enable touch feedback settings when the phone is in silent mode" into tm-dev am: f73af73a1a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16980963

Change-Id: I8c36a15f8e525af25eb36fd2585371048ea89228
2022-02-28 22:54:26 +00:00
TreeHugger Robot
f73af73a1a Merge "Enable touch feedback settings when the phone is in silent mode" into tm-dev 2022-02-28 22:46:22 +00:00
TreeHugger Robot
e9b00be6f6 Merge "Change dream icon color to be the same as the text color." into tm-dev am: 090e1d395a am: 33b385157e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17015305

Change-Id: Ie08c04b7cb8ac87796101c59c7d0ec0153221e6f
2022-02-28 22:25:20 +00:00
Yuri Lin
5a28e15e74 [automerger skipped] Merge "Revert "Rename Do Not Disturb -> Priority Mode"" into tm-dev am: bf643f9276 am: fb5cec2c79 -s ours
am skip reason: Merged-In I7516c97809c7968f999d7caa8885f0cb5cdc844f with SHA-1 f26a246f5a is already in history

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

Change-Id: I24673e16c50f892b71d3b652fa1841d5dc3da374
2022-02-28 22:11:33 +00:00
TreeHugger Robot
33b385157e Merge "Change dream icon color to be the same as the text color." into tm-dev am: 090e1d395a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17015305

Change-Id: I8f76801f746a44d09c8f4e778d71fb55933306ef
2022-02-28 21:16:37 +00:00
Yuri Lin
fb5cec2c79 Merge "Revert "Rename Do Not Disturb -> Priority Mode"" into tm-dev am: bf643f9276
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17034508

Change-Id: Ib79d31b6d53d22c79f158a18b63f365216657353
2022-02-28 21:13:34 +00:00
TreeHugger Robot
046da2b819 Merge "Change dream icon color to be the same as the text color." into tm-dev am: 090e1d395a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17015305

Change-Id: I76f5e2980989eba92a48972f3f2abc87247bdf61
2022-02-28 21:12:35 +00:00
Yuri Lin
5a3dc630a7 [automerger skipped] Merge "Revert "Rename Do Not Disturb -> Priority Mode"" into tm-dev am: bf643f9276 -s ours
am skip reason: Merged-In I7516c97809c7968f999d7caa8885f0cb5cdc844f with SHA-1 32fc9d9184 is already in history

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

Change-Id: I11ee3292cecab7974f63152b9408671af80b6509
2022-02-28 21:09:38 +00:00
Yuri Lin
69d4be55e9 [automerger skipped] Revert "Rename Do Not Disturb -> Priority Mode" am: f26a246f5a -s ours
am skip reason: Merged-In I7516c97809c7968f999d7caa8885f0cb5cdc844f with SHA-1 32fc9d9184 is already in history

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

Change-Id: I3665330f752f34195f8ca2a42e4eb9f516355f0a
2022-02-28 21:09:32 +00:00
TreeHugger Robot
090e1d395a Merge "Change dream icon color to be the same as the text color." into tm-dev 2022-02-28 20:41:56 +00:00
Yuri Lin
bf643f9276 Merge "Revert "Rename Do Not Disturb -> Priority Mode"" into tm-dev 2022-02-28 20:20:23 +00:00
Joe Bolinger
7a860d693e Merge "Persist state of no thanks button." into tm-dev am: 72f84a96d8 am: afc6079973
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17016922

Change-Id: I2d05514735968b3e3111964eddd79bd8f73f3d17
2022-02-28 18:40:55 +00:00
Joe Bolinger
9b6402b1f2 Merge "Persist state of no thanks button." into tm-dev am: 72f84a96d8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17016922

Change-Id: I1727426ef3b8533ee72290120cc529016345f43a
2022-02-28 18:20:41 +00:00
Joe Bolinger
afc6079973 Merge "Persist state of no thanks button." into tm-dev am: 72f84a96d8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17016922

Change-Id: I5ab77858324c3017f0f172c7be2dd78a8e3eb4a6
2022-02-28 18:19:57 +00:00
Joe Bolinger
72f84a96d8 Merge "Persist state of no thanks button." into tm-dev 2022-02-28 18:02:28 +00:00
Marie Matheson
9f7374b045 On Settings lockscreen changes send new safety status to Safety Center.
Bug: 215518847
Test: atest SettingsUnitTests
Test: make RunSettingsRoboTests
Change-Id: Id8e957e58c45195260157b2b61b93ecbc203164b
2022-02-28 16:36:46 +00:00
Yuri Lin
f26a246f5a Revert "Rename Do Not Disturb -> Priority Mode"
Revert submission 16632971-yl-prioritymode

Reason for revert: We're not launching this change with T, so this will revert all the relevant string changes.
Reverted Changes:
I5eff72db8:Rename Do Not Disturb -> Priority Mode
Ie7a9e35e6:Rename Do Not Disturb -> Priority Mode
I7bb74d2fd:Rename Do Not Disturb -> Priority Mode
Id17942024:Rename Do Not Disturb -> Priority Mode
Ib8efd7289:Rename Do Not Disturb -> Priority Mode
Ia1b77f9ee:Rename Do Not Disturb -> Priority Mode

Bug: 190180868
Test: TH

Change-Id: I7516c97809c7968f999d7caa8885f0cb5cdc844f
Merged-In: I7516c97809c7968f999d7caa8885f0cb5cdc844f
2022-02-28 16:33:33 +00:00
Yuri Lin
dd6cf38405 Merge "Revert "Rename Do Not Disturb -> Priority Mode"" 2022-02-28 15:57:05 +00:00
Evan Laird
c7ffca9d5a Merge "Add setting for showing the vibrate icon in status bar" into tm-dev am: 969625bc8e am: 95184c72dd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16986239

Change-Id: I5b14cdabc41b9093fe53423a876e5aead395e017
2022-02-28 15:55:40 +00:00
Evan Laird
38770319fd Merge "Add setting for showing the vibrate icon in status bar" into tm-dev am: 969625bc8e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16986239

Change-Id: I6b8767252a2de9a3b07bac16ea1b18379fd01eb4
2022-02-28 15:35:39 +00:00
Evan Laird
95184c72dd Merge "Add setting for showing the vibrate icon in status bar" into tm-dev am: 969625bc8e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16986239

Change-Id: Ife07955ce96448e9641a32c838b5178fad7a63cf
2022-02-28 15:34:21 +00:00
Evan Laird
969625bc8e Merge "Add setting for showing the vibrate icon in status bar" into tm-dev 2022-02-28 15:10:23 +00:00
TreeHugger Robot
3d345dda13 Merge "Update dream preview button text color" into tm-dev am: 3afc9399f7 am: 5aa1a810b1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17015304

Change-Id: Ia3217b94aa4bc02aa7a122733eede5a7ed53ceb7
2022-02-25 22:12:00 +00:00
TreeHugger Robot
792e514bd0 Merge "Update dream preview button text color" into tm-dev am: 3afc9399f7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17015304

Change-Id: I2a5a4554e4d316903679fb5bd4a322f67d75e8e9
2022-02-25 21:49:36 +00:00
TreeHugger Robot
5aa1a810b1 Merge "Update dream preview button text color" into tm-dev am: 3afc9399f7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17015304

Change-Id: I0d3d60c2a8acdbaf302d6f1162cac91234ed97a5
2022-02-25 21:49:23 +00:00
Joe Bolinger
017545c6d1 Persist state of no thanks button.
Fix: 207724636
Test: manual (scroll to bottom and rotate device)
Change-Id: I5ef486dc49abd22387b5f6edf67eedaacc9ded4a
2022-02-25 21:42:36 +00:00
TreeHugger Robot
3afc9399f7 Merge "Update dream preview button text color" into tm-dev 2022-02-25 21:11:19 +00:00
Aaron Liu
9a0139b7d2 Merge "Home Controls: Add Device Controls settings" into tm-dev am: 7e24127f12 am: bb197a869a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16991609

Change-Id: Iff3565d6b3833423f1a82c71b398c99f495e03b1
2022-02-25 20:15:49 +00:00