Commit Graph

80433 Commits

Author SHA1 Message Date
Dmitri Plotnikov
3058340dd7 Merge "Remove unused code" into sc-dev am: a7f7d79431
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13921174

Change-Id: I4724005be591b011c3bf6b1190155c5f84544020
2021-03-19 05:46:50 +00:00
Dmitri Plotnikov
a7f7d79431 Merge "Remove unused code" into sc-dev 2021-03-19 05:10:48 +00:00
Haining Chen
9da33c3404 Merge "Update settings tests with biometric component info" into sc-dev am: 0981e4d65b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13797278

Change-Id: I9ad6904ae7133d68e7ee295ccb75f02ef4386ea9
2021-03-19 04:03:14 +00:00
Haining Chen
0981e4d65b Merge "Update settings tests with biometric component info" into sc-dev 2021-03-19 03:49:10 +00:00
Yanting Yang
a985b4af29 Merge "Adjust preference order to correct the position of Accounts" into sc-dev am: 69e911b66b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13916858

Change-Id: Ib3d363a69a44a0bb067f312e06a1a284c4b8ce4a
2021-03-19 03:25:23 +00:00
Yanting Yang
69e911b66b Merge "Adjust preference order to correct the position of Accounts" into sc-dev 2021-03-19 03:02:14 +00:00
SongFerng Wang
99c34c1740 Merge "KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY change type as IntArray" into sc-dev am: 993b820a76
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13824401

Change-Id: Ie137c72afb38fc17ce9df6ff9f748df0bb05a94e
2021-03-19 01:47:59 +00:00
TreeHugger Robot
44fe23216e Merge "Add Media Management Apps activity in Special App Access" into sc-dev am: 2d932aa5fb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13824387

Change-Id: I9e9c54489623bf10123c567fd5132ed947408907
2021-03-19 01:46:32 +00:00
SongFerng Wang
993b820a76 Merge "KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY change type as IntArray" into sc-dev 2021-03-19 01:28:31 +00:00
TreeHugger Robot
2d932aa5fb Merge "Add Media Management Apps activity in Special App Access" into sc-dev 2021-03-19 01:00:40 +00:00
Yu-Han Yang
89c6cf2e6e Remove tests for Location Services summary am: 2a1f61829e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13920805

Change-Id: I60ac218b3329ac9f257d6284f4957f4f69bd2201
2021-03-18 22:05:57 +00:00
Dmitri Plotnikov
3bd707ab1a Remove unused code
Bug: 173745486
Test: make RunSettingsRoboTests
Change-Id: I9e6e32e4ad594b7d6f5f984bf1b839caf654066b
2021-03-18 12:59:15 -07:00
Yu-Han Yang
2a1f61829e Remove tests for Location Services summary
Bug: 183068632
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.location.LocationServicesPreferenceControllerTest"
Change-Id: I9c310ba1c320c182030e5ba7c64099e1b65ea109
2021-03-18 11:12:57 -07:00
Sally Yuen
82419bb08f Merge "Update RBC UI with latest strings" into sc-dev am: 952f98941f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13888786

Change-Id: I5cc5bd31009185981b4b175bb3fc153550b2a914
2021-03-18 17:23:46 +00:00
Sally Yuen
952f98941f Merge "Update RBC UI with latest strings" into sc-dev 2021-03-18 16:10:39 +00:00
Dmitri Plotnikov
4af6b4d0c4 Merge "Remove references to BatteryStatsHelper from PowerUsageBase" into sc-dev am: e4fc48f33e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13879791

Change-Id: I2fd139c33eeecb4c8fb4e57516e10e2e094f6060
2021-03-18 15:48:26 +00:00
Yanting Yang
187c9a344f Adjust preference order to correct the position of Accounts
Bug: 183070484
Test: visual
Change-Id: I551b326067966ed3c8db74c264596ec09b8bd8db
2021-03-18 23:37:18 +08:00
Dmitri Plotnikov
e4fc48f33e Merge "Remove references to BatteryStatsHelper from PowerUsageBase" into sc-dev 2021-03-18 15:33:47 +00:00
Chiachang Wang
e7866743d3 Merge "Update mocking to correct target methods" am: efa884758b am: b64bf233a3 am: 7dce573e9d am: 04f43b188d
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1644306

Change-Id: I80c2110f0eba77f6a62e85a791855b46adc46080
2021-03-18 15:29:36 +00:00
Chiachang Wang
04f43b188d Merge "Update mocking to correct target methods" am: efa884758b am: b64bf233a3 am: 7dce573e9d
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1644306

Change-Id: I99179fe4a754849f50f6b06ce9b7424a88478184
2021-03-18 15:14:07 +00:00
TreeHugger Robot
2c25257173 Merge "Refinements for DND settings" into sc-dev am: 11ea8316e0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13902435

Change-Id: I3cf56466a4a0752cd2dad7ea7726cf550889ff30
2021-03-18 15:09:37 +00:00
TreeHugger Robot
11ea8316e0 Merge "Refinements for DND settings" into sc-dev 2021-03-18 14:35:19 +00:00
Chiachang Wang
7dce573e9d Merge "Update mocking to correct target methods" am: efa884758b am: b64bf233a3
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1644306

Change-Id: I8fed607cd748348e714470f5fe8159abe445313d
2021-03-18 14:29:12 +00:00
Chiachang Wang
b64bf233a3 Merge "Update mocking to correct target methods" am: efa884758b
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1644306

Change-Id: I2d68748adf0154af2a3b9017d4510041af5baf12
2021-03-18 13:53:11 +00:00
Chiachang Wang
efa884758b Merge "Update mocking to correct target methods" 2021-03-18 13:16:14 +00:00
Yanting Yang
e7eaa7c701 Merge "Remove Advanced category from Network & internet" into sc-dev am: 48cc107acd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13916845

Change-Id: I59880d760b723f28ecdb4557f6faa5d8f9c6621c
2021-03-18 11:38:55 +00:00
Yanting Yang
48cc107acd Merge "Remove Advanced category from Network & internet" into sc-dev 2021-03-18 10:59:26 +00:00
Almaz Mingaleev
548f264bd3 Merge "Fix imports in LocationTimeZoneDetectionPreferenceController." into sc-dev am: 39396b0bb2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13840827

Change-Id: Iaaeaab0a2d39bfaf9760ee475ad1942339566dcd
2021-03-18 09:35:34 +00:00
Yanting Yang
d6174afbb6 Merge "Remove grouping from homepage" into sc-dev am: fadf32ffcb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13911068

Change-Id: Ied21e522a293756afe93927c9d0afbf5bc1a7d60
2021-03-18 09:35:06 +00:00
Almaz Mingaleev
39396b0bb2 Merge "Fix imports in LocationTimeZoneDetectionPreferenceController." into sc-dev 2021-03-18 09:23:30 +00:00
Yanting Yang
0e05b2e8ac Remove Advanced category from Network & internet
Based on the latest UX design to remove the Advanced category.

Fixes: 182742887
Bug: 182237530
Test: robotests & visual
Change-Id: Idc184960c3ac74610545c036d5a22959ac6730c1
2021-03-18 17:15:23 +08:00
Yanting Yang
fadf32ffcb Merge "Remove grouping from homepage" into sc-dev 2021-03-18 08:57:37 +00:00
TreeHugger Robot
6699634163 Merge "Smart Router settings UI changes" into sc-dev am: cb64ea60c2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13877245

Change-Id: I69b24eeccbd78ea00efd42f210a6e09febdc4604
2021-03-18 07:18:08 +00:00
Chiachang Wang
6290ad9509 Update mocking to correct target methods
The correct target context should use the mActivity in
MobileNetworkSettingsTest, so that the mocking for
telephony service could correctly applied.

Both AutoTimeZonePreferenceControllerTest and
BasebandVersionPreferenceControllerTest refer to the lib
implemented shadow Connectivitymanager but that does not
the correct reference after utils class being updated.
Update the test logic inside to refer to correct method.
The reference to ShadowConnectivityManager does not needed
anymore so remove it from the test.

Fix: 183068151
Fix: 183067742
Fix: 183068139
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
com.android.settings.network.telephony.MobileNetworkSettingsTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
com.android.settings.datetime.AutoTimeZonePreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings\
.deviceinfo.firmwareversion.BasebandVersionPreferenceControllerTest

Change-Id: I15ecc6aab7d530d20cd23b06267cc184a2c62b40
2021-03-18 14:53:07 +08:00
TreeHugger Robot
cb64ea60c2 Merge "Smart Router settings UI changes" into sc-dev 2021-03-18 06:43:16 +00:00
Yanting Yang
395f26a66e Remove grouping from homepage
Based on the latest UX design to remove the grouping from homepage.

Fixes: 183070484
Test: visual
Change-Id: I5834366f37e9198e8830ee67980eabc016d56909
2021-03-18 14:22:28 +08:00
Dmitri Plotnikov
313dbc0355 Remove references to BatteryStatsHelper from PowerUsageBase
Bug: 180630447
Bug: 173745486

Test: make RunSettingsRoboTests
Test: male RunSettingsGoogleRoboTests
Change-Id: Ifed69c4fdd741f75b0b962f9d3200f0ed533358f
2021-03-18 06:07:29 +00:00
Kunhung Li
ab85ca9570 Clear WallpaperPicker task before launch am: 5f2cf8e695
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13869868

Change-Id: Icc768c66b843c8dbab9faedbce0e396c7bb23b80
2021-03-18 06:03:32 +00:00
Kunhung Li
5f2cf8e695 Clear WallpaperPicker task before launch
There are different launch sources to start WallpaperPicker, clear
previous task to prevent keeping old activity.

Bug: 177638480
Test: make RunSettingsRoboTests
Change-Id: Ia4d3d5c7e5df4a5d3acb137f644939c079d5028f
2021-03-18 05:37:14 +00:00
SongFerng Wang
8d4651b255 Merge "Moving the error messages from slice to panel's subtitle" into sc-dev am: 45726b937b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13812558

Change-Id: I43c2470bec18024fd0942c4b7ea34879f7ecf1fd
2021-03-18 05:16:23 +00:00
TreeHugger Robot
c0f6a91c34 Merge "Transition HighUsageDetector to BatteryUsageStats API" into sc-dev am: 46fdf4d5be
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13868211

Change-Id: I9dd4e927b465c4d257d356e399fc0f74eb930c58
2021-03-18 05:16:03 +00:00
Jason Hsu
49a69dfce7 Merge changes from topic "accessibility_floating_menu_ui" into sc-dev am: b1f6c4658c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13899515

Change-Id: I9328a6aa97881dfe97d842d170f58a62d0b3b991
2021-03-18 05:15:43 +00:00
jasonwshsu
138b6756ed Update the vector drawable for accessibility button preview preference am: 799ead4d41
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13899514

Change-Id: Ic6c6af8234a328d8be771d205f98e8cdf3b1635b
2021-03-18 05:15:42 +00:00
jasonwshsu
977b241235 Remove the accessibility gesture tutorial dialog in system navigation am: e2c69bcd7b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13899513

Change-Id: If2ed67fe2fa605f013e9142413c1fb9b911b5ec0
2021-03-18 05:15:40 +00:00
jasonwshsu
49e54b3877 Update the dialog content for accessibility floating menu am: 31db2fafc2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13899512

Change-Id: I8904a936faf5746f9d0caf25aa6cee77cc5716ba
2021-03-18 05:15:38 +00:00
jasonwshsu
69e951c8fd Add the preference controller to control accessibility button fade preference am: 648811b2b4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13899511

Change-Id: Id34945f8cf213b77af04b74df3ff8b1f0067295d
2021-03-18 05:15:37 +00:00
jasonwshsu
985931a566 Add the preference controller to control accessibility button preview preference am: eb2411db9d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13899510

Change-Id: Id2f8114e0c82d71109573d0d3b70ac62fa251b74
2021-03-18 05:15:35 +00:00
jasonwshsu
39ecf6e2b1 Add the preference controller to control accessibility button opacity preference am: c72fe39597
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13899509

Change-Id: Ic3d56f036d3529b224fc553b7e2726a8ac83c3cc
2021-03-18 05:15:33 +00:00
jasonwshsu
277098d628 Add the preference controller to control accessibility button size preference am: 0377025554
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13899508

Change-Id: Ib0bf71b130989c15282f7373bb1bf94543d44073
2021-03-18 05:15:32 +00:00
jasonwshsu
f078f77e70 Add the preference controller to control accessibility button location preference am: 2dc32f63f8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13899507

Change-Id: I57c36af05a2cf2592ce28128fe1e26b84ba5f78c
2021-03-18 05:15:30 +00:00