PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
82,037 Commits 1 Branch 0 Tags
a0f2972d878299b97523eb6a2c392a9090fd2ddc
Commit Graph

82037 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeremy Goldman
b1570edfb2 Merge "Set summary if VPN is AlwaysOn Type" into sc-dev am: da602e196e am: 132a00da76 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14424438

Change-Id: Ied8f51bbdd8534bbaee0bcda37d0bccd3eedca5d
 2021-05-05 02:27:06 +00:00
Jeremy Goldman
132a00da76 Merge "Set summary if VPN is AlwaysOn Type" into sc-dev am: da602e196e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14424438

Change-Id: I438e0ecb5e77cd729736ff191791c54e66fd3bc7
 2021-05-05 01:34:43 +00:00
Jeremy Goldman
da602e196e Merge "Set summary if VPN is AlwaysOn Type" into sc-dev 2021-05-05 01:06:01 +00:00
TreeHugger Robot
b80efae71c Merge "Fix back navigation in biometric enrollment." into sc-dev am: 619321198c am: 048c7bc414 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14427973

Change-Id: I03acb6436aadeb072c5f2b2c5370ac300a653902
 2021-05-05 00:08:46 +00:00
TreeHugger Robot
048c7bc414 Merge "Fix back navigation in biometric enrollment." into sc-dev am: 619321198c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14427973

Change-Id: I5da539730bb27549ada5ee86ea8e2b63b04d8a97
 2021-05-04 23:55:00 +00:00
TreeHugger Robot
619321198c Merge "Fix back navigation in biometric enrollment." into sc-dev 2021-05-04 23:23:39 +00:00
Joe Bolinger
43d978bd7b Fix back navigation in biometric enrollment. 
Using the back buttons can cause a crash in at least two cases. Skipping
face enrollment and then starting/stopping any enrollment can lead to
an invalid token and failed HAT request. Backing out of the activity and
restarting it can also lead to using a stale token that fails.

Fix: 179336333
Test: manual on device
Change-Id: I0c1133e4c3d9c97997043ddc9374aa3cfc4f1c97
 2021-05-04 14:43:17 -07:00
Kevin Chyn
5dcb3ddada Merge changes from topic "credential-removal-strings" into sc-dev am: 177d76986a am: 84ed4f464b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14365935

Change-Id: Ida951fe688069a17c743493aec34d6d75a240c3d
 2021-05-04 20:58:13 +00:00
Kevin Chyn
4fd518ce10 Update credential removal strings am: a435a5a288 am: 611ba57c24 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14357317

Change-Id: Ic1e2c25fdc3a829fb3e6aea744c173e7c8885d5a
 2021-05-04 20:58:12 +00:00
Amit Mahajan
77f50475bf Merge "Get rid of redundant mSubId." into sc-dev am: e2de71a6a4 am: a2a7d3f43c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14354534

Change-Id: I2b77a345f3db7ef3dc297e96c33ce046d090baa7
 2021-05-04 20:57:58 +00:00
Kevin Chyn
84ed4f464b Merge changes from topic "credential-removal-strings" into sc-dev am: 177d76986a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14365935

Change-Id: I86295d5aca4a11f6e5cb7200872759ec135c05f1
 2021-05-04 20:37:55 +00:00
Kevin Chyn
611ba57c24 Update credential removal strings am: a435a5a288 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14357317

Change-Id: I1722306ad83ec74222caf94bc0f19969aefb1902
 2021-05-04 20:37:54 +00:00
Amit Mahajan
a2a7d3f43c Merge "Get rid of redundant mSubId." into sc-dev am: e2de71a6a4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14354534

Change-Id: I92161200e399a481e7ce007b705282ddbc89031c
 2021-05-04 20:37:37 +00:00
Yi Jiang
a3cf23855d Merge "Fixes 'no ripple effect' issue for screen attention setting" into sc-dev am: f164cb1976 am: 905739a64a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14418428

Change-Id: I2d80d6504211b2ec38a6ba3b84c3f0fe93f515dc
 2021-05-04 20:24:37 +00:00
Kevin Chyn
177d76986a Merge changes from topic "credential-removal-strings" into sc-dev 
* changes:
  Update combined settings summary
  Update credential removal strings
 2021-05-04 20:13:00 +00:00
Amit Mahajan
e2de71a6a4 Merge "Get rid of redundant mSubId." into sc-dev 2021-05-04 20:11:56 +00:00
Yi Jiang
905739a64a Merge "Fixes 'no ripple effect' issue for screen attention setting" into sc-dev am: f164cb1976 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14418428

Change-Id: Ic298270f318f24a0caba69fd9539a451bd03a762
 2021-05-04 20:04:17 +00:00
Yi Jiang
f164cb1976 Merge "Fixes 'no ripple effect' issue for screen attention setting" into sc-dev 2021-05-04 19:28:31 +00:00
Wesley Wang
09a1d75d36 Merge "Update battery help message layout" into sc-dev am: 0df7148f1e am: 821b7f350d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14424446

Change-Id: Ief09aed3653000905c610b386996e9f9fbf617c8
 2021-05-04 18:30:46 +00:00
Trevor Black
f01cfa2977 Merge "Update Android Settings for the latest Extra App Info design" into sc-dev am: b6f2f39d27 am: 80938e8cbf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14327037

Change-Id: I69c7308167c04f46e8ddb920431ce932e0df0a84
 2021-05-04 18:30:00 +00:00
Wesley Wang
821b7f350d Merge "Update battery help message layout" into sc-dev am: 0df7148f1e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14424446

Change-Id: If6ba9494309ef39d6f31900ecc3c56dbfe473068
 2021-05-04 18:06:49 +00:00
Trevor Black
80938e8cbf Merge "Update Android Settings for the latest Extra App Info design" into sc-dev am: b6f2f39d27 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14327037

Change-Id: I305d9bc385b3c88e59f66e15dbbe9707a205b244
 2021-05-04 18:05:59 +00:00
Wesley Wang
0df7148f1e Merge "Update battery help message layout" into sc-dev 2021-05-04 17:54:11 +00:00
Trevor Black
b6f2f39d27 Merge "Update Android Settings for the latest Extra App Info design" into sc-dev 2021-05-04 17:38:26 +00:00
TreeHugger Robot
e3f2bf6a01 Merge "Add null check for app labels" into sc-dev am: cc28a0826e am: d1bd4abb65 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14426523

Change-Id: If9c4160367c669e629664e7ef17e4420c0cb346a
 2021-05-04 17:34:30 +00:00
TreeHugger Robot
d1bd4abb65 Merge "Add null check for app labels" into sc-dev am: cc28a0826e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14426523

Change-Id: Ied8336db7eb951c06934f7706e6a14fc4f70e572
 2021-05-04 17:21:06 +00:00
TreeHugger Robot
cc28a0826e Merge "Add null check for app labels" into sc-dev 2021-05-04 17:03:37 +00:00
Jan Tomljanovic
f58d3e2766 Merge "Launch SecurityHub fragment on SECURITY_SETTINGS intent when available." into sc-dev am: b6cea338a0 am: 6a9f5af516 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14339810

Change-Id: I861a1673670ec0c272c836f0a46702f66cc7ee0d
 2021-05-04 15:57:58 +00:00
Sally Yuen
bec8248367 Merge "set enabled state of persist switch when Extra Dim state is changed" into sc-dev am: 478b218230 am: f2289dff47 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14414318

Change-Id: I4ff62959d08b1b0cfc81a6969aab0fe4a620c0ca
 2021-05-04 15:56:40 +00:00
Jan Tomljanovic
6a9f5af516 Merge "Launch SecurityHub fragment on SECURITY_SETTINGS intent when available." into sc-dev am: b6cea338a0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14339810

Change-Id: I7495b5a4d428c6bbc283f30ce71c1736835942cb
 2021-05-04 15:46:34 +00:00
Sally Yuen
f2289dff47 Merge "set enabled state of persist switch when Extra Dim state is changed" into sc-dev am: 478b218230 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14414318

Change-Id: I29f486badbfc0e68d5737611bec4fc01d2f74526
 2021-05-04 15:45:30 +00:00
Julia Reynolds
bdcb525982 Add null check for app labels 
Test: manual
Fixes: 187173056
Change-Id: I1affd901bc644597e4af7fc65c81f919c8589ed5
 2021-05-04 11:40:09 -04:00
Jan Tomljanovic
b6cea338a0 Merge "Launch SecurityHub fragment on SECURITY_SETTINGS intent when available." into sc-dev 2021-05-04 15:35:43 +00:00
Sally Yuen
478b218230 Merge "set enabled state of persist switch when Extra Dim state is changed" into sc-dev 2021-05-04 15:26:12 +00:00
TreeHugger Robot
5a9fd7ff53 Merge "Update app usage page footer string" into sc-dev am: 16f8b4c943 am: 1c108d1e86 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14424447

Change-Id: I0fd8f5767b2d5142a881decf441602e921eab833
 2021-05-04 14:40:29 +00:00
Betty Chang
3034d700b5 Merge "Assign StaticIpConfiguration builder value to global variable" into sc-dev am: 35e244754c am: f9842053b1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419452

Change-Id: Ie5b349aa775a30446d3c66b68f5c8545851bc5e2
 2021-05-04 14:40:18 +00:00
TreeHugger Robot
2b52b6d23e Merge "Remove the Summary of Backup in System Settings" into sc-dev am: 31a697eb79 am: f7f0865e76 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14410004

Change-Id: Ibba66c1e77d755404de87eeed6b867df828b6b44
 2021-05-04 14:40:01 +00:00
changbetty
e7d468f658 Fix a NPE when forget wifi network 
To prevent the null activity. If activity is null, there is no need to
execute.

Bug: 184154325
Test: manual test
      make RunSettingsRoboTests ROBOTEST_FILTER=WifiDetailPreferenceController2Test
Change-Id: I0dc32e7ea2a0d5a3f2a55ad8936578ed9fadd201
 2021-05-04 22:26:51 +08:00
TreeHugger Robot
1c108d1e86 Merge "Update app usage page footer string" into sc-dev am: 16f8b4c943 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14424447

Change-Id: I8151efe36ee2ad141f6885595d00b2f21fa0473a
 2021-05-04 14:25:56 +00:00
Arc Wang
e64f01ccfc Cleanup Storage Settings 
There is AOSP built in file browser for image/video/audio
file category, this change cleanup APP based category
for image/video/audio.

Bug: 183078080
Test: atest com.android.settings.deviceinfo
      atest com.android.settings.deviceinfo.storage
      make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.deviceinfo
      make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.deviceinfo.storage
Change-Id: I925fc9296b8c2df5bd793668f66a12beb7744469
 2021-05-04 22:21:53 +08:00
TreeHugger Robot
16f8b4c943 Merge "Update app usage page footer string" into sc-dev 2021-05-04 14:21:52 +00:00
Betty Chang
f9842053b1 Merge "Assign StaticIpConfiguration builder value to global variable" into sc-dev am: 35e244754c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419452

Change-Id: I249c93c15ce2d4b4807f6673aa3b019eb203e0bd
 2021-05-04 14:19:23 +00:00
TreeHugger Robot
f7f0865e76 Merge "Remove the Summary of Backup in System Settings" into sc-dev am: 31a697eb79 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14410004

Change-Id: I2bea89c7642f6ba7e3bd649588fea0cc921591e5
 2021-05-04 14:19:10 +00:00
Betty Chang
35e244754c Merge "Assign StaticIpConfiguration builder value to global variable" into sc-dev 2021-05-04 14:04:56 +00:00
TreeHugger Robot
31a697eb79 Merge "Remove the Summary of Backup in System Settings" into sc-dev 2021-05-04 14:00:49 +00:00
Wesley.CW Wang
531e6b23a2 Update app usage page footer string 
- Use lower case string

Bug: 178197718
Test: make SettingsRoboTests
Change-Id: Id4111256bdab5f74e31fed6d015b96fe687a4c7b
 2021-05-04 21:13:25 +08:00
Wesley.CW Wang
3f98b5fb78 Update battery help message layout 
- Screenshot: https://screenshot.googleplex.com/6mdCCHYZBMNMdMG.png

Bug: 179237551
Test: make SettingsRoboTests
Change-Id: Ie9bf2798ad733744c30278e98a75dd6c34c1a407
 2021-05-04 20:57:19 +08:00
Hugh Chen
139ff59346 Fix the section below "Pair new device" moves up a few pixels 
This CL add new controller that used to show the summary when
bluetooth is off. It can prevent a jank since the UI is decided
before render.

Bug: 182232469
Test: make RunSettingsRoboTests -j56
Change-Id: I78eb757cd1b636fbb18028fb2294861467bc6eba
 2021-05-04 20:45:41 +08:00
Stanley Wang
9b906cb5b6 Use MainSwitchPreference on Bubbles, Screen Saver and 
One-Handed mode pages.

Fixes: 178679876
Fixes: 177968619
Test: robotest and see the UIs.
Change-Id: Ic62c7464a71e5410ece5d1db7578c522e1babedc
 2021-05-04 19:31:29 +08:00
Jeremy Goldman
d9d79acc43 Merge "If the CarrierConfigManager is still null, return that the preference is not available." into sc-dev am: d6913243a1 am: c52bd6574e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14409956

Change-Id: Iaf6424faf1cdc3ef6ab8e63405f6b607299bc963
 2021-05-04 10:04:46 +00:00