Commit Graph

81448 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Jeremy Goldman
c52bd6574e 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: Ia852dd2f5abf8da568eee20509840cfa9bab8f5e
2021-05-04 09:50:51 +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
4eefcd6728 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: I59b50ddfd1dd9f135b82dd4d4b0eb2c5dc728b65
2021-05-04 06:50:24 +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
af4a25c10d 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: I255e4dbea5906634fc2ad97de318e239e8e994de
2021-05-04 06:16:33 +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
Bill Yi
a96b7f1b47 [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: Id208b8e9197786121b5bab07530435ba06f74460
2021-05-04 04:00:10 +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
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
925a76780a [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: I74646745a480b50e5defb5712e03e6531db565b9
2021-05-04 03:06:25 +00:00
TreeHugger Robot
05c45b3d92 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: I53daf92598dee05723e6a90648e4f2c313bf5669
2021-05-04 03:06:16 +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
55c94745be [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: I528c118d1df463ffc486640e8e52f7e94ce294e7
2021-05-04 02:59:32 +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
c91fbcefad 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: I568670dafad961353b783b9cae80b5da2c4b18b9
2021-05-04 02:51:03 +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
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
97ebb9431d 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: Iff9048ff39cba79ae259cc8ec2d30da7047999ea
2021-05-03 23:41: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
6e1d3aa80d 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: I5609e99ff6473de06e6bb0496e6ac7e84265b252
2021-05-03 22:24:46 +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
e8694a9805 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: I68267eeef46b765aaf6feb7fa9d1b12b1642e730
2021-05-03 20:49:25 +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