Commit Graph

80843 Commits

Author SHA1 Message Date
Wesley Wang
7872258e40 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: I0956332580b02f633d195fafaddbb5bd03d55e67
2021-04-19 10:34: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
Kholoud Mohamed
9afa74f0c2 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: Iec61f63baf7a7a26167613c1558ee29b7be23809
2021-04-19 08:58:29 +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
9e5e620d49 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: If7bf886ff1d95963f913676da05a7884dc141b0b
2021-04-19 08:09:26 +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
b14f9c7406 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: Icbf502a9036dee95d1771cb7ab8d786c57d6b24a
2021-04-19 07:58:28 +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
102b467cdc 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: Ief708e931485309787ba6e6267b1de1335de52a6
2021-04-19 06:55:25 +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
e0ff5a1f19 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: I859d4ef83947befd77ad50ea0a1e10e02efdab16
2021-04-19 06:44:55 +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
e1ceba0214 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: I265ddc4bc1d36af6c1e1e58341749dd3bb0e2f72
2021-04-19 04:58:00 +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
40f831d7b6 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: I1d78d90cd266b3cd833754988ebb22d07a1dc98d
2021-04-19 02:35:15 +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
e5a8930570 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: I57ad73c36f6b247aa6048044251043f79dd92582
2021-04-18 16:24:09 +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
faa781f1de [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: Iee11e5232188ff301c5190e4d9666168d6904445
2021-04-18 08:12:58 +00:00
Bill Yi
efdfb9a6ca [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: I7f7115b8660ca9e38f9daeeb6c2a3c5a0c4ee8d0
2021-04-18 08:11:59 +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
6ea54ebff3 [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: I93e1a67b9c4d30a022268bf8caee4b5d4c1c46e2
2021-04-18 07:35:24 +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
Bill Yi
35aef5e547 [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: I31e84bec43a518ded94161ccb02826a5031a1b86
2021-04-18 05:29:08 +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
ykhung
fc6514a90d Support badged icon for work profile mode and add system checking am: 5aa3c23535
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14215687

Change-Id: I1589c7c5484ee7e230d3f140eb3b6480ae5c98f1
2021-04-17 17:18:40 +00:00
ykhung
5aa3c23535 Support badged icon for work profile mode and add system checking
Bug: 184807417
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: Iebe458b364ab02eaf595bfc3b1a455e5be7d3d9d
2021-04-17 13:29:07 +00:00
ykhung
53c793ca19 Purge low percentage BatteryDiffEntry from indexed usage map am: 3cdf60c016
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14209652

Change-Id: Ic774a8597d1953d87f67e38dd4680624c9b7a2d0
2021-04-17 11:58:17 +00:00
ykhung
3cdf60c016 Purge low percentage BatteryDiffEntry from indexed usage map
Bug: 184807417
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: I943e224147ccbfa80578511d6cb0d6adf6f8da0f
2021-04-17 10:22:11 +00:00
Arc Wang
7a43ffde90 Update storage usage progress bar summary text
Shows a simplified version, e.g., 24GB / 32% used of 64 GB

Bug: 174964885
Test: manual visual
Change-Id: I39cdc5efa1d562c339525fa23456c71b726b9e1a
2021-04-16 21:46:19 +08:00
TreeHugger Robot
9eda16552d Merge "Fix color checking error of the repohooks" into sc-dev am: 976c6ac56d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14209645

Change-Id: Idafd69cecb2422b48e2c2ed49756ba192543d3a4
2021-04-16 09:16:37 +00:00
Syaoran Kuo
16b65a1800 Merge "Adds new test for notification." into sc-dev am: f608d1e7b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14124306

Change-Id: Ib4e620c323b3a4a388ab8c181dba08327ae53a1e
2021-04-16 09:16:18 +00:00
YUKAI HUNG
f4a069053b Merge "Refine logic and add simple test for BatteryChartPreferenceController" into sc-dev am: edfa085b2f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14199745

Change-Id: I62e38149e6d7266df28d4a610e263a4954b7d77e
2021-04-16 09:15:43 +00:00
TreeHugger Robot
976c6ac56d Merge "Fix color checking error of the repohooks" into sc-dev 2021-04-16 09:00:15 +00:00
Syaoran Kuo
f608d1e7b6 Merge "Adds new test for notification." into sc-dev 2021-04-16 08:58:01 +00:00
YUKAI HUNG
edfa085b2f Merge "Refine logic and add simple test for BatteryChartPreferenceController" into sc-dev 2021-04-16 08:54:59 +00:00
TreeHugger Robot
b8cb2b291d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 20e30c3033 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2b0c3d1cac8c89686c29361eadcc67badcb0ac2e
2021-04-16 07:30:33 +00:00
TreeHugger Robot
20e30c3033 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-04-16 07:25:13 +00:00
TreeHugger Robot
9c336b143f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: d2e2ea27fb -s ours
am skip reason: subject contains skip directive

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

Change-Id: I347cbcc770fdbf1a067db9c378d1d7e85593ad73
2021-04-16 07:08:38 +00:00