Commit Graph

51176 Commits

Author SHA1 Message Date
Antony Sargent
a6b87a24f2 Merge "Go to the correct subscription in WifiCallingSettings" into qt-dev
am: 3b7cdfb708

Change-Id: I1405532c1c400a2c7d7af1397dea701bb424239a
2019-04-10 16:19:15 -07:00
Julia Reynolds
af2195bd98 Merge "Use correct key value" into qt-dev
am: b2bf285911

Change-Id: I65e833cce5f840cae2d2dfd46526ee9e1f23d4c8
2019-04-10 14:32:42 -07:00
Matthew Fritze
7b5b8e620b Merge "Fix up Network and Internet Slice" into qt-dev
am: d79e9c498a

Change-Id: I4f7036c642a15c187ecd1bb067765396da40aae4
2019-04-10 14:27:50 -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
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
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
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
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
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
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
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
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
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
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
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
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
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
Amit Mahajan
afa7f96768 Merge "Treat mcx apn type as not wild-cardable."
am: 61841ba690

Change-Id: I422e025bcacbae3f0c52b71f3e21d3881a42d553
2019-04-09 17:32:34 -07:00
Lei Yu
2ba8f2a98d Merge "Move bitmap recycle to onDestroy()" into qt-dev
am: 72a162a17c

Change-Id: I32ba09bd99cf35669378b5febb0bdb328bfec19e
2019-04-09 17:21:41 -07:00
Amit Mahajan
61841ba690 Merge "Treat mcx apn type as not wild-cardable." 2019-04-10 00:08:43 +00:00
Fan Zhang
4cb25ed087 Batch rename: homepage_* to contextual_* or condtion_*
Contextual cards are not bound to homepage. Remove prefix homepage from
layout and theme names.

Next step: update names for some resource values (dimen/color etc)

Bug: 130250419
Test: rebuild

Change-Id: I5e901268462aaa37e00493080ae09af001784823
2019-04-10 00:08:18 +00:00
Fan Zhang
dc4f7ce282 Merge "Record all contextual card log to MetricsFeatureProvider" into qt-dev 2019-04-09 23:39:46 +00:00
Antony Sargent
02db2ef9b6 Go to the correct subscription in WifiCallingSettings
For subscriptions that support wifi calling, we have a preference on the
mobile network details page which leads to a Wifi Calling page. That
page already supports the concept of multiple subscriptions with a
header strip containing a tab for each subscription that supports wifi
calling. However, we were not necessarily selecting the *correct* tab
when going to this page. So you might be viewing the mobile network
details for subscription B and click on "Wifi Calling", only to land on
the page with the tab for subscription A selected.

This CL fixes the problem by adding an extra with the current
subscription id to the Preference's intent in
WifiCallingPreferenceController, and then reads that extra in
WifiCallingSettings and uses it to select the appropriate tab.

Fixes: 117135894
Test: make RunSettingsRoboTests
Change-Id: I3aec30072712247d14fe0fb6b61207535f9e981c
2019-04-09 16:08:04 -07:00