Commit Graph

100797 Commits

Author SHA1 Message Date
Evan Laird
3a46e06c41 [automerger skipped] Merge "Add setting for showing the vibrate icon in status bar" into sc-v2-dev am: 15a87a86bb -s ours
am skip reason: Merged-In I2d389d71dd9402353b058039464495a1d33ef0e9 with SHA-1 16148d2c8c is already in history

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

Change-Id: I540666b2e72f0b6d63980e63fe0f39afa2d464bf
2022-03-01 16:41:05 +00:00
Evan Laird
9aba5cfec7 [automerger skipped] Merge changes from topic "vibrate-setting" into sc-v2-dev-plus-aosp am: 39c4d8b827 -s ours
am skip reason: Merged-In I2d389d71dd9402353b058039464495a1d33ef0e9 with SHA-1 4871b2cf6a is already in history

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

Change-Id: Ic65720729a0e09d76ea934a5b89ffbfcd53f5000
2022-03-01 16:35:33 +00:00
Presubmit Automerger Backend
cf59b35348 [automerger skipped] [automerge] Add setting for showing the vibrate icon in status bar 2p: 16148d2c8c am: 0b843be422 -s ours
am skip reason: Merged-In I2d389d71dd9402353b058039464495a1d33ef0e9 with SHA-1 4871b2cf6a is already in history

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

Change-Id: I0bd94051649ada1d7bbe832592892808182966c5
2022-03-01 16:35:29 +00:00
Jan Tomljanovic
66a3b3a927 Merge changes from topics "facesettingchange", "presubmit-am-1a8eb017a271444b896f19197b617d62" into tm-dev
* changes:
  Trigger SafetyCenter update on each Face setting change.
  Trigger SafetyCenter update on each Fingerprint settting change.
2022-03-01 16:21:38 +00:00
Evan Laird
15a87a86bb Merge "Add setting for showing the vibrate icon in status bar" into sc-v2-dev 2022-03-01 16:19:47 +00:00
Evan Laird
39c4d8b827 Merge changes from topic "vibrate-setting" into sc-v2-dev-plus-aosp
* changes:
  [automerge] Add setting for showing the vibrate icon in status bar 2p: 16148d2c8c
  Add setting for showing the vibrate icon in status bar
2022-03-01 16:19:47 +00:00
Yuri Ufimtsev
6cadee43e5 Add warning card for Safety Center when no screen lock is set
Test: atest SettingsUnitTests

Bug: 218868097
Change-Id: I4cbc50559dd1d32b5b916a19f7d0b2b27d67510d
2022-03-01 15:52:56 +00:00
SongFerng Wang
d2f3b44d6a Merge "[MEP] The condition of "null point check" is wrong" 2022-03-01 15:02:19 +00:00
Beverly
81da0689ec Don't show the "When to show" PreferenceCategory
If the ambient display isn't available. This includes
AOD wakeup gestures.

Test: manual
Fixes: 195413949
Change-Id: Ief1876e231288274a35db2fb185ac92864450d48
2022-03-01 14:50:07 +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
32c1fc76d8 Fix unable to scroll to the bottom page
We should set padding for root view instead of margin.

Test: Verify the behavior is correct in single pane
and two panes mode.
Fix: 221422906

Change-Id: I17a63be6e536ffcf39744b2e98dc1ea2723ebf1d
2022-03-01 11:51:03 +00:00
tom hsu
427906c29e [Tetheirng] Show a dialog indicate tethering is unsupported by carrier.
Bug: 161206517
Test: manual
Change-Id: I45a2e42367850ab6fc901fe508671677d843b793
2022-03-01 18:10:10 +08: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
Colin Cross
3f67f87efe Use Build.VERSION.RELEASE_OR_PREVIEW_DISPLAY for user visible versions
Use Build.VERSION.RELEASE_OR_PREVIEW_DISPLAY which will show a user
friendly version name for preview releases, and the release version
for final releases.

Bug: 221950960
Test: manual
Change-Id: I3a7e6a3c996d52614b89888afd35da8cff458b43
2022-02-28 18:03:23 -08: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
Yuri Ufimtsev
2b5bf34eda Provide data for BiometricsSafetySource
Test: atest SettingsUnitTests

Bug: 215517420
Bug: 221449065
Change-Id: Id635a02443295757aab277971c4d95a9a62f5576
2022-02-28 21:27:54 +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
Kweku Adams
2a1f0b7418 Indicate min allowed bucket.
Only show the buckets an app is allowed to be put in. With more and more
exceptions, it'll be good to make it clear to developers who are testing
what buckets they can put their app in using the developer options UI.

Bug: 156509848
Test: manual
Change-Id: Iebc6b706f274a4dd4be7e1c5c42a4b3b05b39777
2022-02-28 20:45:38 +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