Commit Graph

81606 Commits

Author SHA1 Message Date
YUKAI HUNG
edfa085b2f Merge "Refine logic and add simple test for BatteryChartPreferenceController" into sc-dev 2021-04-16 08:54:59 +00:00
TreeHugger Robot
1bfe96fbd3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 20e30c3033 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6d341fb1fef49ca139fb06a14f7b9f78d0bf5bf1
2021-04-16 07:51:35 +00:00
TreeHugger Robot
20e30c3033 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-04-16 07:25:13 +00:00
TreeHugger Robot
e4c1b8d7ee [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: d2e2ea27fb -s ours
am skip reason: subject contains skip directive

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

Change-Id: I59f22889beeb616d03d80acba4669a4d383fc2c4
2021-04-16 07:18:24 +00:00
TreeHugger Robot
d2e2ea27fb Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-04-16 07:07:41 +00:00
TreeHugger Robot
0dab718421 Merge "Fix TranscodeDisableCachePreferenceControllerTest" into sc-dev am: ab12e78a10
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14199750

Change-Id: I6cc1e402cfc1714eb7e1c9f8800689f333959d7a
2021-04-16 07:06:40 +00:00
Sunny Shao
dd64c59fe5 Fix color checking error of the repohooks
Fixes: 185547877
Test: repo upload
Change-Id: I1a28795a659768d0b4fb046cfdd7877701919c26
2021-04-16 15:05:53 +08:00
ykhung
ab5e180139 Refine logic and add simple test for BatteryChartPreferenceController
Bug: 177406865
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: Ie218cf967c6f30c6eadcdfe6bfd3f37ccdc2276e
2021-04-16 07:02:04 +00:00
TreeHugger Robot
ab12e78a10 Merge "Fix TranscodeDisableCachePreferenceControllerTest" into sc-dev 2021-04-16 06:50:01 +00:00
Jeremy Goldman
abc82d2606 If the proider model is enabled, the User cannot create insecure VPNs
Additionally, existing secure vpns cannot have their type changed to an
insecure type.
Existing insecure VPNs can be edited, but once the type is changed to a
secure type, it cannot be set to an insecure type again.

Note that devices without FEATURE_IPSEC_TUNNELS still have the ability
to make insecure VPNs at the moment. What to do about these devices will
be addressed in a future change.

Recall video with this Change: https://recall.googleplex.com/projects/a801b0cf-91a5-414e-973b-3c1c8fb5e7be/sessions/bc54e4f2-0205-4822-a51a-382e54f3a956

Test: atest -c SettingsUnitTests
Bug: 176821216
Change-Id: Icf87419650c934a783b01f4d2907b7f704d139b8
2021-04-16 13:11:31 +08:00
Ryan Lin
c3805d947e Merge "Extract the logic of MagnificationMode to the controller" into sc-dev am: 3a34a5767b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14065249

Change-Id: Icc29afab0666ea6f9613b9d657e7aca3b4df8bc0
2021-04-16 03:55:16 +00:00
TreeHugger Robot
6ebdd8ae2f Merge "Fix Wi-Fi tips disappeared issue in airplane mode" into sc-dev am: 3b179a8930
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14173740

Change-Id: I2540637df9ed2d0592851bc81c6523dd744f8f6b
2021-04-16 03:54:48 +00:00
Ryan Lin
3a34a5767b Merge "Extract the logic of MagnificationMode to the controller" into sc-dev 2021-04-16 03:50:27 +00:00
Bill Yi
bb3b7093b3 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I6dd73a11f0253736e39bb029921b652446561ec1
2021-04-16 03:37:48 +00:00
TreeHugger Robot
3b179a8930 Merge "Fix Wi-Fi tips disappeared issue in airplane mode" into sc-dev 2021-04-16 03:32:02 +00:00
Bill Yi
87d6375249 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I482aa1945a56fb9c6402661cf3268d6207d984ec
2021-04-16 03:04:45 +00:00
Curtis Belmonte
e455c07c99 Merge "Add a config for the face enroll introduction activity" into sc-dev am: 025bb7cab5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14191889

Change-Id: Ie50b399fa0edc5534356769be909718c2537406f
2021-04-16 00:40:11 +00:00
Curtis Belmonte
025bb7cab5 Merge "Add a config for the face enroll introduction activity" into sc-dev 2021-04-16 00:13:13 +00:00
Biswarup Pal
48bb439db6 Fix TranscodeDisableCachePreferenceControllerTest
Test: TranscodeDisableCachePreferenceControllerTest
Bug: 185483742
Change-Id: Ie448929fb50a49a0641baf6456df11430bb9f1c6
2021-04-15 20:08:48 +00:00
TreeHugger Robot
a1c56bae70 Merge "Rename privacy dashboard top-level item" into sc-dev am: 6840ead634
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14187492

Change-Id: I96701612281a27dfc3652b45c3e0a98c113a312a
2021-04-15 17:54:23 +00:00
TreeHugger Robot
6840ead634 Merge "Rename privacy dashboard top-level item" into sc-dev 2021-04-15 17:08:59 +00:00
Mill Chen
e545bff7da Apply the correct style to Battery and Storage page
Since some pages were styling the action bar programmatically before, the
color of collapsing toolbar will be overridden. Removing them will fix
the problem with inconsist color. This change also fixed some pages with
inconsist theme.

Bug: 185444608
Test: visual verified
1) Settings -> Battery / Storage
2) Scrolling the collapsing toolbar and make it collapsed
3) Observe and see if the color of toolbar is different from the one of
status bar

Change-Id: I5e792747ea3f4deb05428ea5afe6a64f29f9da89
2021-04-16 00:25:50 +08:00
kholoud mohamed
551f8b20e1 Enable ignored test
Test started failing after a change in PermissionChecker
that started using an unshadowed API in AppopsManager.
Reenabling the test after fixign that.

Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.applications.specialaccess.interactacrossprofiles.InteractAcrossProfilesDetailsTest
Fixes: 184238335
Change-Id: I3dc97366671cb1ff8b6a3482b02f6e2148bdda40
2021-04-15 15:51:53 +01:00
Biswarup Pal
31817fefca Merge "Implement controller to disable transcoding cache" into sc-dev am: acb5bebb3d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14186626

Change-Id: Iad815b2ab401854072074d062ed88f673c3213c6
2021-04-15 11:37:43 +00:00
Biswarup Pal
acb5bebb3d Merge "Implement controller to disable transcoding cache" into sc-dev 2021-04-15 11:24:27 +00:00
ryanlwlin
8e5e4dec12 Extract the logic of MagnificationMode to the controller
To move the preference to the upper layer, we extract all logics
to its controller.

We move all tests to the test files and add server tests to
verify the behaviour of edit shortcut dialog.

Bug: 182992338
Test: atest  MagnificationModePreferenceControllerTest

Change-Id: I34c4361e2e116a22c3e34bd35c8ac8cac752ab96
2021-04-15 18:41:44 +08:00
TreeHugger Robot
b98aded545 Merge "Hide Wireless Emergency Alerts on unsupported devices" into sc-dev am: 089c56520d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14167803

Change-Id: I35e9173bad46236a273f891849b9c8a2643fe8e5
2021-04-15 10:01:59 +00:00
Marie Matheson
a8e83d3d39 Merge "Make host type in ChangeScreenLockPreferenceController more generic." into sc-dev am: bcf3fc6272
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14186646

Change-Id: I2986ade9c4b3352ad761ef73e8e092e63d12d0b9
2021-04-15 10:01:48 +00:00
YUKAI HUNG
d969786f3d Merge "Add cache mechanism to improve icon and label loading performance" into sc-dev am: 98ad383e5b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14187767

Change-Id: I1b1cba1674371315dac5d50453b3c21775d577ac
2021-04-15 10:01:17 +00:00
TreeHugger Robot
089c56520d Merge "Hide Wireless Emergency Alerts on unsupported devices" into sc-dev 2021-04-15 08:49:36 +00:00
Marie Matheson
bcf3fc6272 Merge "Make host type in ChangeScreenLockPreferenceController more generic." into sc-dev 2021-04-15 08:44:09 +00:00
YUKAI HUNG
98ad383e5b Merge "Add cache mechanism to improve icon and label loading performance" into sc-dev 2021-04-15 08:40:26 +00:00
Jeremy Goldman
9c69df3b82 Check if the SubscriptionsChangeListener has been started before stop
calling mContext.unregisterReceiver on an unregistered broadcast
receiver will result in an exception. To make the
SubscriptionsChangeListener safe from this kind of error, add a check to
see whether start has been called before implementing stop's
functionality.

Bug: 184662284
Bug: 184521296
Test: atest -c SettingsUnitTests
Change-Id: Ie901ac6d89f954749793e95923a4a1b1945b9999
2021-04-15 14:33:40 +08:00
Edgar Wang
1604be36b9 Merge "Apply SettingsPreferenceTheme in Settings" into sc-dev am: 9d14071637
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14182152

Change-Id: Ibf74e7ed0f944aabe741710bfe6fb72d574292ef
2021-04-15 05:45:43 +00:00
Edgar Wang
9d14071637 Merge "Apply SettingsPreferenceTheme in Settings" into sc-dev 2021-04-15 05:27:22 +00:00
TreeHugger Robot
9ee731fe33 Merge "Cleanup Storage Settings" into sc-dev am: fce594ad7f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14182146

Change-Id: I4f8b3228c95c269b5bab8573eb8511e4f12f978e
2021-04-15 02:45:23 +00:00
Jason Hsu
96504ef833 Merge "Add icon for "Extra dim"" into sc-dev am: 3909ddb789
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14187045

Change-Id: Ib9cf8e004d980c35f3d4803e9bc0cd4643859f04
2021-04-15 02:44:53 +00:00
Peter Wang
4c28b2ba74 Merge "Change DSDS dialog confirm text from "Continue" to "Yes"" into sc-dev am: 1812aabcec
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14187494

Change-Id: I03dce2775a5c1b3c5de73ec2040b5d3a16dfe172
2021-04-15 02:44:47 +00:00
TreeHugger Robot
fce594ad7f Merge "Cleanup Storage Settings" into sc-dev 2021-04-15 02:28:35 +00:00
ykhung
b2674eb5be Add cache mechanism to improve icon and label loading performance
Bug: 185207505
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: I73dba5e40783f9ef4cfc0c4c33ea56b12754535d
2021-04-15 02:20:14 +00:00
Jason Hsu
3909ddb789 Merge "Add icon for "Extra dim"" into sc-dev 2021-04-15 02:12:41 +00:00
Peter Wang
1812aabcec Merge "Change DSDS dialog confirm text from "Continue" to "Yes"" into sc-dev 2021-04-15 01:49:12 +00:00
YUKAI HUNG
3aced587fc Merge "Load application icon and label for UID battery consumer type" into sc-dev am: a73e40cb74
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14185087

Change-Id: Ie0fae06e41e8ef8c146184f67c104fb077207e54
2021-04-15 01:24:21 +00:00
Julia Reynolds
ecf6eea0aa Only one action bar needed am: 98b8716e0a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14189470

Change-Id: I594d1fc25c9cbb14a0ac8f3b102bbd822795464b
2021-04-15 01:23:16 +00:00
YUKAI HUNG
a73e40cb74 Merge "Load application icon and label for UID battery consumer type" into sc-dev 2021-04-15 01:04:00 +00:00
Curtis Belmonte
91f88d6186 Add a config for the face enroll introduction activity
Test: manual

Bug: 185426108
Change-Id: I42e1f8dd5a20e8066fbd1374283acc1228427d45
2021-04-14 17:39:02 -07:00
Peter Wang
6e61073864 Change DSDS dialog confirm text from "Continue" to "Yes"
Bug: 131169645
Bug: 184769109
Test: N/A
Change-Id: Ide709c83459ec955739daa0f23167aa72a5665a9
2021-04-14 13:43:26 -07:00
Julia Reynolds
98b8716e0a Only one action bar needed
And it's provided by the Activity.

Test: notification history does not crash
Bug: 184695659
Change-Id: I5a4c882c42b894601306826006152684bb499b51
2021-04-14 16:16:36 -04:00
Erik Wolsheimer
85514466a2 Rename privacy dashboard top-level item
Bug: 176902658
Test: manual, build and run

Change-Id: Id917d807c1c19ee466192120390e5cbbd447bc52
2021-04-14 12:20:20 -07:00
Julia Reynolds
16901e04d5 Merge "Restyle notif history to beter match shade" into sc-dev am: a12666a3ad
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14188053

Change-Id: I575f84d7e04b474f06582ec0d76ffa6ca9e894df
2021-04-14 19:14:35 +00:00