PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
100,526 Commits 1 Branch 0 Tags
73d2d988a05a9ca23f0eb798bcc9578dffddcac6
Commit Graph

100526 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
73d2d988a0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 11683d653b -s ours am: 657ad4c091 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1361b00fa2fc1b147848d1cc370798b98382309a
 2022-03-03 08:06:56 +00:00
Bill Yi
657ad4c091 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 11683d653b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I745a4ed776a72df02df79b29427f5a26f24573f2
 2022-03-03 07:45:09 +00:00
YK Hung
74df068ec8 Merge "Fix the broken tests on BatteryTipDialogFragmentTest" into tm-dev am: c08c6c5c16 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17052912

Change-Id: I9e9b55f896a7a8567e9ae8d6df287a162a0dd307
 2022-03-03 02:30:29 +00:00
YK Hung
c08c6c5c16 Merge "Fix the broken tests on BatteryTipDialogFragmentTest" into tm-dev 2022-03-03 02:12:27 +00:00
Kweku Adams
c5d5358852 Merge "Indicate min allowed bucket." into tm-dev am: 4a21c60862 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17034518

Change-Id: Ibaf91b0f7e54174222f080410e1a1b7377661258
 2022-03-02 18:05:26 +00:00
Kweku Adams
4a21c60862 Merge "Indicate min allowed bucket." into tm-dev 2022-03-02 17:55:45 +00:00
ykhung
069df8dcb0 Fix the broken tests on BatteryTipDialogFragmentTest 
Test: make -j56 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.fuelgauge.batterytip"
Bug: 222229402
Change-Id: I9a6a8b69a1ef5c64bf8ce8807f83bac09f29ba8d
 2022-03-02 16:55:55 +00:00
Bill Yi
11683d653b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ibb99c8c427c1bd2e4338fd2301568e4ce63a5b1e
 2022-03-02 16:04:10 +00:00
Beverly Tai
7fa5f43666 Merge "Don't show the "When to show" PreferenceCategory" into tm-dev am: b2baaebb8a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17045663

Change-Id: I07aa44ea1beb78c9687b5bc7744a7a1e88fa67d7
 2022-03-02 13:37:23 +00:00
Beverly Tai
b2baaebb8a Merge "Don't show the "When to show" PreferenceCategory" into tm-dev 2022-03-02 13:14:14 +00:00
Tom Hsu
2c8008b447 Merge "[Tetheirng] Show a dialog indicate tethering is unsupported by carrier." am: d915b09e21 am: 0e8aed527f am: 293571f054 am: d626cb16f8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1984590

Change-Id: Iaacd7c9241e323ebb3478f745658a04d6c9b944a
 2022-03-02 12:52:24 +00:00
Tom Hsu
d626cb16f8 Merge "[Tetheirng] Show a dialog indicate tethering is unsupported by carrier." am: d915b09e21 am: 0e8aed527f am: 293571f054 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1984590

Change-Id: Ib7b1d25aa8ff2e1f172eebf148790873cc292ded
 2022-03-02 12:42:33 +00:00
Tom Hsu
293571f054 Merge "[Tetheirng] Show a dialog indicate tethering is unsupported by carrier." am: d915b09e21 am: 0e8aed527f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1984590

Change-Id: I874e3e478ce29dda24860a2e007279bf7ca77c47
 2022-03-02 12:19:56 +00:00
Tom Hsu
0e8aed527f Merge "[Tetheirng] Show a dialog indicate tethering is unsupported by carrier." am: d915b09e21 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1984590

Change-Id: I5de3906942beb7efe557e3491468f91f9d67db48
 2022-03-02 11:59:46 +00:00
Tom Hsu
d915b09e21 Merge "[Tetheirng] Show a dialog indicate tethering is unsupported by carrier." 2022-03-02 11:28:50 +00:00
TreeHugger Robot
adab78d3ce Merge "Cache mechanism for Storage page with work profile" into tm-dev am: 9e9a39d717 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16986445

Change-Id: I882442bb7b4e230294882d7d0439af16a2ae15af
 2022-03-02 10:06:12 +00:00
TreeHugger Robot
9e9a39d717 Merge "Cache mechanism for Storage page with work profile" into tm-dev 2022-03-02 09:49:42 +00:00
Arc Wang
3da67a327b Merge "Only show 2-pane deep link when homepage is available" into tm-dev am: f74e1195a4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17005472

Change-Id: I015e41f1d3245190b2d4a0f893fa676c2f284457
 2022-03-02 07:43:42 +00:00
Arc Wang
f74e1195a4 Merge "Only show 2-pane deep link when homepage is available" into tm-dev 2022-03-02 07:20:00 +00:00
Tsung-Mao Fang
e582ce16c7 Merge "Fix unable to scroll to the bottom page" into tm-dev am: 88bff1ebc5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17033482

Change-Id: Ica14a430abc91aeaa2c2647d166beb3472eff07e
 2022-03-02 03:40:47 +00:00
Tsung-Mao Fang
88bff1ebc5 Merge "Fix unable to scroll to the bottom page" into tm-dev 2022-03-02 03:13:01 +00:00
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
Arc Wang
9ba80e76b3 Only show 2-pane deep link when homepage is available 
DeepLinkHomepageActivity is disabled by default and may be
enabled after receiving the PRE_BOOT_COMPLETED broadcast.

On some virtual devices, DeepLinkHomepageActivity may not
be enabled for test cases. This is a fallback option to
show a full screen Activity to pass tests.

Bug: 221149428
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SettingsActivityTest
Change-Id: I4bbe785176fe3fe8831484141aff7367e4ca25ce
 2022-03-02 01:24:14 +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
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