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
e19d238d18
Merge "Fix AdvancedPowerUsageDetailTest test error" into sc-dev
2021-05-10 17:01:28 +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
Wesley.CW Wang
25498983b2
Fix AdvancedPowerUsageDetailTest test error
...
Bug: 187693428
Test: make SettingsRoboTests
Change-Id: I3c3976b93a5dfb242af09bcfbf700a1caddd350b
2021-05-10 13:02:18 +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
Syaoran Kuo
8365ecf321
Merge "Add more log for debugging resource id issue." into sc-dev am: e37d12e5c4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456004
Change-Id: I8a7ca6ae3089e820c84dc0c7f75ba319a5953f2a
2021-05-10 07:34:01 +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
Syaoran Kuo
e37d12e5c4
Merge "Add more log for debugging resource id issue." into sc-dev
2021-05-10 07:17:28 +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
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
ykhung
4828bf4e48
Build a bridge to control whether the graph is clickable or not am: d8d5335096
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456008
Change-Id: I1292bfc3688035c1a7f582049fe285beccad3c97
2021-05-09 05:11:25 +00:00
ykhung
d8d5335096
Build a bridge to control whether the graph is clickable or not
...
Create a bridge to read phenotype flag from GoogleSettings to control
whether each time slot in the graph is clickable or not.
Bug: 185308803
Test: make SettingsRoboTests
Change-Id: If8b58dcaa50ad5fb6b447ca5b7146639ee31a9df
2021-05-09 04:46:41 +00:00
ykhung
ea562f84b6
Fix UI flashes issue when entering to the app in the cold start am: 5b27fd923a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456007
Change-Id: Id4d9678378f1d1aae64ea8ca9e64ab3458b2b680
2021-05-09 04:27:18 +00:00
ykhung
5b27fd923a
Fix UI flashes issue when entering to the app in the cold start
...
1. fix the chart % info will flash issue by deferring the showing time
until the chart content is ready to show (set default as invisible)
2. fix the category title will flash issue by set the default value as
empty to avoid refresh the title twice in the start time
Bug: 177406865
Test: make SettingsRoboTests
Change-Id: If8f247cf5b01c529bc5e4d18fcf409ba296cc2f4
2021-05-09 01:56:09 +00:00
Yu-Han Yang
f793822db8
Merge "Revert "Remove dynamic location settings footer"" into sc-dev am: f730edaaac
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14443640
Change-Id: Icc34de95d3db29d33e2aaeaa6827cff2c0fdf718
2021-05-08 16:15:26 +00:00
Yu-Han Yang
f730edaaac
Merge "Revert "Remove dynamic location settings footer"" into sc-dev
2021-05-08 15:58:10 +00:00
Curtis Belmonte
0117e8a80f
Merge "Revert "Turn on the transition flag"" into sc-dev am: 5ece4babd3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14471733
Change-Id: Iba9854a104ba9b427868d3d66731fc3e76383664
2021-05-08 07:47:12 +00:00
Curtis Belmonte
5ece4babd3
Merge "Revert "Turn on the transition flag"" into sc-dev
2021-05-08 07:38:45 +00:00
TreeHugger Robot
017d6997ed
Merge "Controls/Wallet privacy settings" into sc-dev am: 67fd37c837
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14470513
Change-Id: I4e0cc31f000e11a247e6d6aef90a7c19b45b89be
2021-05-08 03:05:38 +00:00
TreeHugger Robot
67fd37c837
Merge "Controls/Wallet privacy settings" into sc-dev
2021-05-08 02:46:54 +00:00
Curtis Belmonte
1e1b259445
Revert "Turn on the transition flag"
...
This reverts commit 1be773da62
.
Reason for revert: b/187517936
Fixes: 187517936
Change-Id: I57d0a7a16bdb76e105b0febd43bdf81521e69e3a
2021-05-07 22:43:05 +00:00
Julia Reynolds
540ad99d88
Fix work profile setting appearing too often
...
That is, when the user didn't have work profile
Test: robotests, manual
Fixes: 187520760
Change-Id: I9394359a6bc278d58ef13b30f8ce99cbaa595c25
2021-05-07 15:02:54 -04:00
Matt Pietal
a13e30c11a
Controls/Wallet privacy settings
...
Addressing feedback from ag/14353975
Fixes: 185597511
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.display
Change-Id: I4de5b7f94d4be44820b1fa463d97f4f098f64bff
2021-05-07 14:54:54 -04:00
Julia Reynolds
2fe3273f3a
Handle NLS metadata when provided as strings
...
Test: atest
Bug: 181175697
Change-Id: I40d935ffb7c1fb9f978160d28297da84412501fb
2021-05-07 18:37:10 +00:00
Alex Stetson
b693c7949e
Merge "Use shared model for non-system overlay toggle" into sc-dev am: 413893244d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441754
Change-Id: I88f9322ad1b7d886bfbf597070232d6bf6002174
2021-05-07 14:13:07 +00:00
Alex Stetson
413893244d
Merge "Use shared model for non-system overlay toggle" into sc-dev
2021-05-07 14:08:52 +00:00
Syaoran Kuo
87cc2e19e5
Add more log for debugging resource id issue.
...
Bug: 187485845
Test: atest SettingsComponentTests
Change-Id: I6268809eca172b0b4aa9f1a252e0d519ad758083
2021-05-07 18:49:26 +08:00
TreeHugger Robot
e5ba5c68e1
Merge "Refine the interpolation rule and clip the usage time data" into sc-dev am: 180051cf05
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14455999
Change-Id: Ie643498fd6df7d1a4bb6e96335ca98fe5bdd8387
2021-05-07 09:51:27 +00:00
TreeHugger Robot
180051cf05
Merge "Refine the interpolation rule and clip the usage time data" into sc-dev
2021-05-07 09:35:35 +00:00
TreeHugger Robot
4af703e2ae
Merge "Turn on the transition flag" into sc-dev am: ac1b7661ad
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456000
Change-Id: Id40d542dcb170670037ef5dfbddadbda6d0f64ee
2021-05-07 09:14:36 +00:00
Yanting Yang
eecd27406c
Merge "Add summary back to the homepage" into sc-dev am: c37abc9edb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14442216
Change-Id: Ida5e3fec18839e4ba2ce266aa5b4d2424b65ef3a
2021-05-07 09:14:08 +00:00
TreeHugger Robot
ac1b7661ad
Merge "Turn on the transition flag" into sc-dev
2021-05-07 09:01:00 +00:00
Yanting Yang
c37abc9edb
Merge "Add summary back to the homepage" into sc-dev
2021-05-07 09:00:32 +00:00
ykhung
4280a7f897
Refine the interpolation rule and clip the usage time data
...
Bug: 184807417
Test: make SettingsRoboTests
Change-Id: I6c115beed34abd393e5c615cc59d3c4c323dfa0b
2021-05-07 16:36:56 +08:00
Syaoran Kuo
dcffe72b50
Merge "Remove wifi related test." into sc-dev am: 7dd05a8c05
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441410
Change-Id: I884c941b0da10127ec9e05cd91d3134ad5f93b57
2021-05-07 08:28:37 +00:00
Syaoran Kuo
7dd05a8c05
Merge "Remove wifi related test." into sc-dev
2021-05-07 07:54:25 +00:00
Syaoran Kuo
bc1e5321ab
Remove wifi related test.
...
To add these case back, add a success case to avoid empty test error.
Bug: 186372528
Test: atest SettingsComponentTest
Change-Id: I6d973a244338f67e3d35e9657d1d46eba8ba4501
2021-05-07 13:44:08 +08:00
Yi-Ling Chuang
1be773da62
Turn on the transition flag
...
Test: robotests
Bug: 186701900
Change-Id: I09c821e17fca88ee532f6535031a52c4c832a1e8
2021-05-07 13:21:42 +08:00
TreeHugger Robot
e1c74cc330
Merge "Wallet/controls - Migrate existing settings" into sc-dev am: db624992ed
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14353975
Change-Id: Iaf6750c802f825b48b40e0f539f578969a9213fd
2021-05-07 05:11:19 +00:00
TreeHugger Robot
db624992ed
Merge "Wallet/controls - Migrate existing settings" into sc-dev
2021-05-07 05:05:34 +00:00
TreeHugger Robot
139745d11b
Merge "Adopt new battery history map with interpolation method" into sc-dev am: b7ffc45052
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441406
Change-Id: I32b338b48aceb00536b208421ac17a802e81adbf
2021-05-07 03:10:10 +00:00
TreeHugger Robot
b7ffc45052
Merge "Adopt new battery history map with interpolation method" into sc-dev
2021-05-07 02:09:43 +00:00