PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
81,284 Commits 1 Branch 0 Tags
f41ba6124a67fdbe179e114b7af6ed47d1a68a43
Commit Graph

81284 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stanley Wang
f41ba6124a Merge "Use MainSwitchPreference on Bubbles, Screen Saver and One-Handed mode pages." into sc-dev am: 9abe5df134 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14160600

Change-Id: Ie0124aac157e8349f9868a5958e1d6a7fc135eb3
 2021-05-05 03:38:15 +00:00
Arc Wang
a298a39a2a Merge "Cleanup Storage Settings" into sc-dev am: 3576b10330 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14408668

Change-Id: I6c3311651e5d3e7edb58d2b3d55eb54b46845a3e
 2021-05-05 03:38:03 +00:00
Stanley Wang
9abe5df134 Merge "Use MainSwitchPreference on Bubbles, Screen Saver and One-Handed mode pages." into sc-dev 2021-05-05 03:19:26 +00:00
Arc Wang
3576b10330 Merge "Cleanup Storage Settings" into sc-dev 2021-05-05 03:13:37 +00:00
Jeremy Goldman
03b2d99ba3 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: I135178b659f679aba01bf2a9156c2cca35ad2b8b
 2021-05-05 01:33:08 +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
298f774060 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: Ibaafcc8534fc580ac182372070222cd93587dc98
 2021-05-04 23:52:57 +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
4431af41b9 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: I0e450163da3cc9557fc858ce9ed14d8d12e75ddb
 2021-05-04 20:33:34 +00:00
Kevin Chyn
39f85272a6 Update credential removal strings am: a435a5a288 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14357317

Change-Id: I945256349d2e84f43b49342eb9ef516c5b4966ae
 2021-05-04 20:33:33 +00:00
Amit Mahajan
433ecf9a5a 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: Ic8067f3279db61e48eb4813650334ebda635da65
 2021-05-04 20:33:16 +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
3179d1e1ab 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: Ia0b405b6e4dd7ef0f4fd6a15a59850ecfe78bc04
 2021-05-04 20:02:24 +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
60983ec7ba 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: I7528851174559ee89540b5dfe9b58e68669211d8
 2021-05-04 18:08:20 +00:00
Trevor Black
933819c4eb 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: I4be5f8b55ea7648cbc936a2a65772b428a871b39
 2021-05-04 18:08:01 +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
d03c199819 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: I0fc26100de7d9874cd1a4402a6ba24bc3172fdc3
 2021-05-04 17:19:03 +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
e509a694c8 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: Ifd4981a6ac4ce666984a145c354719d1778c55ff
 2021-05-04 15:42:48 +00:00
Sally Yuen
b77b7385b4 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: Ia5c74afeb5ca74948ced77df8cf478c32c8d6fcd
 2021-05-04 15:42:44 +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
bccec996c0 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: I4e4ed9b21ac4fbb0eeadedcbebac479fc4fd810f
 2021-05-04 14:39:50 +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
26fcdf4745 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: I741e567bf6b1dc2440b106cb55cc39cc83b55813
 2021-05-04 14:16:39 +00:00
TreeHugger Robot
722ac92514 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: Ic892b48a237a19104523b6ed69d7bdbfbf836e16
 2021-05-04 14:16:18 +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
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
d41def87bd Merge "If the CarrierConfigManager is still null, return that the preference is not available." into sc-dev am: d6913243a1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14409956

Change-Id: I2a0c42124a6f5b291ad8feeb17ea875b5e8d847e
 2021-05-04 09:47:48 +00:00
Jeremy Goldman
d6913243a1 Merge "If the CarrierConfigManager is still null, return that the preference is not available." into sc-dev 2021-05-04 09:30:04 +00:00
Jeremy Goldman
cf8ac147b0 Set summary if VPN is AlwaysOn Type 
Bug: 187124456
Test: atest -c SettingsUnitTests
Change-Id: I64158b90921c5766e26d5e438b1d005d5fe9cbaa
 2021-05-04 16:32:54 +08:00
Jeremy Goldman
050f7a7657 If the CarrierConfigManager is still null, return that the preference is 
not available.

Test: atest -c VideoCallingPreferenceControllerTest
Bug: 186594185
Change-Id: I4650d9f77f6a4a0cb84d6e20f02e4ab1d1841131
 2021-05-04 15:05:53 +08:00
Menghan Li
f47694d4c5 Merge "[Material Next] Typography for font style" into sc-dev am: 4ec4cf32f1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14409968

Change-Id: Iaed0ce71c0f3b563a6dda3b28e03d93af4e76a73
 2021-05-04 06:48:39 +00:00
changbetty
01cc97f382 Assign StaticIpConfiguration builder value to global variable 
[Root Cause]
Due to call by reference for Object, we pass the StaticIpConfiguration
to method. But in method we new the staticIpConfiguration builder
and re-assign builder to parameter, it will release when the method is ended.
The value in Builder will not be set to global variable.

[Solution]
Assign the value in StaticIpConfiguration builder to global variable
directly.

Bug: 186489618
Test: manual test
      make RunSettingsRoboTests ROBOTEST_FILTER=WifiConfigController2Test
Change-Id: I1a6aee31e6977be42792440c3667db2557a20c4e
 2021-05-04 14:40:31 +08:00
Menghan Li
4ec4cf32f1 Merge "[Material Next] Typography for font style" into sc-dev 2021-05-04 06:22:58 +00:00
YUKAI HUNG
ff80cd7dd4 Merge "Rename variables and refine the format style from ag/14346184" into sc-dev am: 37d6d0835c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419441

Change-Id: Iada76b999b9d5b945f31d84c2705ae272f079d0b
 2021-05-04 06:14:03 +00:00
YUKAI HUNG
37d6d0835c Merge "Rename variables and refine the format style from ag/14346184" into sc-dev 2021-05-04 05:59:52 +00:00
ykhung
973212adf7 Rename variables and refine the format style from ag/14346184 
Bug: 14346184
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: Ie87f2dba2b87781ed5071adbc6f8a2aa45d1fd53
 2021-05-04 11:59:07 +08:00
Bill Yi
3808659f80 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe0e09fdb4 -s ours am: d92ec7a9cc -s ours am: 7c02bd8602 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iea7f34128718adbff1ae26fce422d2cb7c36a063
 2021-05-04 03:58:01 +00:00
menghanli
39229a6aea [Material Next] Typography for font style 
Set fontFamily with Typography config which follows the rule for font
and supported font family changing in “Style & Wallpaper”.

Bug: 186065669
Test: Manual testing
Change-Id: I8b94a7e643fa72e91519209cbad2e3d65b6c6749
 2021-05-04 11:34:00 +08:00
Bill Yi
7c02bd8602 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe0e09fdb4 -s ours am: d92ec7a9cc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iff211e71f9a26cb742c28177b99b7f64938adf8c
 2021-05-04 03:29:50 +00:00