Commit Graph

80734 Commits

Author SHA1 Message Date
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
003e27d146 Remove hidden connectivity methods access
This commit resolves the hidden methods accesses for
LinkProperties, IpConfiguration and RouteInfo with atlernative
way for the connectivity mainline module preparation.

Bug: 172183305
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
com.android.settings.wifi.details2.WifiDetailPreferenceController2Test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
com.android.settings.wifi.details.WifiDetailPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
com.android.settings.UtilsTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
com.android.settings.wifi.WifiConfigController2Test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
com.android.settings.wifi.WifiConfigController2Test

Change-Id: Iec4dab5d9fa12dedcf69a1cfe2a8be0956bc0d79
2021-03-18 14:31:28 +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
eedfa1d307 Remove hidden connectivity methods access
This commit resolves the hidden methods accesses for
LinkProperties, IpConfiguration and RouteInfo with atlernative
way for the connectivity mainline module preparation.

Bug: 172183305
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
com.android.settings.wifi.details2.WifiDetailPreferenceController2Test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
com.android.settings.wifi.details.WifiDetailPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
com.android.settings.UtilsTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
com.android.settings.wifi.WifiConfigController2Test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
com.android.settings.wifi.WifiConfigController2Test

Change-Id: Iec4dab5d9fa12dedcf69a1cfe2a8be0956bc0d79
Merged-In: Iec4dab5d9fa12dedcf69a1cfe2a8be0956bc0d79
2021-03-18 22:25:05 +08: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
Chiachang Wang
11c37350d9 Replace the way to get the network for no internet dialog
It's a refactor work for incoming connectivity mainline. The
network information contained in the no ineternet notification
action was placed the target network id. The receiver which is
Settings will need to construct the network from the network id
using the hidden Network constructor. Since Network is moving
into module, Settings will not be able to access it. Apps should
use Network instead of network id, so just send the network
object to Settings.

Update the corresponding logic in Settings.

Bug: 172183305
Test: manually test with no internet dialog and check the
      behavior and log
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
      com.android.settings.wifi.WifiNoInternetDialogTest
Change-Id: I75c04d6f1c2159ae990f6015551eb39d99266336
2021-03-18 11:35:05 +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
Weng Su
b7dbd3a911 Hide edit menu if network is uneditable
- Screenshot:
  https://screenshot.googleplex.com/3BhZRBrmQXjeaGL

Bug: 161896161
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiNetworkDetailsFragment2Test

Change-Id: I47ea2cf19e178eff48f23e56903d0daa4ef8fa28
2021-03-18 17:35:25 +08: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
Weng Su
f4432df069 [DO NOT MERGE] Revert "[Security Report] Fix Settings WifiScanModeActivity Overlaid issue"
This reverts commit 32d5d3a3a3.

Bug: 174047492
Reason for revert:
Look like the WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS system flag is not supported in the pi-dev branch.

Change-Id: Iec3c28e8c148f83fc171d696b2fc67f359d03eb8
2021-03-18 09:02:20 +00:00
Yanting Yang
fadf32ffcb Merge "Remove grouping from homepage" into sc-dev 2021-03-18 08:57:37 +00:00
Bill Lin
dd2654493f 2/ Set Swipe bottom for notification OFF by default
Note:
1) The "Swipe bottom for notification" will still available
   in Settings
2) If user had ever turn ON this settings, then we will NOT help
user change() any setting for this purpose.

Test: facory reset and observe the default function if OFF
Bug: 182711813
Change-Id: I9d76c6c5c83a1dcfaaf289b5af9dcc996bb943fa
2021-03-18 15:47:21 +08: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
jasonwshsu
41a8a174ea Setup basic layout and resources for the accessibility button settings page am: 03dbb40d2b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13899506

Change-Id: I92f17c3ce600d3bd1fc44c46d6108d1d667535da
2021-03-18 05:15:25 +00:00
Yanting Yang
c05069e992 Merge "Fix NPE of AppVersionPreferenceController" into sc-dev am: 8f414f2e0f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13886027

Change-Id: I804f36e13133e18de4a4a4260f3dcda9d7ee2fbb
2021-03-18 05:09:10 +00:00
Treehugger Robot
0fc786860d [automerger skipped] Merge "Replace hidden CM#isNetworkSupported() usage" am: 959325e88a am: 207fa629bc am: e5dfff612b -s ours am: 6da9386097 -s ours
am skip reason: skip tag Change-Id I8f1d11558b1be575a0777ed195abe027e838cb74 with SHA-1 ffbe4e9b1e is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1639940

Change-Id: I4da2e95cf3d0a1b4f2e30b5a9dd5436373e04e4c
2021-03-18 05:09:02 +00:00
Chiachang Wang
cf564ea8df Merge "Replace the hidden ProxyInfo methods usage" am: 2f66e59e05 am: 3ad73342c7 am: 168298f426 am: 75014e693d
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1641827

Change-Id: Ia72f41007d279a34f2e8c07e31dffc0410da37fd
2021-03-18 05:07:53 +00:00
SongFerng Wang
45726b937b Merge "Moving the error messages from slice to panel's subtitle" into sc-dev 2021-03-18 04:58:50 +00:00
TreeHugger Robot
46fdf4d5be Merge "Transition HighUsageDetector to BatteryUsageStats API" into sc-dev 2021-03-18 04:57:29 +00:00
Jason Hsu
b1f6c4658c Merge changes from topic "accessibility_floating_menu_ui" into sc-dev
* changes:
  Remove half circle option in size selector
  Update the vector drawable for accessibility button preview preference
  Remove the accessibility gesture tutorial dialog in system navigation
  Update the dialog content for accessibility floating menu
  Add the preference controller to control accessibility button fade preference
  Add the preference controller to control accessibility button preview preference
  Add the preference controller to control accessibility button opacity preference
  Add the preference controller to control accessibility button size preference
  Add the preference controller to control accessibility button location preference
  Setup basic layout and resources for the accessibility button settings page
2021-03-18 04:54:54 +00:00
Yanting Yang
8f414f2e0f Merge "Fix NPE of AppVersionPreferenceController" into sc-dev 2021-03-18 04:48:54 +00:00