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
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
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
Bill Yi
383a5aa78e
[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: I3cca1e97f6b597ccf9a817d2ab2cde36316a2986
2021-05-04 03:12:34 +00:00
TreeHugger Robot
0151b0a8f0
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: I4687f1f0e5dc8b25da3ce2d20dc742cb93bd2784
2021-05-04 03:12:30 +00:00
TreeHugger Robot
0b99020b5a
[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: I5898481edfb03e8b7b3745b702206e487a13ba8a
2021-05-04 03:11:58 +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
8d0376c98c
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-05-04 02:53:01 +00:00
TreeHugger Robot
dbe3c72bb6
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: Ibbdbf407b847dce578035104fbf5fda83cbd8312
2021-05-04 02:48:46 +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
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
c60fcecf32
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: I8e04d336d84c527560748126ebc3f6fd00f8d20f
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