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

82375 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
4dc31e9300 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: I1878b28ac41744584ab2bf17e861eb368007f5e9
 2021-05-04 06:47: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
056221dcdf 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: I217fe52a6c1df3f79d3bdd1a67c1330c3a0209c0
 2021-05-04 06:14:29 +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
fbbe7695ba [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: Ia5d2c2d2920286e5c3042b23d1bc6ce53a93a580
 2021-05-04 03:57:46 +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
Bill Yi
784aa599fc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c73e6bf08d -s ours am: d7caf65594 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I45ccdeef62dd8c292d46eda521223d7da7250417
 2021-05-04 03:12:20 +00:00
TreeHugger Robot
24f68e77b9 Merge "Fix unable to send file via OPP" into sc-dev am: 5ef4fa037e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14327016

Change-Id: I4d45ab1ce416ce3fd899eac4e4ad1a663c4f3d10
 2021-05-04 03:12:16 +00:00
TreeHugger Robot
40f66f93d8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 8d0376c98c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I40313eb47ef1f84627b4e4b01003e53af4f7a455
 2021-05-04 03:11:57 +00:00
Bill Yi
d7caf65594 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c73e6bf08d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I74281b47b6a940823398d23bed07af691eb63595
 2021-05-04 03:04:45 +00:00
Bill Yi
d92ec7a9cc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe0e09fdb4 -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: I296cef365d0327f63938594f3f2e306a7e4d3e7b
 2021-05-04 03:04:05 +00:00
TreeHugger Robot
5ef4fa037e Merge "Fix unable to send file via OPP" into sc-dev 2021-05-04 03:00:23 +00:00
TreeHugger Robot
8cd5da3c29 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-05-04 02:56:39 +00:00
TreeHugger Robot
8d0376c98c Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-05-04 02:53:01 +00:00
TreeHugger Robot
b7b2e2d90e Merge "Remove Advanced item in Language & input Settings." into sc-dev am: f2ec0fbf83 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14410006

Change-Id: I411cca1b8a386c989250e785e96cc74b98d08cf2
 2021-05-04 02:50:01 +00:00
Edgar Wang
609d900f4d Remove the Summary of Backup in System Settings 
Fix: 182357397
Test: manual and robotest
Change-Id: Ic6b08cfd23947af82fd1e9075dd5f698168127ac
 2021-05-04 02:28:13 +00:00
TreeHugger Robot
f2ec0fbf83 Merge "Remove Advanced item in Language & input Settings." into sc-dev 2021-05-04 01:39:38 +00:00
Yi Jiang
18c97b595f Fixes 'no ripple effect' issue for screen attention setting 
Preferences shouldn't be initialized at onAttach() because the settings
style hasn't been loaded yet. This change defers the preferences
initialization so that they comply with the settings style.

The change ag/14114425 is reverted due to b/186904496. This change
includes a fix for that issue.

Test: manually
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=com.android.settings.display
Bug: 183909540
Bug: 186904496

Change-Id: I317ce251f4d11e62c6592ee587c2919da4d45db3
 2021-05-03 18:02:59 -07:00
Bill Yi
ad14295e59 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I4edba2d5bfab846fed936c170b758a26ef6cfc83
 2021-05-04 00:21:24 +00:00
Bill Yi
cdb1df6c37 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I59ccbc3cd5bb9de910acc18fe0534f1b947751ba
 2021-05-04 00:17:44 +00:00
Bill Yi
fe0e09fdb4 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I08b788ccb14010924b696e28eba8bcc600a5be5b
 2021-05-04 00:10:14 +00:00
Bill Yi
c73e6bf08d Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I2ca2d581603839530c4ed567babd3ee82442234e
 2021-05-04 00:04:12 +00:00
Kevin Chyn
b525754f68 Merge "Cancel enrollment when back or negative buttons pressed" into sc-dev am: 08b7833120 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14414017

Change-Id: I2ef5108a73dafe1cce46ba31318db698e16a53f6
 2021-05-03 23:39:45 +00:00
Kevin Chyn
50dcf7955a Update combined settings summary 
Display strings based on number of enrollments

Bug: 185804815
Test: manual on-device
Change-Id: I47be2a53b37c36b3136cd233001db7cadf123ae9
 2021-05-03 16:15:56 -07:00
Kevin Chyn
a435a5a288 Update credential removal strings 
1) Credential can no longer be removed for separate challenge profiles,
   so strings and supporting logic are also now removed
2) Updates existing strings for credential and fingerprint
3) Adds new strings for face
4) Adds new strings for face + fingerprint

Bug: 185180691
Test: manual on device

Change-Id: I2a850eb6644103e14ef2a670222e500c705a16cd
 2021-05-03 16:15:55 -07:00
Kevin Chyn
08b7833120 Merge "Cancel enrollment when back or negative buttons pressed" into sc-dev 2021-05-03 23:15:03 +00:00
bsears
a0a3b2926d Merge "Revert "Fixes 'no ripple effect' issue for screen attention setting"" into sc-dev am: deb2acc9b3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14410366

Change-Id: Iea4057f38107df13c2d5b62719bd1845b7f14540
 2021-05-03 22:22:52 +00:00
sallyyuen
5d567ff19f set enabled state of persist switch when Extra Dim state is changed 
Bug: 186806715
Test: manual,
atest ReduceBrightColorsPersistencePreferenceControllerTest

Change-Id: Icad35cb6bc8ac3a6b8edf518d18898c277cca5e3
 2021-05-03 15:17:00 -07:00
bsears
deb2acc9b3 Merge "Revert "Fixes 'no ripple effect' issue for screen attention setting"" into sc-dev 2021-05-03 22:08:44 +00:00
Kevin Chyn
33ba245149 Cancel enrollment when back or negative buttons pressed 
Fixes: 183671394
Test: Go through enrollment flow and test various buttons
Change-Id: I8d3939de42ecd0a889f0c6d3c94002199285ef8b
 2021-05-03 21:46:25 +00:00
Dmitri Plotnikov
aa2809177d Merge "Replace uses of SystemBatteryConsumer with aggregate BatteryConsumers" into sc-dev am: 501eea7fa2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14346184

Change-Id: If4d7a7d6733cfb1886f561e7fcfb8f518ff58f4c
 2021-05-03 20:47:41 +00:00
Dmitri Plotnikov
501eea7fa2 Merge "Replace uses of SystemBatteryConsumer with aggregate BatteryConsumers" into sc-dev 2021-05-03 20:40:25 +00:00
Trevor David Black
7c5484bc60 Update Android Settings for the latest Extra App Info design 
Bug: b/185793841
Test: Settings -> Apps -> APP -> Extra App Info
Change-Id: I2067f7d5d773e2fd9c817504dda262fb5fd7e033
 2021-05-03 19:05:15 +00:00
TreeHugger Robot
33baa05d95 Merge "Storage Settings Apps category shows image/video/audio APPs" into sc-dev am: 8d1fd73e89 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14186629

Change-Id: I4cf006558fda517dd7db111ee09e84cf17f7454d
 2021-05-03 18:33:47 +00:00
Edgar Wang
b0bfbe7fc5 Remove Advanced item in Language & input Settings. 
Fix: 186608859
Test: manual
Change-Id: I1dfa0aabaf6a9f2ba924cbf2bd190fc6b3e2741c
 2021-05-04 02:19:48 +08:00
TreeHugger Robot
8d1fd73e89 Merge "Storage Settings Apps category shows image/video/audio APPs" into sc-dev 2021-05-03 18:11:03 +00:00
Dmitri Plotnikov
6417493b29 Replace uses of SystemBatteryConsumer with aggregate BatteryConsumers 
Bug: 186006876
Test: make RunSettingsRoboTests
Test: make RunSettingsGoogleRoboTests
Change-Id: I2e240aa15c87b4b9dcbe993b4b0b1111285ec3ff
 2021-05-03 11:01:36 -07:00
bsears
30e9ba1e52 Revert "Fixes 'no ripple effect' issue for screen attention setting" 
This reverts commit 20d1da2b62.

Reason for revert: Based on bisection, this is the likely root cause of b/186904496

Bug: 186904496
Change-Id: I0eaa026b52610d7ef4543c32791531971e68f8e6
 2021-05-03 17:59:11 +00:00
TreeHugger Robot
9777b6c023 Merge "Update apps icon in Sound > Media page to correct size." into sc-dev am: 80daf4fc49 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14410003

Change-Id: Ib2f36425c198d6d872b2920cffa0d6aa605c98ff
 2021-05-03 17:39:55 +00:00
TreeHugger Robot
80daf4fc49 Merge "Update apps icon in Sound > Media page to correct size." into sc-dev 2021-05-03 17:20:33 +00:00
Edgar Wang
da4d4b2e3b Update apps icon in Sound > Media page to correct size. 
- MediaSwitchPreference should inherit AppSwitchPreference

Fix: 186609222
Test: visual
Change-Id: I18a8c42a9eab9601acc792117928a121a3c4b436
 2021-05-04 00:08:59 +08:00
Yichi Chen
a835ecfe40 Merge "RefreshRatePrefCtr: Correct the check of peak refresh rate" into sc-dev am: ffbea30a18 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352150

Change-Id: I042502664d9b1a9dc88563b4572b4c54a8c9c981
 2021-05-03 15:32:14 +00:00
Yichi Chen
ffbea30a18 Merge "RefreshRatePrefCtr: Correct the check of peak refresh rate" into sc-dev 2021-05-03 14:59:47 +00:00
TreeHugger Robot
92d2b8fb62 Merge "Remove reserved icon space for Safety > Wireless emergency alerts" into sc-dev am: 001dcc9e93 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14409961

Change-Id: I86f19c504a88113a780237eb427618479a3a0868
 2021-05-03 14:01:09 +00:00
TreeHugger Robot
001dcc9e93 Merge "Remove reserved icon space for Safety > Wireless emergency alerts" into sc-dev 2021-05-03 13:37:55 +00:00