Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
80,753 Commits 1 Branch 0 Tags
90bb37b6aa9597f2a3773872f68a0501ead857c7
Commit Graph

36059 Commits

Author SHA1 Message Date
Bonian Chen
90bb37b6aa 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: Iccfaf2ad15c5915d998ec291fcddd815bae6047e
 2021-03-24 04:44:09 +00:00
Bonian Chen
8debbfa8a4 Merge "[Settings] Support getSystemService(Class<T>)" into sc-dev 2021-03-24 04:13:35 +00:00
tim peng
f5c366f794 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: I32f856ccd190fe6fae5f7b0e857239f1471cc469
 2021-03-24 04:02:00 +00:00
tim peng
80f803c337 Merge "Get low battery level through metadata" into sc-dev 2021-03-24 03:27:30 +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
Rajeev Kumar
a833cfa34e 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: I9ff9f83a3c8994ac031447dba474a47b01137a8e
 2021-03-24 01:24:19 +00:00
Rajeev Kumar
ef0f32b796 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: I4c4c00f7709c86669824cc18667c39c825f93726
 2021-03-24 01:24:16 +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
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
Dmitri Plotnikov
f2c66754b9 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: I16b44fc5aea9bd66d28a96ec05f9d4e88d37f103
 2021-03-24 00:59:44 +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
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
Janis Danisevskis
ae536e8132 Merge "Keystore 2.0: Remove references to Keystore 1.0" am: 7aa99fe966 am: c90b511239 am: a308ea1915 am: 48e5f318db 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1624590

Change-Id: I5d2b5c02573fdbebff2e8269432be4f1e07b8430
 2021-03-23 14:34:05 +00:00
Bonian Chen
edba1525af Merge "[Settings] Support getSystemService(Class<T>)" am: 513da92357 am: 5734490d23 am: 8cd695efea am: 6a4d7b65d0 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1639943

Change-Id: I258f0eabc6f9ac714940e66aaf3d316386635000
 2021-03-23 14:29:44 +00:00
Janis Danisevskis
48e5f318db Merge "Keystore 2.0: Remove references to Keystore 1.0" am: 7aa99fe966 am: c90b511239 am: a308ea1915 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1624590

Change-Id: I49cad17eab31b7531cb710915cbc57accd894598
 2021-03-23 14:10:20 +00:00
Bonian Chen
6a4d7b65d0 Merge "[Settings] Support getSystemService(Class<T>)" am: 513da92357 am: 5734490d23 am: 8cd695efea 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1639943

Change-Id: I905f9d1646a9d9ea70e42c4b5368ff983611bee3
 2021-03-23 13:52:46 +00:00
Wesley.CW Wang
201445f80a Remove Battery Settings page default tips am: 3a52e335be 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13922078

Change-Id: I78509dc0c432c3b0f122560aa1718feb89535d3b
 2021-03-23 09:05:19 +00:00
Wesley.CW Wang
3a52e335be Remove Battery Settings page default tips 
- Remove SummaryTips from default tips
 - Clean up test file import
 Screenshot: https://screenshot.googleplex.com/6rYrnMvoTbeCS7m.png

Bug: 183079415
Test: make RunSettingsRoboTests -j40
Change-Id: I1001d75235a6d8d5947b974939884103eb0834da
 2021-03-23 08:44:42 +00:00
Jeremy Goldman
ab8eeca966 Gear Preference on VPN page includes subtitle if the vpn is an insecure 
type

Test: atest SettingsUnitTests
Screenshot: https://screenshot.googleplex.com/BWfUf6hcHNnbLvH
Bug: 176821216
Change-Id: I2bee3ba100bfe636221264492a2ce98b6a664cd5
Merged-In: I2bee3ba100bfe636221264492a2ce98b6a664cd5
(cherry picked from commit 3922249709)
 2021-03-23 08:38:12 +00:00
Jeremy Goldman
222dd91102 Legacy VPN Configuration Dialog includes error message if VPN is an 
insecure type.

Screenshot: https://screenshot.googleplex.com/53pAJuhTDLJW4Em
Bug: 176821216
Test: atest SettingsUnitTests

Change-Id: I528d46654a39df04b647d6d0137aaf80e7adb05c
Merged-In: I528d46654a39df04b647d6d0137aaf80e7adb05c
(cherry picked from commit 5d92ad5232)
 2021-03-23 08:37:11 +00:00
Bonian Chen
99e59b750d Merge "[Settings] Fix divide by zero in data usage UI" into sc-dev am: 238ad87750 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13946308

Change-Id: Ib6bbfac4ff4566538f6de2a99b9fe7e8beb74fd9
 2021-03-23 05:26:48 +00:00
Bonian Chen
238ad87750 Merge "[Settings] Fix divide by zero in data usage UI" into sc-dev 2021-03-23 04:50:54 +00:00
Janis Danisevskis
a308ea1915 Merge "Keystore 2.0: Remove references to Keystore 1.0" am: 7aa99fe966 am: c90b511239 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1624590

Change-Id: I590f53d3a4c1b6ad9c4bdb27f04103ccfba7e7af
 2021-03-23 04:09:47 +00:00
Weng Su
927481b88f Merge "[Provider Model] Bring back the "turn on Wi-Fi automatically" option" into sc-dev am: b30db25d8c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13946493

Change-Id: I2dcd5b6ee3d05af196c1bd46ca00ce29e3e54d13
 2021-03-23 03:52:28 +00:00
Weng Su
7d014ffba6 Merge "[Provider Model] Update Internet preference summary" into sc-dev am: 5ac8414834 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13946630

Change-Id: I00bb8802a22b50833dd244a9517a01f7f659ab9a
 2021-03-23 03:51:51 +00:00
Weng Su
b30db25d8c Merge "[Provider Model] Bring back the "turn on Wi-Fi automatically" option" into sc-dev 2021-03-23 03:24:18 +00:00
Weng Su
5ac8414834 Merge "[Provider Model] Update Internet preference summary" into sc-dev 2021-03-23 03:21:08 +00:00
Janis Danisevskis
7aa99fe966 Merge "Keystore 2.0: Remove references to Keystore 1.0" 2021-03-23 03:14:28 +00:00
Jeremy Goldman
af7371cdcb Merge "Legacy VPN Configuration Dialog includes error message if VPN is an insecure type." 2021-03-23 02:38:05 +00:00
Bill Lin
2bd88c6513 Merge "2/ Set Swipe bottom for notification OFF by default" into sc-dev am: 9f046e55b6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13856783

Change-Id: I48372fe8a551f218a6636e381b47c823dcb5b5ee
 2021-03-23 01:52:06 +00:00
Bill Lin
9f046e55b6 Merge "2/ Set Swipe bottom for notification OFF by default" into sc-dev 2021-03-23 01:22:38 +00:00
Dmitri Plotnikov
3b5c5f0d7c Change getStatsStartRealtime to getStatsStartTimestamp 
Bug: 183434301
Test: make RunSettingsRoboTests
Test: make RunSettingsGoogleRoboTests
Change-Id: Ic86a04a91d910c863706a0f799c757dcd7c5262d
 2021-03-22 15:51:21 -07:00
Peter Kalauskas
1f160cf666 Merge "Introduce guest user metrics" into sc-dev am: 01f77d8e00 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13935767

Change-Id: Ic9949bb8a11addd5742b856c65ef883f65b71e55
 2021-03-22 20:54:11 +00:00
Janis Danisevskis
75a91836e7 Keystore 2.0: Remove references to Keystore 1.0 
Test: N/A
Bug: 171305684
Change-Id: I8b50c024e919d5b98348b792e0769c510ff1a33d
 2021-03-22 13:35:53 -07:00
Peter Kalauskas
01f77d8e00 Merge "Introduce guest user metrics" into sc-dev 2021-03-22 20:17:20 +00:00
SongFerng Wang
8722e00b4a Merge "KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY change type as IntArray" am: 5292baf810 am: d1278a3d3d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1645427

Change-Id: I2618da0e75674e7c3c878f5aee50278ac0c0e76a
 2021-03-22 19:34:15 +00:00
SongFerng Wang
5292baf810 Merge "KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY change type as IntArray" 2021-03-22 19:06:48 +00:00
Bonian Chen
0880675414 [Settings] Fix divide by zero in data usage UI 
Data usage UI got divide by zero exception when zero data usage.

Bug: 182822862
Test: local
Change-Id: Ibe57034e7d441e94c0529cb76f1a16665aaacff6
 2021-03-22 17:10:00 +00:00
Weng Su
bec3144c11 [Provider Model] Bring back the "turn on Wi-Fi automatically" option 
- Screenshot:
  https://screenshot.googleplex.com/92uXX6KQCqWxvub

Bug: 182620666
Test: manual test
make RunSettingsRoboTests
ROBOTEST_FILTER=WifiWakeupPreferenceControllerTest

Change-Id: Ic0ce47a6d9a374fce9752d67a9c2d083486b9083
 2021-03-22 22:28:55 +08:00
Weng Su
784eb94a14 [Provider Model] Update Internet preference summary 
- Show "Networks available" summary instead of "Not connected" when no
network connected

- Screenshot:
  https://screenshot.googleplex.com/AxhtTqpxXVSCT5o

Bug: 182244261
Test: manual test
atest -c InternetPreferenceControllerTest

Change-Id: If32f656d7d89a8b19c4da4876ccc0d1cf92262a0
 2021-03-22 22:01:55 +08:00
Arc Wang
86940142ad Merge "Only show storage category stats preferences for private volumes" into sc-dev am: e98a5a9932 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13922070

Change-Id: I260581ae4f06bb976f8a9b2b90a25a3c34687998
 2021-03-22 11:41:32 +00:00
Arc Wang
e98a5a9932 Merge "Only show storage category stats preferences for private volumes" into sc-dev 2021-03-22 11:06:47 +00:00
Jeremy Goldman
5d92ad5232 Legacy VPN Configuration Dialog includes error message if VPN is an 
insecure type.

Screenshot: https://screenshot.googleplex.com/53pAJuhTDLJW4Em
Bug: 176821216
Test: atest SettingsUnitTests

Change-Id: I528d46654a39df04b647d6d0137aaf80e7adb05c
 2021-03-22 18:14:26 +08:00
Jeremy Goldman
3216c16fe4 Merge "Connect VPN warning help icon with the network & internet page." 2021-03-22 10:13:44 +00:00
Alex Johnston
beff3ecba9 Merge "Allow enabled IMEs to be disabled in Settings" into sc-dev am: caf50d1203 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13676765

Change-Id: I2ccba2a65579c22293f626bba670e1d573ce936b
 2021-03-22 09:54:54 +00:00
Bonian Chen
f9f2fe3f84 Merge "[Settings] Convert to getSystemService(Class<T>)" am: 13fb77c652 am: 70f887af52 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1645152

Change-Id: I89fa2de521bb07911f0c7ee0122ba3b2cb062fab
 2021-03-22 09:36:16 +00:00