Alex Johnston
bf17a46a8c
Merge "Settings: Disable USB preferences if USB signaling is off" into sc-dev am: 74d2ec5c2d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13901306
Change-Id: Iaa4118459b7c7f93fcdd61941e85854eb187ab70
2021-03-24 10:28:33 +00:00
Alex Johnston
74d2ec5c2d
Merge "Settings: Disable USB preferences if USB signaling is off" into sc-dev
2021-03-24 10:13:47 +00:00
YUKAI HUNG
7709045681
Merge "Export methods from BatteryEntry and controller for battery usage" into sc-dev am: 00222cb467
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13975107
Change-Id: I0fe0acb37031fcdb2a377839737e66aadde5a582
2021-03-24 09:47:53 +00:00
Yi-Ling Chuang
f740fb189d
Merge "Update category names in Display page" into sc-dev am: ee01f3dd5b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13975108
Change-Id: Id4b7697a7bca1d0a2dced4b863945ad62444d140
2021-03-24 09:47:46 +00:00
Weng Su
c604759053
Merge "[Provider Model] Update fix connectivity icon" into sc-dev am: 95744749e5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13975117
Change-Id: I2fc6a147f8d582b96abae866d2f8a363956f18fb
2021-03-24 09:47:30 +00:00
YUKAI HUNG
00222cb467
Merge "Export methods from BatteryEntry and controller for battery usage" into sc-dev
2021-03-24 09:27:32 +00:00
Yi-Ling Chuang
ee01f3dd5b
Merge "Update category names in Display page" into sc-dev
2021-03-24 09:26:22 +00:00
Weng Su
95744749e5
Merge "[Provider Model] Update fix connectivity icon" into sc-dev
2021-03-24 09:22:06 +00:00
Wesley.CW Wang
df25d8ff28
Remove Battery Settings page battery saver tips am: 3da3bf7a21
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13946306
Change-Id: I774ba9f62d981f0da920820f47922eb46fd2b832
2021-03-24 09:10:05 +00:00
Wesley.CW Wang
3da3bf7a21
Remove Battery Settings page battery saver tips
...
- Not present Battery saver tips when it's enabled
- Not redirect Low battery tips to saver tips when saver is enabled
Screenshots:
https://screenshot.googleplex.com/4ehKSRs8gM64wfm.png
https://screenshot.googleplex.com/92pd3q9jnTEXd8o.png
https://screenshot.googleplex.com/BzLYwTjdi3kH4RF.png
https://screenshot.googleplex.com/4w9ubmHaajNxB9b.png
Bug: 183079415
Test: make RunSettingsRoboTests -j40
Change-Id: Ib9783a95df88753342ff217b1a402f2dbb99079d
2021-03-24 08:42:21 +00:00
ykhung
b4b302f936
Export methods from BatteryEntry and controller for battery usage
...
Export a method to fetch BatteryEntry for battery usage new design, and
we have to fetch the label name each time when the new UI is shown to
avoid locale is changed from database records.
Bug: 180607705
Test: make RunSettingsRoboTests
Test: make RunSettingsGoogleRoboTests
Change-Id: Iae8f0b4812beb760b690e622f707fb67388221a2
2021-03-24 07:55:08 +00:00
Weng Su
6800ef3832
[Provider Model] Update fix connectivity icon
...
- Screenshot:
https://screenshot.googleplex.com/8ENoGQxANiAH9uj
Bug: 183576628
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest
Change-Id: I4da1ca8c474e4c2d88c4bc79aceeac6c69f213ad
2021-03-24 14:58:07 +08:00
Zhen Zhang
197631d847
Merge "Update summary based on hibernated apps number" into sc-dev am: 59aa4f9cb1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13955152
Change-Id: I5765dba62f465c71556f47d41c3e4d1ffdb6a8d6
2021-03-24 06:48:40 +00:00
Weng Su
3de97529ca
[automerger skipped] Merge "Hide edit menu if network is uneditable" into rvc-qpr-dev am: 5cb66024fc am: 0b34d62f6b -s ours am: 81a7617077 -s ours
...
am skip reason: skip tag Change-Id I47ea2cf19e178eff48f23e56903d0daa4ef8fa28 with SHA-1 b7dbd3a911 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13945393
Change-Id: Ic5adb6f459eabee8a1b7cba99e644f9743bfe69f
2021-03-24 06:47:01 +00:00
Zhen Zhang
59aa4f9cb1
Merge "Update summary based on hibernated apps number" into sc-dev
2021-03-24 06:42:56 +00:00
Weng Su
81a7617077
[automerger skipped] Merge "Hide edit menu if network is uneditable" into rvc-qpr-dev am: 5cb66024fc am: 0b34d62f6b -s ours
...
am skip reason: skip tag Change-Id I47ea2cf19e178eff48f23e56903d0daa4ef8fa28 with SHA-1 b7dbd3a911 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13945393
Change-Id: I84ab62558f79fbbd263026177ee3adcc6cb90dfc
2021-03-24 06:09:03 +00:00
Jeremy Goldman
11bdc74dbb
Merge "Connect VPN warning help icon with the network & internet page." into sc-dev am: 025301da1f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13975106
Change-Id: Id8771eae0a68c8ad6236cdca9b82d90fcb4eba76
2021-03-24 05:45:28 +00:00
Weng Su
0b34d62f6b
Merge "Hide edit menu if network is uneditable" into rvc-qpr-dev am: 5cb66024fc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13945393
Change-Id: If5fddd3870d6c1bf94cf235439bf3543432824d9
2021-03-24 05:25:04 +00:00
Jeremy Goldman
025301da1f
Merge "Connect VPN warning help icon with the network & internet page." into sc-dev
2021-03-24 05:18:46 +00:00
Weng Su
5cb66024fc
Merge "Hide edit menu if network is uneditable" into rvc-qpr-dev
2021-03-24 04:56:55 +00:00
Bonian Chen
4832bf0faf
Merge "[Settings] Support getSystemService(Class<T>)" into sc-dev am: 8debbfa8a4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13973145
Change-Id: I69b1643a9a389f0bc4849e3d5131c166c30ba00b
2021-03-24 04:45:32 +00:00
Bonian Chen
8debbfa8a4
Merge "[Settings] Support getSystemService(Class<T>)" into sc-dev
2021-03-24 04:13:35 +00:00
tim peng
534b2b36ff
Merge "Get low battery level through metadata" into sc-dev am: 80f803c337
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13960258
Change-Id: I54e52065adaaa985f65c3ecd5b69f4f54ab70173
2021-03-24 04:00:12 +00:00
tim peng
80f803c337
Merge "Get low battery level through metadata" into sc-dev
2021-03-24 03:27:30 +00:00
Yi-Ling Chuang
954bffe965
Update category names in Display page
...
Update Visibility to Appearance and General to Other display controls.
Fixes: 183554415
Test: rebuild and launch Display settings.
Change-Id: I622e78b43230201faebc2c77e9cccb8a425f1e5b
2021-03-24 10:49:27 +08:00
Arc Wang
40b8484582
Merge "Add Strings for Storage Settings" into sc-dev am: e57972c2d5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13970089
Change-Id: Ic3e09219eb4dddfc00da49c8df718925750a72da
2021-03-24 02:35:44 +00:00
Arc Wang
e57972c2d5
Merge "Add Strings for Storage Settings" into sc-dev
2021-03-24 01:44:54 +00:00
Jeremy Goldman
34e8f315e3
Merge "Gear Preference on VPN page includes subtitle if the vpn is an insecure type" into sc-dev am: bd9a65cca6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13960260
Change-Id: I7cb414842a1e51aedcbd6fb2750eaf7beb334239
2021-03-24 01:34:12 +00:00
Jeremy Goldman
023d1bc080
Merge "Warning / Info icon added for the VPN Preference" into sc-dev am: 3bc4e93029
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13960259
Change-Id: Iadbd13e3625061c31973ed9c903e2d2dcb849126
2021-03-24 01:33:58 +00:00
Jeremy Goldman
9e502b6a60
Merge "Legacy VPN Configuration Dialog includes error message if VPN is an insecure type." into sc-dev am: 37a7b7df48
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13960261
Change-Id: I1e3e4ee2755bfaaf50e2e4b23a78bb6bc847fb15
2021-03-24 01:33:12 +00:00
Tim Peng
7e6762de8a
Get low battery level through metadata
...
Bug: 183469297
Test: make -j50 RunSettingsRoboTests ROBOTEST_FILTER=AdvancedBluetoothDetailsHeaderControllerTest
Change-Id: Iae8971a5c1f183fe141d4246e23d8feb6d68d0ff
2021-03-24 09:32:26 +08:00
Jeremy Goldman
76de845f3d
Connect VPN warning help icon with the network & internet page.
...
New VpnInfoPreference created to control the presence or absence
of the warning icon based on the vpn type.
The VpnPreferenceController type casts the preference based on
whether the provider model is enabled. It also detects legacy vpns
by using the LegacyVpnProfileStore, and comparing VPN profile
usernames with the active VPN config's user.
Screenshot: https://screenshot.googleplex.com/AfGrH8wRusTvbf4
Test: atest -c SettingsUnitTests
Bug: Bug: 176821216
Change-Id: I1aa93be5b90b404d9d9cb9bf47ea76fdc9aad401
Merged-In: I1aa93be5b90b404d9d9cb9bf47ea76fdc9aad401
(cherry picked from commit 7a68eb3b5e )
2021-03-24 01:07:28 +00:00
Jeremy Goldman
bd9a65cca6
Merge "Gear Preference on VPN page includes subtitle if the vpn is an insecure type" into sc-dev
2021-03-24 01:01:07 +00:00
Jeremy Goldman
3bc4e93029
Merge "Warning / Info icon added for the VPN Preference" into sc-dev
2021-03-24 01:00:38 +00:00
Jeremy Goldman
37a7b7df48
Merge "Legacy VPN Configuration Dialog includes error message if VPN is an insecure type." into sc-dev
2021-03-24 01:00:17 +00:00
Rajeev Kumar
e9f8a7c812
Merge "Update Managed Device Info text for a financed device" into sc-dev am: cafc769a51
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13957892
Change-Id: Iaa90af0ae9aa338a4c94be432ded24ddb968072a
2021-03-23 21:29:35 +00:00
Rajeev Kumar
88127c8111
Merge "Update Privacy Settings text for a financed device" into sc-dev am: d85317e4e5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13879465
Change-Id: I4b11a3446826546fac84adc538d5831baf385947
2021-03-23 21:29:30 +00:00
Rajeev Kumar
cafc769a51
Merge "Update Managed Device Info text for a financed device" into sc-dev
2021-03-23 20:55:27 +00:00
Rajeev Kumar
d85317e4e5
Merge "Update Privacy Settings text for a financed device" into sc-dev
2021-03-23 20:55:27 +00:00
Zhen Zhang
1f99d6a4b5
Update summary based on hibernated apps number
...
Update the summary of "unused apps" based on how many apps are
hibernated or auto revoked.
Test: HibernatedAppsPreferenceControllerTest
Bug: 181172051
Change-Id: I274eb3c0ada3d063937368232f31e52c20287552
2021-03-23 11:10:43 -07:00
Oli Lan
2ceb0d8231
Merge "Update strings for clipboard access notification setting." into sc-dev am: 8a2e489ac8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13959958
Change-Id: I4b93ab5fd8e31979db0da4b1d8269bf98ba246f5
2021-03-23 18:09:48 +00:00
Oli Lan
8a2e489ac8
Merge "Update strings for clipboard access notification setting." into sc-dev
2021-03-23 17:43:41 +00:00
Dmitri Plotnikov
0d169f2a68
Merge "Change getStatsStartRealtime to getStatsStartTimestamp" into sc-dev am: 5cc7c7c1de
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13955156
Change-Id: I01546ff5478dc1411c1bcae4af8da13b81741ceb
2021-03-23 17:33:15 +00:00
Dmitri Plotnikov
5cc7c7c1de
Merge "Change getStatsStartRealtime to getStatsStartTimestamp" into sc-dev
2021-03-23 17:29:35 +00:00
Bonian Chen
d5ccde31a8
[Settings] Support getSystemService(Class<T>)
...
Add getSystemService(Class<T>) to align the capability with framework
part.
This is a back port from aosp/1639943, aosp/1645152 and aosp/1648047
Bug: 179640862
Test: local
Change-Id: I035db55a71f94000ca35f8d71f03c19208423c73
2021-03-24 00:59:46 +08:00
Salud Lemus
a9a24372fd
Update Managed Device Info text for a financed device
...
Bug: 183448705
Test: Used a test device that is registered via ZT
Test: m RunSettingsRoboTests ROBOTEST_FILTER=EnterprisePrivacyPreferenceControllerTest
Change-Id: Iea2567e7943b122c6c6d2772380f8ddd57066a3f
2021-03-23 16:39:56 +00:00
Salud Lemus
930df91e66
Update Privacy Settings text for a financed device
...
Bug: 182802692
Test: Used a test device that is registered via ZT
Test: m RunSettingsRoboTests ROBOTEST_FILTER=EnterprisePrivacySettingsTest
Test: m RunSettingsRoboTests ROBOTEST_FILTER=PrivacySettingsEnterprisePreferenceTest
Test: m RunSettingsRoboTests ROBOTEST_FILTER=PrivacySettingsFinancedPreferenceTest
Change-Id: Icc131252430cd147e2a06ba2aa260f6ea26734bb
2021-03-23 16:06:01 +00:00
Oli Lan
468278661f
Update strings for clipboard access notification setting.
...
This changes the strings for the clipboard notification
setting in line with UX recommendations.
Bug: 182349993
Test: Build & install, check setting is displayed correctly
Change-Id: Ife2cf4fa6ee98069170ec02a0c3fb7a0880a90b8
2021-03-23 15:30:08 +00:00
TreeHugger Robot
06a84befd5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 21802a4598 -s ours am: 5d8e7a260d -s ours am: d8c9a53931 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13955150
Change-Id: Iaba3b51211c7ae51a093b4bce8d6b36090307b28
2021-03-23 14:34:43 +00:00
Bill Yi
b9020bc424
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 01da19f6a4 -s ours am: 0369e03b49 -s ours am: 55367c223a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13955147
Change-Id: I5bed31d86beb49b373d893f083ecba5421d058fa
2021-03-23 14:34:07 +00:00