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

82282 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
66c1e79449 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: I6b96bf99db14e71e10e2ba2ca9e50806c026b1d7
 2021-05-04 17:20:14 +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
d11e4ef3a9 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: I0f3b282d3d92d99b87cd230d9168bdf8d6b17cb0
 2021-05-04 15:42:47 +00:00
Sally Yuen
378bfef524 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: I5ba0586696b6305fdd5c1e2e6631d541c2b49feb
 2021-05-04 15:41:57 +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
7b36dc3e05 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: Ic1b0fb191f3ef664d70aa156605b0455b2fbbb42
 2021-05-04 14:40:36 +00:00
TreeHugger Robot
16f8b4c943 Merge "Update app usage page footer string" into sc-dev 2021-05-04 14:21:52 +00:00
Betty Chang
58b224a0f3 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: I119d5b2ac1a4f7d6e182b8e01efe6dabeeac3ec1
 2021-05-04 14:16:38 +00:00
TreeHugger Robot
e3907f337e 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: I24a555af9c03ee6bf6140d7228f51327f58194de
 2021-05-04 14:16:24 +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
Jeremy Goldman
4a94ae431e 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: I399822cb875f3760d3919c06eaa84411f16bdd17
 2021-05-04 09:48:59 +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
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
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
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
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