Commit Graph

11612 Commits

Author SHA1 Message Date
Jason Hsu
fc4ab252c6 Merge "Remove unused code" into sc-dev am: 4e95be4aa2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14060696

Change-Id: Iadf9860b096741754f32859e51d4949f9b18a13a
2021-04-01 16:04:58 +00:00
Jason Hsu
4e95be4aa2 Merge "Remove unused code" into sc-dev 2021-04-01 15:27:21 +00:00
tim peng
8e6583cf69 Merge "[Rohan]The battery level show up "-1%", not sync with Rohan." into sc-dev am: 6f96226f45
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14045485

Change-Id: Ib71bad87161501a98eec50ca3cbe12544f0c68c5
2021-04-01 14:00:28 +00:00
tim peng
6f96226f45 Merge "[Rohan]The battery level show up "-1%", not sync with Rohan." into sc-dev 2021-04-01 13:25:31 +00:00
Wesley Wang
7fbf2baf49 Merge "Fix testing fail for BatteryInfoTest and HighUsageTipTest" into sc-dev am: e949d0f870
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14063746

Change-Id: Ida57003f03a40fe813f299903b39502a5945f7d2
2021-04-01 12:14:23 +00:00
Wesley Wang
e949d0f870 Merge "Fix testing fail for BatteryInfoTest and HighUsageTipTest" into sc-dev 2021-04-01 11:30:22 +00:00
Wesley.CW Wang
d7e0fa959b Fix testing fail for BatteryInfoTest and HighUsageTipTest
- Fix the test fail from ag/14048547

Bug: 183689347
Test: make RunSettingsRoboTests
Change-Id: Ia7a0d0fa567b1826a42b304a04e627e3b0e5f896
2021-04-01 18:28:14 +08:00
jasonwshsu
6e33293fa3 Remove unused code
* isColorTransformAccelerated() already moved to ColorDisplayManager
* TurnScreenDarker fragment already moved to top level accessibility settings or TextAndDisplay fragment

Bug: 174829936
Test: manual test
Change-Id: I34ec6947129a5042d573e94eabe3c24c2fe761b5
2021-04-01 09:41:11 +00:00
Tim Peng
7246a4f842 [Rohan]The battery level show up "-1%", not sync with Rohan.
-Hide battery information when it is unknown

Bug: 184017556
Test: make -j50 RunSettingsRoboTests ROBOTEST_FILTER=AdvancedBluetoothDetailsHeaderControllerTest
Change-Id: I5f94ccae364f1420e04af21ba425c29ac6a11dd2
2021-04-01 15:40:54 +08:00
YUKAI HUNG
99e05960b8 Merge "Fix testing fail for BatteryEntryTest from patch ag/14008232" into sc-dev am: 971dc476c3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14060695

Change-Id: I9934802a429341758faf141d2c57d1a9f749da61
2021-04-01 07:36:59 +00:00
YUKAI HUNG
971dc476c3 Merge "Fix testing fail for BatteryEntryTest from patch ag/14008232" into sc-dev 2021-04-01 07:10:22 +00:00
Wesley.CW Wang
ce453159f7 Update low battery tips string am: 6d836d2d51
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14048550

Change-Id: I20ef817e4cd7bea00cc4ea6b74a35c7ea82022c6
2021-04-01 06:52:53 +00:00
Wesley.CW Wang
6d836d2d51 Update low battery tips string
- Screenshot: https://screenshot.googleplex.com/33zJkqsTex8r49W.png

Bug: 183689347
Test: make RunSettingsRoboTests
Change-Id: I864c555c3e500bf4ae5364db8dd6c86be564b883
2021-04-01 06:30:08 +00:00
Hugh Chen
ebe6e7e5ea Merge "Revert "Fix bluetooth settings will broadcast to anywhere when some cases"" into sc-dev am: cf2dc5107b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14056750

Change-Id: Ic276e1f9f9db9eff9258f7501d03a66e41963745
2021-04-01 06:05:47 +00:00
Hugh Chen
cf2dc5107b Merge "Revert "Fix bluetooth settings will broadcast to anywhere when some cases"" into sc-dev 2021-04-01 05:40:21 +00:00
ykhung
1b8a100c7a Fix testing fail for BatteryEntryTest from patch ag/14008232
Bug: 184138623
Test: make RunSettingsRoboTests
Test: make RunSettingsGoogleRoboTests
Change-Id: Ic770b09cc303a9f213e31174f279940c2aa1f87d
2021-04-01 13:40:11 +08:00
Bill Lin
e43497ff54 Merge "2/ Make One handed mode support multiple user switch" into sc-dev am: e3e3fc915a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13849836

Change-Id: I446caec4128640628d205babf4b5306c99a2eb90
2021-04-01 02:37:25 +00:00
Hugh Chen
802cb176d0 Revert "Fix bluetooth settings will broadcast to anywhere when some cases"
This reverts commit 9d00364da4.

Reason for revert: This fix have a regression, for not blocking b/183344112 revert it.

Change-Id: Ic4366b51e07b43c8d64d2e145563d8a30cb0fc60
2021-04-01 02:24:51 +00:00
Bill Lin
e3e3fc915a Merge "2/ Make One handed mode support multiple user switch" into sc-dev 2021-04-01 02:02:39 +00:00
Wesley.CW Wang
f97a5e8fc1 Update battery progress bar am: fdfda5e589
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14045496

Change-Id: I008cdd00eb1c607c61cacd7aab037426dd83de1d
2021-03-31 17:31:30 +00:00
Wesley.CW Wang
fdfda5e589 Update battery progress bar
- Setup state text to bottom text view
 - Remove battery state icon
 Screenshot: https://screenshot.googleplex.com/At9tAVDgnoQBtNS.png

Bug: 177407113
Test: make RunSettingsRoboTests
Change-Id: I86cfe83982da70b8fc49386f388c1a068295e205
2021-03-31 17:04:24 +00:00
Jernej Virag
3340db9ef0 Fix error in PowerMenuSettingsControllerTest am: 512419a454
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14051305

Change-Id: If708b4979129e426158151bb665354724f54586c
2021-03-31 15:43:54 +00:00
Jernej Virag
512419a454 Fix error in PowerMenuSettingsControllerTest
"allUnavailable" should actually mean long press on power menu unavailable as well.

Bug: 184138823
Test: make RunSettingsRoboTests
Change-Id: Idee6b0a665941d5840166331f76e571e2539bd2e
2021-03-31 13:53:27 +00:00
Bill Lin
49ba85dc8a 2/ Make One handed mode support multiple user switch
Previously OHM did not support for multile user switch.
We get current user id in settings and get/put settings value
with currentUserId.

Test: manual switch user and check Settings > System > Gesture > One-Handed
Test: make RunSettingsRoboTests -j40

Bug: 182278800
Change-Id: I12dcc7b634ae19375358733357dc95197e81067c
2021-03-31 17:48:23 +08:00
Yanting Yang
9916f07f3e Merge "Make work profile sounds section as its own entry" into sc-dev am: 6ef0b34a32
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13887089

Change-Id: I819769ce85ccdb316600df7da4c55552a2be6982
2021-03-31 08:37:28 +00:00
Yanting Yang
6ef0b34a32 Merge "Make work profile sounds section as its own entry" into sc-dev 2021-03-31 08:08:41 +00:00
Fan Zhang
030ff66672 Merge "More settings button add test" into sc-dev am: 2d58e29ad9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14017673

Change-Id: I787577510551a8ac6ce7b7cfddff7ca4c7e45802
2021-03-30 20:30:21 +00:00
Fan Zhang
2d58e29ad9 Merge "More settings button add test" into sc-dev 2021-03-30 19:41:33 +00:00
Shireesha Bongarala
2043d31130 More settings button add test
Bug: 179063896
Test:  make RunSettingsRoboTests -j40 ROBOTEST_FILTER=MoreSettingsPreferenceControllerTest

Change-Id: I99079165d32074ac0812bd62a146a9d238738fbc
2021-03-30 17:09:57 +00:00
Peter Kalauskas
439a60643c Merge "Fix NPE in UserSettingsTest" into sc-dev am: 383ae7f025
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14019935

Change-Id: I3813fa74f48c043d9d539e8b9997e1a2a1edb40f
2021-03-30 15:19:39 +00:00
Peter Kalauskas
383ae7f025 Merge "Fix NPE in UserSettingsTest" into sc-dev 2021-03-30 15:01:16 +00:00
Yanting Yang
e14a3a3022 Make work profile sounds section as its own entry
Also rephrase the strings by request.

Bug: 174964721
Test: manual
Change-Id: I760249cd48832f2739ab7ca33706cd11dd34a6b5
2021-03-30 22:37:01 +08:00
Julia Reynolds
b3b92c996c Merge "Fix some 'clear recent issues'" into sc-dev am: 05c30a3f53
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14019938

Change-Id: Id5244f754140fdd68097407798363a62caec3087
2021-03-30 14:21:49 +00:00
Julia Reynolds
05c30a3f53 Merge "Fix some 'clear recent issues'" into sc-dev 2021-03-30 13:41:58 +00:00
Almaz Mingaleev
edd4dea232 resolve merge conflicts of 7d9233302f to sc-dev am: dea929aa06
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14032726

Change-Id: I3ce506516ee7e9f6ff4581705e4c150d10faa26b
2021-03-30 11:58:28 +00:00
Almaz Mingaleev
dea929aa06 resolve merge conflicts of 7d9233302f to sc-dev
Change-Id: I7f6b7b035cc9c37a168e97ddeac5c8de9d5910de
2021-03-30 11:43:33 +00:00
Arc Wang
5db8f5ae05 Merge "Check config to decide if Smart Storage toggle should exist" into sc-dev am: 21cf6c04db
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13994999

Change-Id: Ib25fad04992539fb95bc32870a0ea28ab562a8c0
2021-03-30 11:18:35 +00:00
Arc Wang
71ec654fcc Merge "Show "Files" category for public storage in Storage Settings" into sc-dev am: dd2f2f51e0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13975110

Change-Id: Iea8ea56dfa32eca83adeb75b5fc98668af017b80
2021-03-30 11:18:15 +00:00
Arc Wang
21cf6c04db Merge "Check config to decide if Smart Storage toggle should exist" into sc-dev 2021-03-30 09:49:48 +00:00
Arc Wang
dd2f2f51e0 Merge "Show "Files" category for public storage in Storage Settings" into sc-dev 2021-03-30 09:48:04 +00:00
Almaz Mingaleev
7d9233302f Merge "Allow alternative time zone ID to be set device's zone." am: 2cd0b0aadf am: 87273aab56
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1652336

Change-Id: I8cce932794d13dd8f9424883b9521a823583f335
2021-03-30 09:39:21 +00:00
Arc Wang
78bafc988a Check config to decide if Smart Storage toggle should exist
Bug: 174964885
Test: AutomaticStorageManagementSwitchPreferenceControllerTest
Change-Id: I3090e3d1b01b18b3d0f68396671c8791321cc480
2021-03-30 07:58:37 +00:00
Arc Wang
c626380689 Show "Files" category for public storage in Storage Settings
Users can click this preference to see public storage files
in external file browsers.

Bug: 170918505
Test: make RunSettingsRoboTests ROBOTEST_FILTER=StorageItemPreferenceControllerTest
      manual
      Select private storage and public storage and observe UI
Change-Id: If3f0d59b2ebf941d70e81e60c4c2015b80e7cf33
2021-03-30 15:51:49 +08:00
Wesley Wang
9d58d7455e Merge "Reset smart battery page switch component" into sc-dev am: 4559d22e51
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14017668

Change-Id: I723254c68196c75607d21d89a400164fee908abf
2021-03-30 06:48:44 +00:00
Wesley Wang
4559d22e51 Merge "Reset smart battery page switch component" into sc-dev 2021-03-30 06:15:00 +00:00
Bonian Chen
e12af7c44d Merge "Revert "[Settings] Support getSystemService(Class<T>)"" into sc-dev am: fecfb7f5e4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14022667

Change-Id: If7b7aed4d406cea84e118a9b8f9c29ae6206287d
2021-03-30 05:37:24 +00:00
Bonian Chen
fecfb7f5e4 Merge "Revert "[Settings] Support getSystemService(Class<T>)"" into sc-dev 2021-03-30 05:31:52 +00:00
Weng Su
e8bd222753 Merge "Fix the broken test on WifiSettingsTest" into sc-dev am: ae80253161
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14017674

Change-Id: I1f8507c06c8ebff22a7f7c3dcf7321c389f768dd
2021-03-30 03:26:12 +00:00
Weng Su
9950c9913d Merge "Ignore WifiNoInternetDialogTest failed test cases" into sc-dev am: 39bc92d1bc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14017681

Change-Id: I7e6f5b7d55fd59f81d0666980befe7ad58d11880
2021-03-30 03:26:07 +00:00
Weng Su
2206513a4e Merge "Fix WifiTetherPasswordPreferenceControllerTest failed" into sc-dev am: 79fabbc249
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14017678

Change-Id: If9abdd3046d5811760ef93803aefb9a4d92f6ff2
2021-03-30 03:26:03 +00:00