Curtis Belmonte
0117e8a80f
Merge "Revert "Turn on the transition flag"" into sc-dev am: 5ece4babd3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14471733
Change-Id: Iba9854a104ba9b427868d3d66731fc3e76383664
2021-05-08 07:47:12 +00:00
Curtis Belmonte
5ece4babd3
Merge "Revert "Turn on the transition flag"" into sc-dev
2021-05-08 07:38:45 +00:00
TreeHugger Robot
017d6997ed
Merge "Controls/Wallet privacy settings" into sc-dev am: 67fd37c837
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14470513
Change-Id: I4e0cc31f000e11a247e6d6aef90a7c19b45b89be
2021-05-08 03:05:38 +00:00
TreeHugger Robot
67fd37c837
Merge "Controls/Wallet privacy settings" into sc-dev
2021-05-08 02:46:54 +00:00
Curtis Belmonte
1e1b259445
Revert "Turn on the transition flag"
...
This reverts commit 1be773da62
.
Reason for revert: b/187517936
Fixes: 187517936
Change-Id: I57d0a7a16bdb76e105b0febd43bdf81521e69e3a
2021-05-07 22:43:05 +00:00
Julia Reynolds
540ad99d88
Fix work profile setting appearing too often
...
That is, when the user didn't have work profile
Test: robotests, manual
Fixes: 187520760
Change-Id: I9394359a6bc278d58ef13b30f8ce99cbaa595c25
2021-05-07 15:02:54 -04:00
Matt Pietal
a13e30c11a
Controls/Wallet privacy settings
...
Addressing feedback from ag/14353975
Fixes: 185597511
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.display
Change-Id: I4de5b7f94d4be44820b1fa463d97f4f098f64bff
2021-05-07 14:54:54 -04:00
Julia Reynolds
2fe3273f3a
Handle NLS metadata when provided as strings
...
Test: atest
Bug: 181175697
Change-Id: I40d935ffb7c1fb9f978160d28297da84412501fb
2021-05-07 18:37:10 +00:00
Alex Stetson
b693c7949e
Merge "Use shared model for non-system overlay toggle" into sc-dev am: 413893244d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441754
Change-Id: I88f9322ad1b7d886bfbf597070232d6bf6002174
2021-05-07 14:13:07 +00:00
Alex Stetson
413893244d
Merge "Use shared model for non-system overlay toggle" into sc-dev
2021-05-07 14:08:52 +00:00
Syaoran Kuo
87cc2e19e5
Add more log for debugging resource id issue.
...
Bug: 187485845
Test: atest SettingsComponentTests
Change-Id: I6268809eca172b0b4aa9f1a252e0d519ad758083
2021-05-07 18:49:26 +08:00
TreeHugger Robot
e5ba5c68e1
Merge "Refine the interpolation rule and clip the usage time data" into sc-dev am: 180051cf05
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14455999
Change-Id: Ie643498fd6df7d1a4bb6e96335ca98fe5bdd8387
2021-05-07 09:51:27 +00:00
TreeHugger Robot
180051cf05
Merge "Refine the interpolation rule and clip the usage time data" into sc-dev
2021-05-07 09:35:35 +00:00
TreeHugger Robot
4af703e2ae
Merge "Turn on the transition flag" into sc-dev am: ac1b7661ad
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456000
Change-Id: Id40d542dcb170670037ef5dfbddadbda6d0f64ee
2021-05-07 09:14:36 +00:00
Yanting Yang
eecd27406c
Merge "Add summary back to the homepage" into sc-dev am: c37abc9edb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14442216
Change-Id: Ida5e3fec18839e4ba2ce266aa5b4d2424b65ef3a
2021-05-07 09:14:08 +00:00
TreeHugger Robot
ac1b7661ad
Merge "Turn on the transition flag" into sc-dev
2021-05-07 09:01:00 +00:00
Yanting Yang
c37abc9edb
Merge "Add summary back to the homepage" into sc-dev
2021-05-07 09:00:32 +00:00
ykhung
4280a7f897
Refine the interpolation rule and clip the usage time data
...
Bug: 184807417
Test: make SettingsRoboTests
Change-Id: I6c115beed34abd393e5c615cc59d3c4c323dfa0b
2021-05-07 16:36:56 +08:00
Syaoran Kuo
dcffe72b50
Merge "Remove wifi related test." into sc-dev am: 7dd05a8c05
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441410
Change-Id: I884c941b0da10127ec9e05cd91d3134ad5f93b57
2021-05-07 08:28:37 +00:00
Syaoran Kuo
7dd05a8c05
Merge "Remove wifi related test." into sc-dev
2021-05-07 07:54:25 +00:00
Syaoran Kuo
bc1e5321ab
Remove wifi related test.
...
To add these case back, add a success case to avoid empty test error.
Bug: 186372528
Test: atest SettingsComponentTest
Change-Id: I6d973a244338f67e3d35e9657d1d46eba8ba4501
2021-05-07 13:44:08 +08:00
Yi-Ling Chuang
1be773da62
Turn on the transition flag
...
Test: robotests
Bug: 186701900
Change-Id: I09c821e17fca88ee532f6535031a52c4c832a1e8
2021-05-07 13:21:42 +08:00
TreeHugger Robot
e1c74cc330
Merge "Wallet/controls - Migrate existing settings" into sc-dev am: db624992ed
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14353975
Change-Id: Iaf6750c802f825b48b40e0f539f578969a9213fd
2021-05-07 05:11:19 +00:00
TreeHugger Robot
db624992ed
Merge "Wallet/controls - Migrate existing settings" into sc-dev
2021-05-07 05:05:34 +00:00
TreeHugger Robot
139745d11b
Merge "Adopt new battery history map with interpolation method" into sc-dev am: b7ffc45052
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441406
Change-Id: I32b338b48aceb00536b208421ac17a802e81adbf
2021-05-07 03:10:10 +00:00
TreeHugger Robot
b7ffc45052
Merge "Adopt new battery history map with interpolation method" into sc-dev
2021-05-07 02:09:43 +00:00
TreeHugger Robot
380cb79ace
Merge "Refactor ChooseLockGenericController" into sc-dev am: b3b59d6edd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14269154
Change-Id: I8413aa03a66772644b70efcfcf1985223249c57c
2021-05-07 00:12:29 +00:00
TreeHugger Robot
b3b59d6edd
Merge "Refactor ChooseLockGenericController" into sc-dev
2021-05-06 23:59:17 +00:00
Rubin Xu
8e4acdbf51
Refactor ChooseLockGenericController
...
* Move all logics around aggregating password policies
to the controller
* Replace HIDE_DISABLED_PREFS and MINIMUM_QUALITY_KEY
with HIDE_INSECURE_OPTIONS as all call sites are just
using them to hide insecure screenlock options.
* Remove password policy aggregation logic from
ChooseLockPassword and make it use policies passed in.
* Remove padlock from disabled screen lock options,
per UX mock.
* Increase char limit for some strings
Bug: 177638284
Bug: 177641868
Bug: 182561862
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.password
Test: 1. set profile password quality/complexity and enroll device lock
2. set profile password quality/complexity and enroll work challenge
3. set parent password quality/complexity and enroll device lock
4. set parent password quality/complexity and enroll work challenge
5. set profile and parent password complexity, then enroll work challenge
6. set profile and parent password complexity, then unify work challenge
7. Enroll device lock during SUW
Change-Id: Iba1d37e6f33eba7b7e8e1f805f8e37aaec108404
2021-05-06 23:09:27 +01:00
Yu-Han Yang
bac25a750c
Revert "Remove dynamic location settings footer"
...
Revert submission 13809184-location_footer
Reason for revert: b/187211885
Reverted Changes:
Iaf14044e0:Remove dynamic location settings footer
Ifa6468b11:Remove dynamic location settings footer
If3ab49241:Remove dynamic location settings footer
Bug: 187211885
Test: on device
Change-Id: If9fdefee60d191607ed777ce0046e4cf6d0e4018
2021-05-06 11:38:10 -07:00
ykhung
f76ba1189a
Adopt new battery history map with interpolation method
...
Bug: 184807417
Test: make SettingsRoboTests
Change-Id: I5c45a443d0a72df352d4bb707412328ad009f6d4
2021-05-07 00:25:33 +08:00
Alex Stetson
aff80d1e14
Use shared model for non-system overlay toggle
...
Allows settings applications on other platforms to re-use values by
migrating to Settings.secure and moving HideNonSystemOverlayMixin to
SettingsLib.
Bug: 184967544
Test: atest SettingsUnitTests
Change-Id: If9aaeca29ebb8b481d75622934503e368d7435d3
2021-05-06 08:28:19 -07:00
Matt Pietal
8850c3c677
Wallet/controls - Migrate existing settings
...
Step 2 of 2. Move wallet settings from System -> Gestures -> Power
Menu to Display -> Lockscreen. Split the existing sensitivity setting
into two separate toggles to give users better control of their
privacy settings.
Bug: 185597511
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.display
Change-Id: Ifc390945a45258bbcc3c0a6ac67a0c4a3f7a9e91
2021-05-06 08:35:13 -04:00
TreeHugger Robot
3f0da77e12
Merge "Fix inconsist color filling on collapsing toolbar" into sc-dev am: bbb6562684
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14442217
Change-Id: Ida5f36fe5a6dcf40ccf60b96e2c976c7970fd7db
2021-05-06 11:21:59 +00:00
TreeHugger Robot
bbb6562684
Merge "Fix inconsist color filling on collapsing toolbar" into sc-dev
2021-05-06 11:04:31 +00:00
TreeHugger Robot
41830dddca
Merge "Fix the section below "Pair new device" moves up a few pixels" into sc-dev am: e6b78a5ada
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14319866
Change-Id: I368d9c09dce6e68d49f07dc83d4f11b42f7b37ba
2021-05-06 08:25:56 +00:00
TreeHugger Robot
e6b78a5ada
Merge "Fix the section below "Pair new device" moves up a few pixels" into sc-dev
2021-05-06 07:58:25 +00:00
Mill Chen
efbcc69cc4
Fix inconsist color filling on collapsing toolbar
...
Some pages are updating the background color for action bar after action
bar is created, which will break the animation of collapsing toolbar. It
also causes the different color filled in the status bar and collapsing
toolbar area separately. Removing the styleActionbar method from
EntityHeaderController can fix this issue.
Fix: 187019164
Test: robotests && visual verified
1) Settings -> Apps -> See all apps -> pick up either app -> Mobile data
& Wi-Fi
2) Scrolling the content and see if the toolbar has the different color
between status bar and toolbar
Change-Id: Ic0842b9e6c48662872694534a3696c4b8900481f
2021-05-06 14:46:30 +08:00
TreeHugger Robot
a8b3277b18
Merge "Update Prevent Ringing summary when it turn off" into sc-dev am: 3aca460dfc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14442220
Change-Id: I4e147e373c327911bb9a6d9b945855c4f4b454f2
2021-05-06 05:27:23 +00:00
TreeHugger Robot
3aca460dfc
Merge "Update Prevent Ringing summary when it turn off" into sc-dev
2021-05-06 05:07:25 +00:00
Les Lee
67b79fe9f5
Merge "wifi: Use new API for wifi data usage function" into sc-dev am: 0dc1ee01f8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419446
Change-Id: Id679cd941f052b587f3efb26c1e11787ee58d050
2021-05-06 03:52:02 +00:00
Les Lee
0dc1ee01f8
Merge "wifi: Use new API for wifi data usage function" into sc-dev
2021-05-06 03:17:20 +00:00
TreeHugger Robot
74ae8103aa
Merge "[Provider Model] Fix settings crash issue" into sc-dev am: f396c0af28
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439968
Change-Id: I960b95f216bbb3d8a5f1c94d128a8912be4a184d
2021-05-06 02:33:03 +00:00
TreeHugger Robot
f396c0af28
Merge "[Provider Model] Fix settings crash issue" into sc-dev
2021-05-06 01:52:53 +00:00
Jeremy Goldman
ae056efa5a
Merge "Create unit test for the VpnInfoPreference" into sc-dev am: 0a6a6269e3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14436936
Change-Id: Ideedc7704c9e7497c3aaf641fa6450247becfd22
2021-05-06 01:28:30 +00:00
Jeremy Goldman
0a6a6269e3
Merge "Create unit test for the VpnInfoPreference" into sc-dev
2021-05-06 01:08:35 +00:00
Weng Su
88cafbaa24
[Provider Model] Fix settings crash issue
...
- The GlobalSettingsChangeListener needs to be closed after the life
cycle is destroyed
Bug: 185756174
Bug: 186404332
Bug: 186591527
Test: manual test
atest -c InternetUpdaterTest
Change-Id: I9fbad3b303055c6c7a61ccad8efe69cefef56c58
2021-05-06 05:53:41 +08:00
TreeHugger Robot
eee6a74723
Merge "Add new constructor to create BatteryHistEntry from interpolation" into sc-dev am: f9ebf6600f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14436937
Change-Id: Id3888ea162250350f0f970c0463376a8fea3d1dc
2021-05-05 18:13:02 +00:00
TreeHugger Robot
f9ebf6600f
Merge "Add new constructor to create BatteryHistEntry from interpolation" into sc-dev
2021-05-05 18:06:07 +00:00
Edgar Wang
aa48592b40
Update Prevent Ringing summary when it turn off
...
Bug: 187145174
Test: manual & robotest
Change-Id: Ifc06a38ff65f084db2803c56b5a37224c5b9b810
2021-05-06 01:49:24 +08:00