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
7d8393fb1b
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: Ib078ae18c6e1e3f347f3328c9f8d5ec29c6602f0
2021-04-19 16:00:54 +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
9df3dae929
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: I95856b157ce265eb0f63f45a51505dbb4bdf8e54
2021-04-19 11:27:53 +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
2edb4d3a2a
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: I9a02694133598cbdaae22ff0fc7c3470fd333e6f
2021-04-19 10:31:45 +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
4f6399aedb
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: I98773343a89d955358eb0bb36c59e30b3e6110a5
2021-04-19 08:56:42 +00:00
Tsung-Mao Fang
d9a434671b
Only show single line title on list preference
...
Test: Built apk and see the single line title.
Fix: 185324275
Change-Id: I2bc3767fcae6e9efd689c1638e5d105676454a25
2021-04-19 16:51:11 +08:00
Jeremy Goldman
5be88d11de
Remove the "+" button on the help menu if no secure vpns can be created
...
If the provider model is turned on, all new VPNs must have the secure
type. However, there is a system property which is necessary in order to
create secure VPNs. So if the FEATURE_IPSEC_TUNNELS is missing from the
device then we should not enable new 1st party VPNs.
Note, it has been confirmed with the VPN team that we don't expect any
devices released on S to actually be missing this property, but it's
still good to check just in case.
Bug: 176821216
Test: atest -c SettingsUnitTest
Change-Id: I712d342e1970243520612196ba57227b1ff05bbf
2021-04-19 16:47:46 +08: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
6465a14c53
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: I44cd81513106affcb0b3cd3a1d31eb9536d71247
2021-04-19 08:07:19 +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
0c60813631
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: I60c60a9b0aa6db475c0cfcd96c68683da0e7db8a
2021-04-19 07:56:47 +00:00
TreeHugger Robot
8b58ae9d4f
Merge "Update storage usage progress bar summary text" into sc-dev
2021-04-19 07:41:24 +00:00
Tiffany Nguyen
7dc7116635
Update BatterySettingsFeatureProvider to an activity-friendly interface.
...
Test: no implementation
Bug: 181827718
Change-Id: I75959de1e1f347641ca288a30559d83cb8f1e5ad
2021-04-19 07:23:32 +00:00
YUKAI HUNG
162a49152e
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: I47d92353e8dc235482c9cfa8b1fb03547ab41427
2021-04-19 07:20:10 +00:00
Chloris Kuo
d37f0faf0d
NAS settings change
...
Handle migration for multi-profiles
Test: make RunSettingsRoboTests
Bug: 185623118
Change-Id: I392b420b849a329e3e24d8e8dcf0b84a63d37799
2021-04-19 00:14:49 -07: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
de7a91397b
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: I20369a379ec2636efefd37d6d207ec36754d77cd
2021-04-19 06:43:31 +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
8bc78dd9d0
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: Id3190625cc98e590f8503cb4b791743999b46ba5
2021-04-19 04:56:17 +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
81702facc4
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: I19ddbd1352e666e0145586e50ca4e497e128d7d3
2021-04-19 02:33:23 +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
60c731f31e
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: Id0c518bf69ae4d29bef064e4ecb283a1b54f25f6
2021-04-18 16:22:36 +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
a6a8d24dba
[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: I36463dd54ab2aff33e05844ab8cff1c414cec824
2021-04-18 08:10:41 +00:00
Bill Yi
456335ba3e
[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: Ie7bf0379ae005af79fc61c69aa2adb18c6b6b387
2021-04-18 08:09: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
99df2fd925
[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: I57ccc95b6513a62cb8813556554b66c3568810af
2021-04-18 07:33:53 +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
d22c1dcad2
[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: I57a7d462f468582d08cc78f51675fb215b8dfaad
2021-04-18 05:27:12 +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
096c46fb52
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: I4283426feacc0f2a59ecc4e907627bcaf6bacb93
2021-04-17 17:16:48 +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
7c7b54216b
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: I98e2d5cf41442d26433b82a4aa808396479c0339
2021-04-17 11:56:32 +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