Commit Graph

82759 Commits

Author SHA1 Message Date
Wesley Wang
cdf99ec2da Merge "Fix AdvancedPowerUsageDetailTest test error" into sc-dev am: e19d238d18
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14486918

Change-Id: I7567c92a1ecef0e8381ea38805df4e3ca92558ec
2021-05-10 17:17:52 +00: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
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
ykhung
4645fef6ca Add searchable keywords for new usage and adaptive preferences screen
Bug: 185432878
Bug: 185433678
Bug: 185855057
Test: make SettingsRoboTests
Change-Id: Ibca47e7732f72cba03fbfae10075ac83f1938b43
2021-05-10 15:40:14 +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
74630178be Update battery status good icon color am: 021e6b131f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456012

Change-Id: I618bd223f7dfa3711969d44f5b3f7413d162f902
2021-05-10 13:16:43 +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
Wesley.CW Wang
021e6b131f Update battery status good icon color
screenshot: https://screenshot.googleplex.com/6eqfv3xBWp52gjg.png

Bug: 187608939
Test: make SettingsRoboTests
Change-Id: Ib4ac236ae77f624152e00e167e8035dab428b994
2021-05-10 10:25:36 +00:00
Tsung-Mao Fang
55ab3f91e5 Fix color contrast problem for VPN page
Test: A11y scanner doesn't show text contrast problem
Fix: 187399519
Fix: 181185518
Change-Id: I830a8b16d817bbdf2c68332e38fad0a15b87ce45
2021-05-10 09:54: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
Ryan Lin
0201ec9a70 Merge "Fix Punctuation inconsistency in the Magnification shortcut pop up" into sc-dev am: 4523f9200f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456010

Change-Id: I808b2fdb6970e6ce810b0dd5e0f28241f239df14
2021-05-10 07:34:14 +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
Ryan Lin
4523f9200f Merge "Fix Punctuation inconsistency in the Magnification shortcut pop up" into sc-dev 2021-05-10 07:27:46 +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
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
Bill Yi
a890e138d7 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-05-10 06:13:23 +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
ryanlwlin
95616af6fa Fix Punctuation inconsistency in the Magnification shortcut pop up
The incorrect punctuation affects localization.

Bug: 187216931
Test: build pass
Change-Id: I2f2b66674946a6e5848a1879a24cb5aaddbfdc82
2021-05-10 13:52:19 +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
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
TreeHugger Robot
257b3ec584 Merge "Commit changes only when activity is closed" into sc-dev 2021-05-10 02:49:31 +00:00
TreeHugger Robot
1a75cfbee4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 5c29b05ab3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I534b1e08598c2501cbd02021ee7bdf65dba59b6b
2021-05-09 21:23:16 +00:00
TreeHugger Robot
38e59396a2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: e1aa1f04c0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia30ce034238fa3030da5b72acb379f2dda550b68
2021-05-09 21:22:44 +00:00
TreeHugger Robot
5c29b05ab3 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-05-09 20:38:26 +00:00
TreeHugger Robot
e1aa1f04c0 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-05-09 20:35:21 +00:00
ykhung
28896636b0 Support old pixel devices to adopt non-clickable chart design
For clickable devices:
https://screenshot.googleplex.com/ktBfjhhHQVYfTmF
https://screenshot.googleplex.com/BYutnpu9Dys2sa6
For non-clickable devices:
https://screenshot.googleplex.com/64NaKhRDrhfBqBQ

Bug: 185308803
Test: make SettingsRoboTests
Change-Id: I5bc0bb31946ccb20007ea31d90c05673a200e072
2021-05-09 16:30:11 +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
Bill Yi
ad89ad031d Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ia6b625e3577e40db1357ae8e8fa3f7ff41ae6081
2021-05-08 20:19:39 -07:00
Bill Yi
986ed14f0d Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I4d56d3d2836d7fa9f87f454c5c4a7e26a667871b
2021-05-08 20:14:55 -07:00
Bill Yi
3c692fcca9 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ib5d8a690731678d03128d9df5cde738ea4e25f2e
2021-05-08 20:10:20 -07:00
Bill Yi
41d6585836 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ia7c30e626c0b71cad3a68024adb81f7d9f3652c3
2021-05-08 20:08:23 -07: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
Treehugger Robot
b887ac0acf [automerger skipped] Merge "DO NOT MERGE - Merge RQ2A.210505.003." am: 7e8f5aca00 am: 8c84477a04 -s ours am: d13156d85a -s ours am: e704cef070 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I87e9dbe67ea9cd86f1be44343679086a71190b2b
2021-05-08 23:22:10 +00:00
Xin Li
9239e60fb8 [automerger skipped] DO NOT MERGE - Merge RQ2A.210505.003. am: bb6f5b264f am: c41debcf7f -s ours am: 06e9e8b3a9 -s ours am: ff21be103b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0159e5ea1a76a670b67041608bcd8d90c7dbcee8
2021-05-08 23:22:06 +00:00
Treehugger Robot
e704cef070 [automerger skipped] Merge "DO NOT MERGE - Merge RQ2A.210505.003." am: 7e8f5aca00 am: 8c84477a04 -s ours am: d13156d85a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie66323fe2c9c5903b5da7bb152b854ec09a9be08
2021-05-08 23:07:35 +00:00
Xin Li
ff21be103b [automerger skipped] DO NOT MERGE - Merge RQ2A.210505.003. am: bb6f5b264f am: c41debcf7f -s ours am: 06e9e8b3a9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib023e63046bc2fc541d2a8754a544e4f17aad2a1
2021-05-08 23:07:26 +00:00