PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
100,499 Commits 1 Branch 0 Tags
64cb966e8aa76b4dda5b98ee1ae40bdd7f4f1428
Commit Graph

100499 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Edgar Wang
64cb966e8a Merge "Update workprofile TabLayout for Material Next style" into tm-dev am: ab22c72319 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17020504

Change-Id: I8331680a21997eb0de2aa34618578e6ed2c4b4ed
 2022-03-02 02:56:38 +00:00
Edgar Wang
ab22c72319 Merge "Update workprofile TabLayout for Material Next style" into tm-dev 2022-03-02 02:28:03 +00:00
Colin Cross
a80704330d Merge "Use Build.VERSION.RELEASE_OR_PREVIEW_DISPLAY for user visible versions" am: 9c59242102 am: e23884eed9 am: f21625fe80 am: 54a9fd4e17 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2003011

Change-Id: I7fa42478632ded03fc576a87a3b48d54094c00c2
 2022-03-02 01:19:36 +00:00
Colin Cross
54a9fd4e17 Merge "Use Build.VERSION.RELEASE_OR_PREVIEW_DISPLAY for user visible versions" am: 9c59242102 am: e23884eed9 am: f21625fe80 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2003011

Change-Id: I6e850608c5454ce80562a956074bc9ebe5c1597d
 2022-03-02 00:55:39 +00:00
Colin Cross
f21625fe80 Merge "Use Build.VERSION.RELEASE_OR_PREVIEW_DISPLAY for user visible versions" am: 9c59242102 am: e23884eed9 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2003011

Change-Id: If16d05bf70b7802cfc0aaf917949b62231147058
 2022-03-02 00:34:33 +00:00
Colin Cross
e23884eed9 Merge "Use Build.VERSION.RELEASE_OR_PREVIEW_DISPLAY for user visible versions" am: 9c59242102 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2003011

Change-Id: If31ca44328dd6794977bba78e7c07d89e7d1c796
 2022-03-02 00:13:00 +00:00
Colin Cross
9c59242102 Merge "Use Build.VERSION.RELEASE_OR_PREVIEW_DISPLAY for user visible versions" 2022-03-02 00:01:05 +00:00
Adam Bookatz
059b74f60c Merge "Fallback Home doesn't restart on keyboard change" into tm-dev am: f886179845 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17009044

Change-Id: I4fe00a1b4de7af3f5af95dc4d563cc4c82767075
 2022-03-01 23:18:20 +00:00
Adam Bookatz
f886179845 Merge "Fallback Home doesn't restart on keyboard change" into tm-dev 2022-03-01 22:51:27 +00:00
Edgar Wang
f97f5f7005 Update workprofile TabLayout for Material Next style 
1. Upgrade ViewPager to ViewPager2 which provided better support.
2. Apply new TabLayout style

Bug: 193249384
Bug: 195655281
Bug: 193249173
Bug: 179738624

Test: manual

Change-Id: I905ee82f315316c2bf4b73bf5581423878e2c3e7
 2022-03-01 18:07:43 +00:00
Evan Laird
3283e20fe7 [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: 90aabce9b4 -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: I71ea3d4fd2de9387ef3a5b5d7971a7d44c2fe430
 2022-03-01 17:06:14 +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
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
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
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
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
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
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
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
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
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
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
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
f73af73a1a Merge "Enable touch feedback settings when the phone is in silent mode" into tm-dev 2022-02-28 22:46:22 +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
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
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
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