Commit Graph

100968 Commits

Author SHA1 Message Date
Yuri Ufimtsev
884674ff3c Merge "Add warning card for Safety Center when no screen lock is set" into tm-dev am: 530e967ac4 am: 7f11e71f1e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17002664

Change-Id: I228627812347266ca725ccae867bcfd50c9ffa98
2022-03-01 17:05:46 +00:00
Evan Laird
90aabce9b4 [automerger skipped] Merge "Add setting for showing the vibrate icon in status bar" into sc-v2-dev am: 15a87a86bb -s ours am: 3a46e06c41 -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: Ia3919d432c81dced9012c556b9c1dacd393725a2
2022-03-01 17:05:36 +00:00
Yuri Ufimtsev
ac13628a14 Merge "Provide data for BiometricsSafetySource" into tm-dev am: abc541d56d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16987673

Change-Id: I3c2de7d8633bb45cfed0af4165495e24d09e14a4
2022-03-01 17:05:08 +00:00
Evan Laird
9c464b037a [automerger skipped] Merge changes from topic "vibrate-setting" into sc-v2-dev-plus-aosp am: 39c4d8b827 -s ours am: 9aba5cfec7 -s ours am: db837c042f -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: Id88a00ed0a883075e26b38fd0d893bf81974bff9
2022-03-01 17:04:50 +00:00
Presubmit Automerger Backend
d6f17285a6 [automerger skipped] [automerge] Add setting for showing the vibrate icon in status bar 2p: 16148d2c8c am: 0b843be422 -s ours am: cf59b35348 -s ours am: 3be6183595 -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: I4e43af475b82720dc35d43aca731dff8481a2e12
2022-03-01 17:04:49 +00:00
Jan Tomljanovic
3c8ecfe6d4 Merge changes from topics "facesettingchange", "presubmit-am-1a8eb017a271444b896f19197b617d62" into tm-dev am: 66a3b3a927 am: a9f0e99ee6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17002665

Change-Id: I75d438e19adfb4efc15a9d297ec5269300de00bc
2022-03-01 17:04:30 +00:00
Yuri Ufimtsev
7f11e71f1e Merge "Add warning card for Safety Center when no screen lock is set" into tm-dev am: 530e967ac4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17002664

Change-Id: I332bc6a8f3f4add4a3b593d957be95d8d01e4122
2022-03-01 17:04:29 +00:00
Jan Tomljanovic
67694d2e8a Trigger SafetyCenter update on each Fingerprint settting change. am: 51b6eb3260 am: e560fac0de
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16993804

Change-Id: I276cfc1b38682db3f92c877b66b5990d454f9e36
2022-03-01 17:04:28 +00:00
Yuri Ufimtsev
300f978e9a Merge "Provide data for BiometricsSafetySource" into tm-dev am: abc541d56d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16987673

Change-Id: I8c67eb3f34cbeac36aaef8b7da72d8ed110bcbec
2022-03-01 16:54:06 +00:00
Yuri Ufimtsev
8ce7c8d3d0 Merge "Add warning card for Safety Center when no screen lock is set" into tm-dev am: 530e967ac4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17002664

Change-Id: Ifedf08199b8278331911be9422d5598b35b8e633
2022-03-01 16:53:55 +00:00
Yuri Ufimtsev
abc541d56d Merge "Provide data for BiometricsSafetySource" into tm-dev 2022-03-01 16:52:46 +00:00
Yuri Ufimtsev
530e967ac4 Merge "Add warning card for Safety Center when no screen lock is set" into tm-dev 2022-03-01 16:49:54 +00:00
Evan Laird
af7ef25f4f [automerger skipped] Merge changes from topic "vibrate-setting" into sc-v2-dev-plus-aosp am: 39c4d8b827 -s ours am: 9aba5cfec7 -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: I62f8c36091a2f50c3b4dc44621884ca54ce457a4
2022-03-01 16:44:25 +00:00
Presubmit Automerger Backend
fb4544e98a [automerger skipped] [automerge] Add setting for showing the vibrate icon in status bar 2p: 16148d2c8c am: 0b843be422 -s ours am: cf59b35348 -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: I2146d0eac5e2573bac265379603ea4d07e3a855f
2022-03-01 16:44:24 +00:00
Jan Tomljanovic
81d74d8a26 Merge changes from topics "facesettingchange", "presubmit-am-1a8eb017a271444b896f19197b617d62" into tm-dev am: 66a3b3a927
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17002665

Change-Id: I282d2fa05f84914d484e12a58d0728c1ad52866e
2022-03-01 16:44:10 +00:00
Evan Laird
db837c042f [automerger skipped] Merge changes from topic "vibrate-setting" into sc-v2-dev-plus-aosp am: 39c4d8b827 -s ours am: 9aba5cfec7 -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: Ic32e90e39b2c783ea3d89b47e6358209c360a149
2022-03-01 16:43:13 +00:00
Presubmit Automerger Backend
3be6183595 [automerger skipped] [automerge] Add setting for showing the vibrate icon in status bar 2p: 16148d2c8c am: 0b843be422 -s ours am: cf59b35348 -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: Ie434892c7c53b8fc74fbe5b4971bf5c3d1431ee9
2022-03-01 16:43:12 +00:00
Jan Tomljanovic
a9f0e99ee6 Merge changes from topics "facesettingchange", "presubmit-am-1a8eb017a271444b896f19197b617d62" into tm-dev am: 66a3b3a927
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17002665

Change-Id: Ieac35d0047319844d2484eba504e3593b9c99b53
2022-03-01 16:41:44 +00:00
Jan Tomljanovic
e560fac0de Trigger SafetyCenter update on each Fingerprint settting change. am: 51b6eb3260
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16993804

Change-Id: Ib114ca9c0f79576f11aae425d71a16ea4a3838ac
2022-03-01 16:41:41 +00:00
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