Commit Graph

51486 Commits

Author SHA1 Message Date
Lei Yu
8a09cb1c67 Merge "Override height of SliceView in Settings" into qt-dev am: 7c7dbe20c7
am: 01626fd7d5

Change-Id: Ic6fa39e3c3792e97369cc38a73894816ff8210f9
2019-04-10 13:32:40 -07:00
Fan Zhang
9be307720b Merge "Gracefully handle the case where private volume may be unmountable" into qt-dev
am: 6dd38b462f

Change-Id: I4354f0a2482891e95e89c6a15bd44b8633849dfd
2019-04-10 13:19:12 -07:00
TreeHugger Robot
3b7cdfb708 Merge "Go to the correct subscription in WifiCallingSettings" into qt-dev 2019-04-10 20:01:32 +00:00
Andrew Sapperstein
b61e1566ef Merge "Updates to data usage prefs" into qt-dev am: 8bd90f58bf
am: 028b2fec43

Change-Id: I071e491c6d0df447f331333c5c6a38cbe798c781
2019-04-10 12:56:07 -07:00
Julia Reynolds
002f8a09d3 Changes for renamed API
Test: atest
Bug: 130224929
Change-Id: Ia5003a31153da74347a3251a71dfcd423e65a462
2019-04-10 15:50:51 -04:00
Fan Zhang
1e5d1ba5ff Merge "Batch rename: homepage_* to contextual_* or condtion_*" into qt-dev
am: aa599e737a

Change-Id: Ib34b49b163c5753d5eda17a1e7521436fedd2678
2019-04-10 12:49:12 -07:00
Julia Reynolds
b2bf285911 Merge "Use correct key value" into qt-dev 2019-04-10 19:46:58 +00:00
TreeHugger Robot
d79e9c498a Merge "Fix up Network and Internet Slice" into qt-dev 2019-04-10 19:44:42 +00:00
Fan Zhang
6dd38b462f Merge "Gracefully handle the case where private volume may be unmountable" into qt-dev 2019-04-10 19:29:58 +00:00
Fan Zhang
b64d16dcad Rename resource variable names: homepage_* -> contextual_*
Fixes: 130250419
Test: rebuild
Change-Id: I497f2d8e48fb6b5cd54b40e5f5b0691de0e19b1c
2019-04-10 12:25:10 -07:00
Fabian Kozynski
a52961d803 Creates user_switcher_enabled setting to match setting
When the user enters UserSettings, the switch displays the setting as
on, but the setting is not created until the user modifies this for the
first time. This change makes sure that the setting is created when the
user enters UserSettings for the first time.

Fixes: 130270878
Test: manual, switch to second user and observe switcher icons.
Change-Id: I30bc5025c178da3668a76c828c34545c1d98b085
2019-04-10 15:22:20 -04:00
Jonathan Koo
af0f6960df Merge "Address UI change request for injected services" into qt-dev am: 82af1830d7
am: 42c1dc6da1

Change-Id: Icea5e21286af44576aa6445b06121e4e2ab43f0d
2019-04-10 12:07:44 -07:00
Raff Tsai
4bbb0542a2 Merge "Settings: fix the NullPointerException when initiating media player" into qt-dev am: cd576f15a3
am: a75795840e

Change-Id: I702d0d79277933e690c44f7d75d27b7ff98dd2f6
2019-04-10 12:06:46 -07:00
Jack Yu
f7422c7e68 Merge "Correct SecureNfc behavior in setting page" into qt-dev
am: 0333b07a1e

Change-Id: Icc9b9b84572ef063051ade9a2ffbd6c1a30088da
2019-04-10 11:56:38 -07:00
Lei Yu
01626fd7d5 Merge "Override height of SliceView in Settings" into qt-dev
am: 7c7dbe20c7

Change-Id: I8f3af9068bab3116e8f7738db5e343862d15058d
2019-04-10 11:55:41 -07:00
Andrew Sapperstein
028b2fec43 Merge "Updates to data usage prefs" into qt-dev
am: 8bd90f58bf

Change-Id: I1e50944c0dd9e6b67f2d9435268ac98c89d2f0e5
2019-04-10 11:54:08 -07:00
TreeHugger Robot
aa599e737a Merge "Batch rename: homepage_* to contextual_* or condtion_*" into qt-dev 2019-04-10 18:25:45 +00:00
Mill Chen
0c63de2612 Update magnification icon in Accessibility
Also, delete unused png files

Fixes: 129995155
Test: visual
Change-Id: Ie392abea4281beb4799c87d264548369c28940e1
2019-04-10 11:20:14 -07:00
Jordan Liu
728e186441 Do not reuse phonestatelistener
Due to b/117555407, the same PhoneStateListener object can not be used
to register on different subIds, so we workaround this by recreating
the PhoneStateListener when reregistering.

Fixes: 129989656
Test: manual
Change-Id: I9d6631da628351511e285afeb5b6d4331aaab7e5
Merged-In: I9d6631da628351511e285afeb5b6d4331aaab7e5
(cherry picked from commit 9bc2a584f6)
2019-04-10 18:13:06 +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
Jack Yu
5e571128c1 Fixed display name not saved after carrier changed
The caller needs to specify the name changing source, otherwise
telephony resets it to default after SIM swapped.

Bug: 130237749
Test: Manual
Change-Id: Iaa46db7bf22a35cb583faae069c9f2519ba4f94f
2019-04-10 08:01:15 -07: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
Ugo Yu
9f11ccf319 Align with Bluetooth metadata API changes
* Align with the changes of Bluetooth metadata APIs.
* Move metadata utils from Settings to SettingsLib.

Bug: 124448651
Test: make RunSettingsRoboTests
Change-Id: Ic9ad91536ef3ff6807a08bbffa3dd796ef1ad523
2019-04-10 14:23:54 +08:00
Arc Wang
2b0c8a0c6b Fix Wi-Fi QR code scanning icon disappears problem
Should not do one time initialization for the View in
Preference#onBindViewHolder. Because A view setup in
PreferenceViewHolder may be recycled.

Bug: 127502788
Test: manual
Change-Id: Iedf023fa00d2745a02521b65e5c12165c2bc025b
2019-04-10 14:20:11 +08:00