Commit Graph

81664 Commits

Author SHA1 Message Date
Bill Yi
8a06b12b05 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 926d7148f5 -s ours am: 17635a6d9c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I65e3cfe16a0b79de3cdfc99bf716b6d3d21223cb
2021-04-19 22:56:35 +00:00
Bill Yi
17635a6d9c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 926d7148f5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I65e1498d9d8f8b3dbc827a15be74950f4b7a536c
2021-04-19 22:33:59 +00:00
TreeHugger Robot
617960adc5 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-19 22:17:06 +00:00
Kevin Chyn
9df1b3d2f6 Actually use new string in fingerprint settings am: 83b061d3da
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14238002

Change-Id: Icb8da213baf3584fbaa5f99b65903f3a1eae1652
2021-04-19 22:01:25 +00:00
Bill Yi
403e4244c0 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I3ec46a3938ac5230e56e2a75ffe53500db2e3e39
2021-04-19 21:03:08 +00:00
Bill Yi
926d7148f5 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ifb9078b852b716a55695c56d410c135760c90e8e
2021-04-19 20:49:31 +00:00
Kevin Chyn
83b061d3da Actually use new string in fingerprint settings
Fixes: 185805485
Test: Manually inspect
Change-Id: I9a92d4198e3482d7f08d033f8d1242a28a39ef4a
2021-04-19 13:05:35 -07:00
ykhung
b53ed32ed5 Refine startBatteryDetailPage method to support history data am: 4752ea17b9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14231927

Change-Id: I3a64bc66cd48af0b57e4b6e2752cefb08c72969f
2021-04-19 16:01:47 +00:00
ykhung
4752ea17b9 Refine startBatteryDetailPage method to support history data
Bug: 177406865
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: Iee3b6b353c4f92bdad37fac55adad58b4f205bf6
2021-04-19 14:06:55 +00:00
TreeHugger Robot
6c7f674549 Merge "Tweak the layout of top app bar" into sc-dev am: d2bffb94a7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14199746

Change-Id: Icf2d0f159ea7bf85521f78e358644809e1d75fde
2021-04-19 11:27:18 +00:00
TreeHugger Robot
d2bffb94a7 Merge "Tweak the layout of top app bar" into sc-dev 2021-04-19 11:02:28 +00:00
Wesley Wang
9fbb8e16d0 Merge changes Iced0fa59,Ic354ac91,I0b4cb6ca,I9c1d3761 into sc-dev am: e3cf049039
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14209651

Change-Id: I742dc967380c74f7c09b3346077217a9f9c49212
2021-04-19 10:32:00 +00:00
Wesley Wang
e3cf049039 Merge changes Iced0fa59,Ic354ac91,I0b4cb6ca,I9c1d3761 into sc-dev
* changes:
  Add footer to app usage page
  Update app usage page with 3 radio button control
  Add 3 controller for app usage page radio buttons
  Add utils class for app usage operation
2021-04-19 10:15:49 +00:00
Mill Chen
feae056067 Tweak the layout of top app bar
- Update the color of content scrim
- Dynamically change the height of collapsing toolbar according to the
  line count of title
- Fix the jank problem of collapsing toolbar

Fixes: 184615642
Fixes: 185003521
Fixes: 182770567
Fixes: 184209747
Test: visual verified
Change-Id: I78c517eb9bec0b85997085970007481d1a4ef7d3
2021-04-19 17:29:18 +08:00
Kholoud Mohamed
e4171ae2e1 Merge "Enable ignored test" into sc-dev am: 5fb1b61253
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14199608

Change-Id: Ia34822407f9711be22d9ec62de7154c8a65977d3
2021-04-19 08:56:42 +00:00
Kholoud Mohamed
5fb1b61253 Merge "Enable ignored test" into sc-dev 2021-04-19 08:34:47 +00:00
Wesley.CW Wang
8ca6f31716 Add footer to app usage page
- Add a footer to present the description text, will present specific text once this app is optimized or unrestricted only
 Screenshots:
   https://screenshot.googleplex.com/4HZGQU6SDni3PdR.png
   https://screenshot.googleplex.com/9gLSgftmaYuZepf.png
   https://screenshot.googleplex.com/55masP3VoAtAFMo.png

Bug: 178197718
Test: make SettingsRoboTests
Change-Id: Iced0fa591faf72874e2e3dff942122c90d35a4e7
2021-04-19 08:14:54 +00:00
Wesley.CW Wang
5083d82df7 Update app usage page with 3 radio button control
- Improve the UX from 2 different preference column to 3 radio button,
 make the restriction state more easy to control and recognize
 Screenshot: https://screenshot.googleplex.com/4nCBnF5FzwePqrL.png

Bug: 178197718
Test: make SettingsRoboTests
Change-Id: Ic354ac91e5496c0e44c5b44142627ac8a090e30f
2021-04-19 08:14:41 +00:00
Wesley.CW Wang
3db43de758 Add 3 controller for app usage page radio buttons
Bug: 178197718
Test: make SettingsRoboTests
Change-Id: I0b4cb6ca2db3c5f6dafd89484c91ca3f7fb1a1ae
2021-04-19 08:14:21 +00:00
Wesley.CW Wang
f2321ad5e1 Add utils class for app usage operation
- An util class to control usage state

Bug: 178197718
Test: make SettingsRoboTests
Change-Id: I9c1d37610a2e52d484228ef8e5c7af49e12f82aa
2021-04-19 16:13:00 +08:00
TreeHugger Robot
dd44ac2630 Merge "Apply the correct style to Battery and Storage page" into sc-dev am: d0ca25a062
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14199748

Change-Id: I712923c5e6374d1f274399a1d2bc2695c87553ba
2021-04-19 08:06:47 +00:00
TreeHugger Robot
d0ca25a062 Merge "Apply the correct style to Battery and Storage page" into sc-dev 2021-04-19 08:02:14 +00:00
TreeHugger Robot
eeb6301479 Merge "Update storage usage progress bar summary text" into sc-dev am: 8b58ae9d4f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14230402

Change-Id: I4e28ec560435932c4eaeb2e76eee6d56e95d093a
2021-04-19 07:56:26 +00:00
TreeHugger Robot
8b58ae9d4f Merge "Update storage usage progress bar summary text" into sc-dev 2021-04-19 07:41:24 +00:00
YUKAI HUNG
2c7e6c57bd Merge "Add app usage preferencee item into the history preference" into sc-dev am: 36e9a5ffd2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14230387

Change-Id: I02b9113d4352140a9171640835fc6ad1d6096d6c
2021-04-19 07:20:11 +00:00
YUKAI HUNG
36e9a5ffd2 Merge "Add app usage preferencee item into the history preference" into sc-dev 2021-04-19 06:52:40 +00:00
Jeremy Goldman
7e4418aae4 Merge "Check if the SubscriptionsChangeListener has been started before stop" into sc-dev am: aeaad6bd2e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14187776

Change-Id: I34801ac5ae9774e47b529054d6e16167051c67ce
2021-04-19 06:43:11 +00:00
Jeremy Goldman
aeaad6bd2e Merge "Check if the SubscriptionsChangeListener has been started before stop" into sc-dev 2021-04-19 06:21:59 +00:00
Jeremy Goldman
734f79ae4d Merge "If the proider model is enabled, the User cannot create insecure VPNs" into sc-dev am: 770ad5cbd7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14185086

Change-Id: Ib29147f7171f108b21f93b4e15e72e841b557e3f
2021-04-19 04:55:55 +00:00
ykhung
bcf0a411a1 Add app usage preferencee item into the history preference
Bug: 177406865
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: I7d9a14eca0b8d3b054e040cb13135ef15390e512
2021-04-19 04:45:11 +00:00
Jeremy Goldman
770ad5cbd7 Merge "If the proider model is enabled, the User cannot create insecure VPNs" into sc-dev 2021-04-19 04:38:51 +00:00
Arc Wang
2e04e81da8 Update storage usage progress bar summary text
Shows a simplified version, e.g., 24GB used / 64 GB total

Bug: 174964885
Test: manual visual
Change-Id: Ia7a12d0cf7444ebb172ef2c23209196e01eadac0
2021-04-19 12:08:16 +08:00
Arc Wang
f240e1fb0e Merge "Update storage usage progress bar summary text" into sc-dev am: 1073196af9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14209650

Change-Id: Ib3f2b5a1a067d7584bfda5bb3297f5d6993e9847
2021-04-19 02:33:19 +00:00
Arc Wang
1073196af9 Merge "Update storage usage progress bar summary text" into sc-dev 2021-04-19 02:13:08 +00:00
ykhung
b3c7bb02c4 Merge original AOSP chart into battery usage with runtime switchable am: 33115020ba
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14215688

Change-Id: I2f8b577b5ace58923ae1acbb697cb1b51b0c874c
2021-04-18 16:22:04 +00:00
ykhung
33115020ba Merge original AOSP chart into battery usage with runtime switchable
This patch is merged from ag/14111128 and seperate two different chart
design between isChratGraphEnabled() method, but we drop the options
menu in the both versions to align the new material next design.

Bug: 185187718
Bug: 185187591
Bug: 177406865
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: Ie88df6a94abf5d1652440fe35392b9f47c447537
2021-04-18 15:59:43 +00:00
TreeHugger Robot
f7c618d07e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 8897a11364 -s ours am: 434ce05cec -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib09647da177dad608e303119f3755f500f8d47f3
2021-04-18 08:11:00 +00:00
Bill Yi
20009240f6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 80d8ebe526 -s ours am: 7ff7c19246 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0c9d1c9acc18e37e8caec30985ef342bc20684fe
2021-04-18 08:09:52 +00:00
TreeHugger Robot
434ce05cec [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 8897a11364 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I52b038ea30198769b82df04ae51aded1ae6ed517
2021-04-18 07:48:38 +00:00
Bill Yi
7ff7c19246 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 80d8ebe526 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib3c3796c150c77d62454af214e1fd045050a7aa3
2021-04-18 07:48:06 +00:00
TreeHugger Robot
b8c070dcf0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 2bb7ce44a3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1649bcd281414f08ea5a4d571d8a70d962756b81
2021-04-18 07:33:41 +00:00
TreeHugger Robot
2bb7ce44a3 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-04-18 07:08:12 +00:00
TreeHugger Robot
8897a11364 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-04-18 07:04:08 +00:00
TreeHugger Robot
dccd23d322 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-18 06:40:03 +00:00
TreeHugger Robot
1dd2f73193 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-18 05:59:03 +00:00
Bill Yi
44ba9d6bd8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5fbdf88b7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7dafad5cc4682698ce8b591bca4a86944c605eab
2021-04-18 05:26:42 +00:00
Bill Yi
80d8ebe526 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ia65a97a90af59964e451be02327a618179b38af0
2021-04-17 21:48:45 -07:00
Bill Yi
c784589af7 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I4a5f8ef8d69bf4bcb11c690de734387a3244b438
2021-04-17 21:45:23 -07:00
Bill Yi
a921c816e4 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Id31d24e76bc910c50208ea822e37a62d18506fff
2021-04-17 21:13:35 -07:00
Bill Yi
f5fbdf88b7 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Id5d4c07b2fdf6ea906b5aa656be048d883e8f774
2021-04-17 21:10:24 -07:00