Commit Graph

84059 Commits

Author SHA1 Message Date
Wesley Wang
09a1d75d36 Merge "Update battery help message layout" into sc-dev am: 0df7148f1e am: 821b7f350d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14424446

Change-Id: Ief09aed3653000905c610b386996e9f9fbf617c8
2021-05-04 18:30:46 +00:00
Trevor Black
f01cfa2977 Merge "Update Android Settings for the latest Extra App Info design" into sc-dev am: b6f2f39d27 am: 80938e8cbf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14327037

Change-Id: I69c7308167c04f46e8ddb920431ce932e0df0a84
2021-05-04 18:30:00 +00:00
Wesley Wang
821b7f350d 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: If6ba9494309ef39d6f31900ecc3c56dbfe473068
2021-05-04 18:06:49 +00:00
Wesley Wang
8cc536be70 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: Id171fcbe9b5d341a9b7c69346444fd352152a6b4
2021-05-04 18:06:06 +00:00
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
e39ee844a7 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: I74afc2f66e3d91705b37d0be330283a1cffd32f2
2021-05-04 18:04:54 +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
e3f2bf6a01 Merge "Add null check for app labels" into sc-dev am: cc28a0826e am: d1bd4abb65
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14426523

Change-Id: If9c4160367c669e629664e7ef17e4420c0cb346a
2021-05-04 17:34:30 +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
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
f58d3e2766 Merge "Launch SecurityHub fragment on SECURITY_SETTINGS intent when available." into sc-dev am: b6cea338a0 am: 6a9f5af516
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14339810

Change-Id: I861a1673670ec0c272c836f0a46702f66cc7ee0d
2021-05-04 15:57:58 +00:00
Sally Yuen
bec8248367 Merge "set enabled state of persist switch when Extra Dim state is changed" into sc-dev am: 478b218230 am: f2289dff47
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14414318

Change-Id: I4ff62959d08b1b0cfc81a6969aab0fe4a620c0ca
2021-05-04 15:56:40 +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
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
5a9fd7ff53 Merge "Update app usage page footer string" into sc-dev am: 16f8b4c943 am: 1c108d1e86
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14424447

Change-Id: I0fd8f5767b2d5142a881decf441602e921eab833
2021-05-04 14:40:29 +00:00
Betty Chang
3034d700b5 Merge "Assign StaticIpConfiguration builder value to global variable" into sc-dev am: 35e244754c am: f9842053b1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419452

Change-Id: Ie5b349aa775a30446d3c66b68f5c8545851bc5e2
2021-05-04 14:40:18 +00:00
TreeHugger Robot
2b52b6d23e Merge "Remove the Summary of Backup in System Settings" into sc-dev am: 31a697eb79 am: f7f0865e76
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14410004

Change-Id: Ibba66c1e77d755404de87eeed6b867df828b6b44
2021-05-04 14:40:01 +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
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
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
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
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
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
Hugh Chen
139ff59346 Fix the section below "Pair new device" moves up a few pixels
This CL add new controller that used to show the summary when
bluetooth is off. It can prevent a jank since the UI is decided
before render.

Bug: 182232469
Test: make RunSettingsRoboTests -j56
Change-Id: I78eb757cd1b636fbb18028fb2294861467bc6eba
2021-05-04 20:45:41 +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
d9d79acc43 Merge "If the CarrierConfigManager is still null, return that the preference is not available." into sc-dev am: d6913243a1 am: c52bd6574e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14409956

Change-Id: Iaf6424faf1cdc3ef6ab8e63405f6b607299bc963
2021-05-04 10:04:46 +00: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
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
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
Hugh Chen
2deb2829ea RESTRICT AUTOMERGE Fix unable to send file via OPP
Bluetooth app will indicate BluetoothOppReceiver to receive
device picker intent. But for fix the security issue we
removed the setClassName() method in ag/14111132 to avoid attack.
It causes BluetoothOppReceiver cannot receive the intent.

This CL will compare to calling package name with launch package name.
If they are not equal, the setClassName() will not invoke.

Bug: 186490534
Bug: 179386960
Bug: 179386068

Test: make RunSettingsRoboTests -j56
Change-Id: Ia51528f2a44ab73edbc86899ca0846d3262fe1f0
(cherry picked from commit bb5be240c0)
2021-05-04 08:17:35 +00:00
Hugh Chen
f727d5cf2a RESTRICT AUTOMERGE Fix unable to send file via OPP
Bluetooth app will indicate BluetoothOppReceiver to receive
device picker intent. But for fix the security issue we
removed the setClassName() method in ag/14111132 to avoid attack.
It causes BluetoothOppReceiver cannot receive the intent.

This CL will compare to calling package name with launch package name.
If they are not equal, the setClassName() will not invoke.

Bug: 186490534
Bug: 179386960
Bug: 179386068

Test: make RunSettingsRoboTests -j56
Change-Id: Ia51528f2a44ab73edbc86899ca0846d3262fe1f0
(cherry picked from commit bb5be240c0)
2021-05-04 08:11:01 +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
940ea52cc0 Merge "[Material Next] Typography for font style" into sc-dev am: 4ec4cf32f1 am: 4eefcd6728
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14409968

Change-Id: I95145e27db7992a7a896c34643b3330ff37b8e76
2021-05-04 07:03:57 +00: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
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