PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
82,759 Commits 1 Branch 0 Tags
0f2524b6e35aa0cccd0db9a3c16b4dc93bf32f7c
Commit Graph

37103 Commits

Author SHA1 Message Date
TreeHugger Robot
0f2524b6e3 Merge "[Provider Model] Show searching sub-title only when the Wi-Fi network is empty" into sc-dev am: a1bfc7daeb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14511218

Change-Id: I9b450f56fa4711a3578b216cb8a186daf5f56298
 2021-05-12 07:09:15 +00:00
TreeHugger Robot
a1bfc7daeb Merge "[Provider Model] Show searching sub-title only when the Wi-Fi network is empty" into sc-dev 2021-05-12 06:54:02 +00:00
YUKAI HUNG
55f9c92e00 Merge "Should not show internal package entry in the usage list" into sc-dev am: 0d00ace0d2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14511219

Change-Id: I391e5b838a70c431ecf31b51f032d6eb274602a6
 2021-05-12 06:31:57 +00:00
YUKAI HUNG
0d00ace0d2 Merge "Should not show internal package entry in the usage list" into sc-dev 2021-05-12 06:24:55 +00:00
Kevin Han
dd601a2f78 Merge "Fix "X unused apps" string to match w/ unused apps" into sc-dev am: 421c4e3efc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14471254

Change-Id: I454a0a9e40007ffbcce78b5fbfb565373313ca6f
 2021-05-12 06:22:29 +00:00
Kevin Han
421c4e3efc Merge "Fix "X unused apps" string to match w/ unused apps" into sc-dev 2021-05-12 06:06:49 +00:00
ykhung
28605dcf16 Should not show internal package entry in the usage list 
Bug: 187770266
Test: make SettingsRoboTests
Change-Id: I56897c8f91295ba2139b7fda8c59a863130ecd86
 2021-05-12 05:17:22 +00:00
YUKAI HUNG
5bcf8834f8 Merge "Remove unnecessary converting us to ms" into sc-dev am: 899845b1ee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14503323

Change-Id: Ia9ffc5337a3e9ef8c9335b730b18d541e54a7c98
 2021-05-12 04:49:04 +00:00
YUKAI HUNG
899845b1ee Merge "Remove unnecessary converting us to ms" into sc-dev 2021-05-12 04:34:57 +00:00
TreeHugger Robot
001368fbbe Merge "Add tests for guest user events" into sc-dev am: abd44a8a2e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14491474

Change-Id: I6d6adbb8e3c22405b69eebfaf82fb09a91a46ec1
 2021-05-12 04:27:23 +00:00
Weng Su
04ec0e0929 [Provider Model] Show searching sub-title only when the Wi-Fi network is empty 
- Screenshot:
  https://screenshot.googleplex.com/7Z5r5AnpAZb6GfQ

Bug: 187886636
Test: manual test
atest -c InternetConnectivityPanelTest

Change-Id: Ib4769746819a5863e4a4981d0c73dda838ae3ae2
 2021-05-12 04:09:49 +00:00
TreeHugger Robot
abd44a8a2e Merge "Add tests for guest user events" into sc-dev 2021-05-12 03:59:44 +00:00
ykhung
8b8ee73bad Keep selected time slot and expand state when device is rotate am: 9ef9e1ee0c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14503317

Change-Id: Icfb7502b0e134abbfc30650452ee467be700c9cf
 2021-05-12 03:34:00 +00:00
TreeHugger Robot
0bd88cc1bb Merge "Set storage volume spinner not clickable when only 1 volume" into sc-dev am: 2853e766f5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14495884

Change-Id: Id2d5db1fbf87e87be4c5239eaea3da7ef9b4c594
 2021-05-12 03:33:37 +00:00
ykhung
8343fe8b0a Remove unnecessary converting us to ms 
The class "Estimate" has the menber estimateMillis and
the unit of batteryUsageStats.getBatteryTimeRemainingMs() is
millisecond,so converting from us to ms is unnecessary.

Bug: 187379252
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.BatteryInfoTest
Test: manual
Change-Id: If7c1092c1b7e5f74f8907ffe0248eccf3535ac0c
 2021-05-12 03:29:23 +00:00
ykhung
9ef9e1ee0c Keep selected time slot and expand state when device is rotate 
Bug: 187772493
Test: make SettingsRoboTests
Change-Id: If70abf06825a88f0ad0add37ef8d4f46a0aad1e9
 2021-05-12 03:28:59 +00:00
PETER LIANG
0ff0095ea7 Merge "Provide a way to Accessibility button settings via intent." into sc-dev am: f2d70ab320 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14008225

Change-Id: I4cbd283a0c29e2794f9f815f04736f1690e5e618
 2021-05-12 03:23:33 +00:00
TreeHugger Robot
0d3bfddd5b Merge "Implements profile selection tab in Storage Settings" 2021-05-12 03:11:00 +00:00
TreeHugger Robot
2853e766f5 Merge "Set storage volume spinner not clickable when only 1 volume" into sc-dev 2021-05-12 03:10:53 +00:00
PETER LIANG
f2d70ab320 Merge "Provide a way to Accessibility button settings via intent." into sc-dev 2021-05-12 02:59:10 +00:00
Menghan Li
9f75dd4497 Merge "[Material Next] Move “main switch” right below illustration" into sc-dev am: 16e8c767f1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14486917

Change-Id: I81fc484b8c48f04489868cca4a14b478d597f1c4
 2021-05-12 02:44:13 +00:00
Menghan Li
16e8c767f1 Merge "[Material Next] Move “main switch” right below illustration" into sc-dev 2021-05-12 02:28:25 +00:00
Joe Bolinger
72885506b4 Merge "Add userId parameter to all uses of challenge in settings." into sc-dev am: 93f6a257e9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14472474

Change-Id: I2208e5f953a485aaa1d00d8d168b009269b65c9a
 2021-05-12 01:30:17 +00:00
Joe Bolinger
93f6a257e9 Merge "Add userId parameter to all uses of challenge in settings." into sc-dev 2021-05-12 01:25:39 +00:00
menghanli
1949a5d69f [Material Next] Move “main switch” right below illustration 
Bug: 187688296
Test: Manual testing
Change-Id: Ic36b6deaad410fce49dcc19861a11307fb479f55
 2021-05-12 00:56:50 +00:00
Kevin Han
53aaab09b8 Fix "X unused apps" string to match w/ unused apps 
This fixes an issue where there is some discrepancy between the "X
unused apps" string in Settings and the actual number of unused apps in
PermissionController due to the Settings logic not taking into account
the usage time.

Bug: 187464720
Test: atest HibernatedAppsPreferenceControllerTest
Test: hibernate app and revoke permission, open app, number of unused
apps matches up

Change-Id: Ifc30280e582e4183c61d421dd5378d627a80baf9
 2021-05-11 17:04:55 -07:00
Hai Zhang
1a50cec60a Merge "Don't add SettingsLib to static_libs in Settings unit test." into sc-dev am: 8a7f55246f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14491512

Change-Id: I3f4472878de17742fe6c5f2fb697cc5693b1af60
 2021-05-11 22:55:07 +00:00
Hai Zhang
6bf47f6274 Don't add SettingsLib to static_libs in Settings unit test. 
Adding them results in duplicate classes and causes conflict for the R
classes and resource loading.

Meanwhile, correctly removing the SettingsLibSettingsSpinner resulted
in the test failing to find the getSelectedItem() method which is
unused inside Settings app. This is an inherent issue when unit
testing an optimized (and shrunk) app, and since there's no other way
for the test to get the current selected item, this change simply
changes the Settings code to invoke getSelectedItem() as well. This
has exactly the same effect because SettingsSpinnerPreference updates
its mPosition right before calling the OnItemSelectedListener in its
implementation.

Bug: 183340630
Bug: 177638625
Bug: 183342958
Test: atest SettingsSliderPreferenceControllerTest
Test: atest PrivateVolumeForgetTest
Change-Id: Ia26ca923369b41291614fb9bd50dfbd2aac2f0fa
 2021-05-11 03:33:08 -07:00
Arc Wang
65d3f45606 Set storage volume spinner not clickable when only 1 volume 
Bug: 187801712
Test: manual
      Click the spinner when there is only default volume.
      Click the spinner when there is USB drive connected.
Change-Id: Ifbd26c96f467757ffcfef750bd80533834123f82
 2021-05-11 18:06:47 +08:00
Peter Kalauskas
c24234c301 Add tests for guest user events 
Also, move ACTION_USER_GUEST_EXIT_CONFIRMED so it is only logged after
safety-check

Test: ROBOTEST_FILTER="com.android.settings.users.UserSettingsTest" m RunSettingsRoboTests
Test: ROBOTEST_FILTER="com.android.settings.users.UserDetailsSettingsTest" m RunSettingsRoboTests
Bug: 184200796
Change-Id: Id18aa914bbb262984d7c7cf4b8a4ffdde278fd23
 2021-05-10 20:36:48 -07:00
Joe Bolinger
971f0f3c5a Add userId parameter to all uses of challenge in settings. 
Bug: 184915229

Test: manually on device (as normal, extra user, & work profile)
Change-Id: Id509b5866d53525b38a5bb95bbbcc723d6651745
 2021-05-10 18:26:57 -07:00
Wesley Wang
180e63c0b8 Merge "Update battery usage summary" into sc-dev am: 56488ef84b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14486916

Change-Id: I9fa451611e4abfab6cfcbf25864485b28ca6e7e3
 2021-05-10 17:17:07 +00:00
Wesley Wang
56488ef84b Merge "Update battery usage summary" into sc-dev 2021-05-10 17:00:07 +00:00
Julia Reynolds
044aeb767d Merge "Handle NLS metadata when provided as strings" into sc-dev am: 333b68d059 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14470497

Change-Id: I5451f21c6519f20050e981ab868f233adeefb393
 2021-05-10 16:02:20 +00:00
Julia Reynolds
333b68d059 Merge "Handle NLS metadata when provided as strings" into sc-dev 2021-05-10 15:56:35 +00:00
TreeHugger Robot
74f49b0ec9 Merge "Fix work profile setting appearing too often" into sc-dev am: 9cb5ab3860 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14470515

Change-Id: I327dc293b5441ff010e931feaacc11125f28f780
 2021-05-10 13:43:42 +00:00
TreeHugger Robot
9cb5ab3860 Merge "Fix work profile setting appearing too often" into sc-dev 2021-05-10 13:26:31 +00:00
Wesley.CW Wang
8d5010f6ec Update battery usage summary 
- Set up different summary for AOSP

Bug: 185855825
Bug: 187667156
Test: make SettingsRoboTests
Change-Id: I94dccfc325ecfcff8013fe4d3b5b65c427dcae5c
 2021-05-10 13:03:12 +00:00
Tom Hsu
3a5b0d10fe Merge "Show W+ when connected to Carrier Wi-Fi Network" into sc-dev am: fa024d6fc8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456005

Change-Id: I116e5f2e4f02b620513fd5b6d08eaa131f438b55
 2021-05-10 08:54:05 +00:00
Tom Hsu
fa024d6fc8 Merge "Show W+ when connected to Carrier Wi-Fi Network" into sc-dev 2021-05-10 08:35:36 +00:00
Arc Wang
fa6e82b879 Implements profile selection tab in Storage Settings 
- StorageDashboardFragment and StorageItemPreferenceController works only
  for one profile per instance.
- StorageAsyncLoader loads for all users(profiles) and regards each user independent.
- SecondaryUserController will not load personal profile user in work profile tab.
- Cleanup some unused profile related files.

Bug: 174964885
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: I8361c29bc240c519c7261b19522c41439479c1c2
 2021-05-10 15:21:33 +08:00
TreeHugger Robot
541feb1c09 Merge "Merge existing bundle with ActivityOptions" into sc-dev am: 57d8d38a3c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14455998

Change-Id: I5836a10fa8c0ba2d64d1b059ef52b62b2964c119
 2021-05-10 06:19:16 +00:00
tom hsu
2519077d97 Show W+ when connected to Carrier Wi-Fi Network 
Internet picker
  - https://screenshot.googleplex.com/7k4ojF65a8Bis5R
 Internet panel
  - https://hsv.googleplex.com/6749112168873984
Bug: 185431894
Test: atest passed

Change-Id: Ic79686b47f033870ad8e7741f9baf3230dde7b7c
 2021-05-10 14:08:05 +08:00
TreeHugger Robot
57d8d38a3c Merge "Merge existing bundle with ActivityOptions" into sc-dev 2021-05-10 06:05:37 +00:00
Weng Su
787edc7fd6 Merge "[Provider Model] Add progress bar to internet panel" into sc-dev am: 72c3debb0b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14442219

Change-Id: If1522799983b816d12f6f8312d4aec158ca7a3fc
 2021-05-10 05:42:37 +00:00
Weng Su
72c3debb0b Merge "[Provider Model] Add progress bar to internet panel" into sc-dev 2021-05-10 05:28:15 +00:00
Weng Su
c407a2d9f8 [Provider Model] Add progress bar to internet panel 
- Show progress bar when Wi-Fi scanning

- Show "Searching for networks..." sub-title when Wi-Fi scanning

- Remove "Wi-Fi" from searching networks string

Bug: 178774497
Test: manual test
atest -c InternetConnectivityPanelTest
make RunSettingsRoboTests ROBOTEST_FILTER=PanelFragmentTest

Change-Id: Ic05b939bef3b106845fe90db41eb09f0e15756f4
 2021-05-10 05:27:59 +00:00
YUKAI HUNG
7307e04ef2 Merge "Support old pixel devices to adopt non-clickable chart design" into sc-dev am: 48535ffd29 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456009

Change-Id: I8e2ca4eabdd2ecfb9951156847b31681789dda89
 2021-05-10 04:00:54 +00:00
YUKAI HUNG
48535ffd29 Merge "Support old pixel devices to adopt non-clickable chart design" into sc-dev 2021-05-10 03:44:31 +00:00
TreeHugger Robot
92519a6c95 Merge "Commit changes only when activity is closed" into sc-dev am: 257b3ec584 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14463203

Change-Id: I9a5fa5f3053b726e691af4ce36d4b12b035e7853
 2021-05-10 03:06:19 +00:00