Commit Graph

36904 Commits

Author SHA1 Message Date
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
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
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
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
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
5ef4fa037e Merge "Fix unable to send file via OPP" into sc-dev 2021-05-04 03:00:23 +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
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
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
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
YUKAI HUNG
c25967c892 Merge "Add new field for data interpolation usage" into sc-dev am: f988790908
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14409677

Change-Id: I768f28b5d87cc4ec0d790ef30b8787e45dd6b323
2021-05-03 12:42:57 +00:00
YUKAI HUNG
f988790908 Merge "Add new field for data interpolation usage" into sc-dev 2021-05-03 12:26:24 +00:00
Arc Wang
4cd89bb082 Storage Settings Apps category shows image/video/audio APPs
There is AOSP built in file browser for image/video/audio
file category, all APPs except games should be included in
Apps category.

- Shows image/video/audio APPs in APPs category.
- Count Image/Video/Audio APPs storage size to Apps storage size.
- Remove APP size & cache size for Images/Videos/Audios category.

Bug: 170918505
Test: atest StorageAsyncLoaderTest.java
Change-Id: I07e0a3a66a13f36b9e0cbde289d8ba90df4ae295
2021-05-03 20:17:58 +08:00
Ryan Lin
5bf2c6fa3c Merge "Move Magnification Mode Settings to the main page" into sc-dev am: 194015b774
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14327003

Change-Id: I0f35adb3c5c6479e7237f8f32c828af0ff96485a
2021-05-03 11:34:27 +00:00
Ryan Lin
194015b774 Merge "Move Magnification Mode Settings to the main page" into sc-dev 2021-05-03 11:28:02 +00:00
Menghan Li
442353df53 Merge "[Material Next] Update accessibility tool footer style" into sc-dev am: da60d4e842
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14260604

Change-Id: I636d0f179d4e7bdf511ea0b8acb5e57511f8565f
2021-05-03 11:26:28 +00:00
Menghan Li
da60d4e842 Merge "[Material Next] Update accessibility tool footer style" into sc-dev 2021-05-03 11:13:28 +00:00
ykhung
0c7e50cb43 Add new field for data interpolation usage
reference the decription in cl/371645876

Bug: 184807417
Test: make SettingsRoboTests
Change-Id: I944399dc205cad9b96fe22e82e4c651b4ccc4e37
2021-05-03 18:31:27 +08:00
Menghan Li
b76dac1877 Merge "Hide the accessibility location preference when gesture navigation mode enabled." into sc-dev am: c7ddea6aa8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14408665

Change-Id: I15c2b4be9550fbd4dd6f692d0fbe64c7ee8acdd3
2021-05-03 10:23:06 +00:00
Menghan Li
c7ddea6aa8 Merge "Hide the accessibility location preference when gesture navigation mode enabled." into sc-dev 2021-05-03 10:21:58 +00:00
menghanli
95aa089858 Hide the accessibility location preference when gesture navigation mode enabled.
If it's grey out, users don't have the alternative way in that page to enable it. According to the UX design, we should hide it if it is needed.

Bug: 186776534
Test: make RunSettingsRoboTests -j52 ROBOTEST_FILTER=AccessibilityButtonLocationPreferenceControllerTest
Change-Id: If2f659da32345938e2930fde42365cd796571068
2021-05-03 15:12:43 +08:00
TreeHugger Robot
b6764f1c2f Merge "Update password & account settings icon size" into sc-dev am: b0bd79d468
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14408664

Change-Id: Iacee9e49043115a0b5d51d77c42a61eb639080ed
2021-05-03 07:02:21 +00:00
TreeHugger Robot
b5c19b647e Merge "Fix the unaligned title of injected items" into sc-dev am: d32e0cf8a6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14408661

Change-Id: I8dea6450ba870d4eef6acfb191b2ff94134548fa
2021-05-03 07:02:15 +00:00
TreeHugger Robot
b0bd79d468 Merge "Update password & account settings icon size" into sc-dev 2021-05-03 06:52:54 +00:00
TreeHugger Robot
d32e0cf8a6 Merge "Fix the unaligned title of injected items" into sc-dev 2021-05-03 06:44:05 +00:00
Edgar Wang
a0d9c9186c Update password & account settings icon size
- Password app icon size should be 32dp

Bug: 186609741
Test: visual
Change-Id: Ifb86e568f8c073e3f27f1c17ea9dd94e9b47a5e4
2021-05-03 13:45:34 +08:00
Jason Chiu
8531d8795f Fix the unaligned title of injected items
Remove the summary space holder for the injected items that are not
assigned a summary or a summary uri.

Test: visual, robotest
Fixes: 187006845
Bug: 182357397

Change-Id: I7b3d165f0ffd771dd0110962c9e3159c4977d6e3
2021-05-03 12:22:36 +08:00
Wesley Wang
9772c26677 Merge "Update batter saver page footer (1/2)" into sc-dev am: 12bc0921ce
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352147

Change-Id: I64039db5419432108afc5087e0639b3898d99447
2021-05-03 03:50:59 +00:00