Commit Graph

51312 Commits

Author SHA1 Message Date
TreeHugger Robot
aa599e737a Merge "Batch rename: homepage_* to contextual_* or condtion_*" into qt-dev 2019-04-10 18:25:45 +00:00
Jonathan Koo
42c1dc6da1 Merge "Address UI change request for injected services" into qt-dev
am: 82af1830d7

Change-Id: Iaec7f7ee83f4bc764940b22343b2c7556cb2b8a6
2019-04-10 11:10:16 -07:00
Raff Tsai
a75795840e Merge "Settings: fix the NullPointerException when initiating media player" into qt-dev
am: cd576f15a3

Change-Id: Id176c6e8e413cc7c85a0ac502f6086aca42cc940
2019-04-10 11:08:54 -07:00
Julia Reynolds
1507891548 Use correct key value
Test: manual with pre O and O+ apps
Fixes: 130179408
Change-Id: I6a3f815dc441f99509eb334f028f42948e8f9c9e
2019-04-10 17:53:29 +00:00
TreeHugger Robot
0333b07a1e Merge "Correct SecureNfc behavior in setting page" into qt-dev 2019-04-10 17:18:03 +00:00
Shibin George
a2f013dacb Gracefully handle the case where private volume may be unmountable
If sdcard was removed while format(as phone storage) was
under progress, blkid can fail to identify the UUID of the
private volume. The PrivateStorageInfo.getTotalSize() API
assumes UUID to be always valid which could simply be not the case.
Avoid calling getTotalSize() on private volume when its state
is unmountable.

Bug: 130203877

Test: 1) Insert sdcard as "portable" storage.
      2) Format it as "phone" storage.
      3) Remove the sdcard while format is in progress.
      4) Insert sdcard again -> blkid may fail to id the sdcard.
         In such case, the fsUuid of the private-volume will be reported as "".
      5) Open "Storage Settings". Settings app crashes:

       FATAL EXCEPTION: main
       Process: com.android.settings, PID: 3700
       ...
       Caused by: java.lang.IllegalArgumentException: Invalid UUID string:
       at java.util.UUID.fromString(UUID.java:194)
       at android.os.storage.StorageManager.convert(StorageManager.java:2139)
       at android.app.usage.StorageStatsManager.getTotalBytes(StorageStatsManager.java:121)
       at com.android.settingslib.deviceinfo.PrivateStorageInfo.getTotalSize(PrivateStorageInfo.java:64)

         However, with this CL, "Storage Settings" can be opened
         and the private volume's state is correctly reflected as "Corrupted".
         User can choose to format the volume again.

Copyright (c) 2019 Qualcomm Innovation Center, Inc. All Rights Reserved.

Change-Id: I764603b5806f43f0c6d398f9d6803646774cd912
2019-04-10 10:07:44 -07:00
Lei Yu
7c7dbe20c7 Merge "Override height of SliceView in Settings" into qt-dev 2019-04-10 16:56:28 +00:00
Pavel Grafov
0a67bbf89f Allow user without a password to clear credentials
Currently the code assumes that the user always has a pin or
password or pattern. If there's no password confirmKeyGuard() will
return false, so the acttivity will finish without doing anything.
With this change if there's no PIN/password/pattern, the credential
clearing task will be launched straightaway as the user presses "OK"
the confirmation prompt.

Bug: 127697771
Test: manual
Change-Id: Iac4af0abfc7430ed197e04f833bf203c3f66f52e
2019-04-10 17:53:32 +01:00
Andrew Sapperstein
8bd90f58bf Merge "Updates to data usage prefs" into qt-dev 2019-04-10 16:49:49 +00:00
Jonathan Koo
82af1830d7 Merge "Address UI change request for injected services" into qt-dev 2019-04-10 16:46:16 +00:00
TreeHugger Robot
cd576f15a3 Merge "Settings: fix the NullPointerException when initiating media player" into qt-dev 2019-04-10 16:42:03 +00:00
Julia Reynolds
7425e5a577 Merge "Fix visibility of settings on channel page" into qt-dev am: b5d6ba4caa
am: b6ea5c437a

Change-Id: I8891f493fdf225db76c372a1bef5c1e9821bc4ef
2019-04-10 09:18:49 -07:00
lindatseng
306cb6c344 Merge "Should go to wifi page from wifi panel "See more"" into qt-dev am: 62e5be9797
am: 45783f9193

Change-Id: Icc19daf72d4ced1b47d954a29e93ea3f584d4ebf
2019-04-10 09:15:49 -07:00
Julia Reynolds
b6ea5c437a Merge "Fix visibility of settings on channel page" into qt-dev
am: b5d6ba4caa

Change-Id: I1fd03d275d5a816bea85a71a671a0fc84e15db3b
2019-04-10 08:49:24 -07:00
lindatseng
45783f9193 Merge "Should go to wifi page from wifi panel "See more"" into qt-dev
am: 62e5be9797

Change-Id: Iada9ee9c30b75b861596082a9f0b98f38f5f912a
2019-04-10 08:37:50 -07:00
TreeHugger Robot
b5d6ba4caa Merge "Fix visibility of settings on channel page" into qt-dev 2019-04-10 15:31:35 +00:00
TreeHugger Robot
62e5be9797 Merge "Should go to wifi page from wifi panel "See more"" into qt-dev 2019-04-10 15:18:08 +00:00
Pasty Chang
a43d7fb6fb Merge "Enable heavy theme for setupwizard pages" into qt-dev am: 0f74602864
am: 58015d00bf

Change-Id: I054458bfbc00b78ef79d05896f0508f714971b19
2019-04-10 07:53:14 -07:00
Pasty Chang
58015d00bf Merge "Enable heavy theme for setupwizard pages" into qt-dev
am: 0f74602864

Change-Id: Ia16b69e0fd81abe38c2164ac0f2867918a2c8047
2019-04-10 07:42:06 -07:00
Pasty Chang
0f74602864 Merge "Enable heavy theme for setupwizard pages" into qt-dev 2019-04-10 14:23:00 +00:00
Julia Reynolds
2290e284ec Fix visibility of settings on channel page
Properly hide fields if the parent app or group
is blocked. This is needed because apps can link
directly to this screen.

Test: atest
Fixes: 130184191
Change-Id: I8c39410574940615fbb607a201e20e480ec02d87
2019-04-10 09:57:02 -04:00
Kevin Chyn
86381fa3bf Merge "ConfirmDeviceCredential should respond to cancel when launched through BP" into qt-dev am: 3c2d168026
am: 481055dd0f

Change-Id: I25266e550aebc6e3b0a3525fb9f8f9b011b3c7ee
2019-04-10 03:55:04 -07:00
Raff Tsai
2ad201e080 Settings: fix the NullPointerException when initiating media player
If the input media resource is invalid, MediaPlayer create calling may
fail and returns null, so trigger one NullPointerException.

Add the null pointer judegement when calling seekto and so on.

Test: manual
Fixes: 130032215

Change-Id: I38cb08584aa4e4c2ce4dc58a5a095960c7bd1948
Signed-off-by: Hoff Cheng <hoffc@qti.qualcomm.com>
2019-04-10 18:28:29 +08:00
Clown SHEN
68b1550e9e Merge "Add icon for sign in" into qt-dev am: fa1c69ee44
am: a788391042

Change-Id: I620c7c3a8d4593aab9501528c1e0fe1dac34d274
2019-04-10 02:07:34 -07:00
Kevin Chyn
481055dd0f Merge "ConfirmDeviceCredential should respond to cancel when launched through BP" into qt-dev
am: 3c2d168026

Change-Id: I29e75cbd3b319bff976fb48ca2df29db0fccc164
2019-04-10 01:48:21 -07:00
Kevin Chyn
3c2d168026 Merge "ConfirmDeviceCredential should respond to cancel when launched through BP" into qt-dev 2019-04-10 08:34:34 +00:00
Raff Tsai
76e8acdee8 Remove old format contextual card log
These logs are replaced by SettingsIntelligenceLogWriter

Test: rebuild
Fixes: 124701288
Change-Id: Id93143a1f291878b7c212c35ed8683ca38d5fe17
2019-04-10 15:57:58 +08:00
Fan Zhang
6e0d58a94e Merge "Record all contextual card log to MetricsFeatureProvider" into qt-dev am: dc4f7ce282
am: 5f8fe2a483

Change-Id: I8be77748e7e773817f1e0c8efe1e25e2f163ad3f
2019-04-10 00:04:24 -07:00
Amin Shaikh
864ecb50a8 Merge "Show Styles & Wallpaper in Settings" into qt-dev am: c35af0eae2
am: 7924c897e6

Change-Id: Iea1592e90c1a0bce514132586cf3b629fab4093f
2019-04-10 00:02:53 -07:00
TreeHugger Robot
ea30fe5290 Merge "Make DevloperOptions frag listen to sysprop change" 2019-04-10 05:36:19 +00:00
lindatseng
e2addb4d2d Should go to wifi page from wifi panel "See more"
Redirect to wifi intent instead of network & internet page
when user clicks on See more button on wifi only panel.

Test: Manual
Fixes: 130245318
Change-Id: Ic1ddb5d91cbcabfbe8ee57a5d7ec0994204f9386
2019-04-10 05:19:11 +00:00
Clown SHEN
a788391042 Merge "Add icon for sign in" into qt-dev
am: fa1c69ee44

Change-Id: I78abab803107023f782e7a9288d399aa97b6465c
2019-04-09 22:11:44 -07:00
Suprabh Shukla
9d283c41a7 Merge "Treat mode_default as denied for install_unknown_apps" into qt-dev am: f078971771
am: cee346daa8

Change-Id: Iec9fcdc413764da5509340bb3387fbbf9eca0bb0
2019-04-09 21:50:59 -07:00
Amit Mahajan
ae9004e049 Merge "[automerger skipped] Merge "Treat mcx apn type as not wild-cardable." am: 61841ba690 am: afa7f96768 -s ours
am: 84996ab20e -s ours
am skip reason: change_id Ic3e643646491e5a187505fd54ca767ad91e285f5 with SHA1 ac0244e572 is in history

Change-Id: Ic0166de1646c48a27ffe1331c10e1c5ca4c6baf4
2019-04-09 21:26:39 -07:00
Lifu Tang
e531bd01fd Address UI change request for injected services
- Remove icons from injected items
- Create a separate section for work profile

Bug: 129948280
Test: build, flash, and test manually
Change-Id: Ia64af349c8dd1575d629debd574cdb3ae6eb650d
2019-04-09 21:10:44 -07:00
Amit Mahajan
d1b2de5bfa [automerger skipped] Merge "Treat mcx apn type as not wild-cardable." am: 61841ba690 am: afa7f96768 -s ours
am: 54bc89029c -s ours
am skip reason: change_id Ic3e643646491e5a187505fd54ca767ad91e285f5 with SHA1 2fa0b7ed85 is in history

Change-Id: If5442a67f21d1a7d9e726e7e98936861b0b64df7
2019-04-09 20:52:26 -07:00
Fan Zhang
54156e760c Merge "Do not retrive app detail if the fragment is exiting." into qt-dev am: dda677cf77
am: 19f3c372f5

Change-Id: Ia5d69ec098d9abdc14714bb6221319b8a9b6f446
2019-04-09 20:32:45 -07:00
Antony Sargent
2dafa9d54c Merge "Use helper method for determining whether eSIM is supported" into qt-dev am: 5840e1e1cd
am: 550e5cb88d

Change-Id: I1ebb74f860e479161c24dd9c58b54ff535d5cf2f
2019-04-09 20:31:45 -07:00
Lei Yu
e830d20de0 Merge "Move bitmap recycle to onDestroy()" into qt-dev am: 72a162a17c
am: 2ba8f2a98d

Change-Id: I9bfc0afe6b13d0c4ae17c460c5638d3973f56a3d
2019-04-09 20:21:20 -07:00
Clown SHEN
fa1c69ee44 Merge "Add icon for sign in" into qt-dev 2019-04-10 02:48:20 +00:00
Antony Sargent
77df63d371 Updates to data usage prefs
-Remove 'Data Usage' pref from Network & internet homepage
-Add 'Data warning & limit' to mobile network details page

Fixes: 127535879
Fixes: 130241963
Test: robotests

Change-Id: I28b3de34dcf11140762b4e3ee5b465f842ac48d4
2019-04-10 01:53:24 +00:00
Fan Zhang
5f8fe2a483 Merge "Record all contextual card log to MetricsFeatureProvider" into qt-dev
am: dc4f7ce282

Change-Id: Ib4122ef0cb900ba5afff73e25e1f0ffe6bcb50c1
2019-04-09 18:41:50 -07:00
Amin Shaikh
7924c897e6 Merge "Show Styles & Wallpaper in Settings" into qt-dev
am: c35af0eae2

Change-Id: Ifd5c56a8b4d9f067bb9562131122bc6687cd8ec3
2019-04-09 18:39:59 -07:00
Amit Mahajan
0c40ebafb0 Merge "Treat mcx apn type as not wild-cardable." into qt-dev am: 125fe8ae9f
am: c9651a21ad

Change-Id: I06258d9377b9fc44cb6495b2df0f20d01655115d
2019-04-09 18:28:23 -07:00
Suprabh Shukla
cee346daa8 Merge "Treat mode_default as denied for install_unknown_apps" into qt-dev
am: f078971771

Change-Id: I73c2d520b1b85c0b5f3fc569d689168977efe899
2019-04-09 18:02:55 -07:00
Android Build Merger (Role)
84996ab20e Merge "[automerger skipped] Merge "Treat mcx apn type as not wild-cardable." am: 61841ba690 am: afa7f96768 -s ours am skip reason: change_id Ic3e643646491e5a187505fd54ca767ad91e285f5 with SHA1 2fa0b7ed85 is in history" into qt-dev-plus-aosp 2019-04-10 00:57:18 +00:00
Amit Mahajan
54bc89029c [automerger skipped] Merge "Treat mcx apn type as not wild-cardable." am: 61841ba690
am: afa7f96768 -s ours
am skip reason: change_id Ic3e643646491e5a187505fd54ca767ad91e285f5 with SHA1 2fa0b7ed85 is in history

Change-Id: I00ba2c885d3e9a4ac7d6257f0fddc3ca17bc979e
2019-04-09 17:56:14 -07:00
lindatseng
6b094edbb5 Make DevloperOptions frag listen to sysprop change
Add System Properties change callback in
DevelopmentSettingsDashboardFragment, to listen to the changed
and update preference states accordingly.

This will fix the bug that the pref is not updated accordingly
when user modifies the setting from quick-settings.

Test: Manual/Visual Verification
Fixes: 127761520
Change-Id: I478775902a1d0df1e91f98027d4b8d65d6e9fd28
2019-04-10 00:50:06 +00:00
Fan Zhang
19f3c372f5 Merge "Do not retrive app detail if the fragment is exiting." into qt-dev
am: dda677cf77

Change-Id: Ia6c5033a82ca5a79e6209758ddf2f7209790c4f7
2019-04-09 17:48:37 -07:00
Antony Sargent
550e5cb88d Merge "Use helper method for determining whether eSIM is supported" into qt-dev
am: 5840e1e1cd

Change-Id: I2678177d182e7948f487495b0c56f24227d0a80a
2019-04-09 17:47:30 -07:00