Commit Graph

51149 Commits

Author SHA1 Message Date
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
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
Clown SHEN
fa1c69ee44 Merge "Add icon for sign in" into qt-dev 2019-04-10 02:48:20 +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
dc4f7ce282 Merge "Record all contextual card log to MetricsFeatureProvider" into qt-dev 2019-04-09 23:39:46 +00:00
TreeHugger Robot
c35af0eae2 Merge "Show Styles & Wallpaper in Settings" into qt-dev 2019-04-09 22:48:04 +00:00
Amit Mahajan
c9651a21ad Merge "Treat mcx apn type as not wild-cardable." into qt-dev
am: 125fe8ae9f

Change-Id: I20676a7bee156c2894377bda52ae8a8e8a0dbaa0
2019-04-09 15:44:29 -07:00
TreeHugger Robot
f078971771 Merge "Treat mode_default as denied for install_unknown_apps" into qt-dev 2019-04-09 22:02:30 +00:00
Amit Mahajan
ac0244e572 Treat mcx apn type as not wild-cardable.
Test: manual
Bug: 130167974
Merged-in: Ic3e643646491e5a187505fd54ca767ad91e285f5
Change-Id: Ic3e643646491e5a187505fd54ca767ad91e285f5
(cherry picked from commit 2fa0b7ed85)
2019-04-09 14:52:48 -07:00
TreeHugger Robot
dda677cf77 Merge "Do not retrive app detail if the fragment is exiting." into qt-dev 2019-04-09 21:19:24 +00:00
TreeHugger Robot
5840e1e1cd Merge "Use helper method for determining whether eSIM is supported" into qt-dev 2019-04-09 20:45:10 +00:00
Lei Yu
72a162a17c Merge "Move bitmap recycle to onDestroy()" into qt-dev 2019-04-09 20:23:48 +00:00
TreeHugger Robot
125fe8ae9f Merge "Treat mcx apn type as not wild-cardable." into qt-dev 2019-04-09 20:18:03 +00:00
Raff Tsai
40976d461e Record all contextual card log to MetricsFeatureProvider
Use ContextualCardLogUtils to serialize contextual card event to
string, and records the string using regular MetricFeatureProvider
logging APIs.

Bug: 124701288
Test: Robolectric, integrating test with SettingsIntelligence
Change-Id: Ie139b4f4b8a2b0f0dcc4bb8df9bdec8f5fd824a6
2019-04-09 13:12:02 -07:00
sj.cha
26412bb907 Merge "Fix code for NPE when click add and cancel repeatly VPN profile" am: 70cae1ce8d
am: 2c0ba8b48e

Change-Id: I853372683440048c16141b0fb2b46bbc6f27e972
2019-04-09 11:44:05 -07:00
Antony Sargent
f1129f72ef Merge "Use active instead of available subscriptions in 2 places" into qt-dev
am: e4669acc91

Change-Id: Id0c2d5b231bdbcda06cd99172783f8c23df61401
2019-04-09 11:41:26 -07:00
Antony Sargent
f5bc241627 Use helper method for determining whether eSIM is supported
It turns out to be more complicated than I had thought to determine if a
device should be considered to support eSIM. But the good news is that
we already had a helper method for this - this CL switches to using it
in some code for DSDS UI.

Fixes: 129061243
Test: make RunSettingsRoboTests
Change-Id: I41e500eb70b6c6b725c0ddf09fe1ca1a69df4563
2019-04-09 11:31:08 -07:00
sj.cha
2c0ba8b48e Merge "Fix code for NPE when click add and cancel repeatly VPN profile"
am: 70cae1ce8d

Change-Id: Ie18c7977bb0c48ba5f9524130cbe6649f8840153
2019-04-09 11:20:55 -07:00
TreeHugger Robot
e4669acc91 Merge "Use active instead of available subscriptions in 2 places" into qt-dev 2019-04-09 18:01:30 +00:00
Treehugger Robot
70cae1ce8d Merge "Fix code for NPE when click add and cancel repeatly VPN profile" 2019-04-09 17:46:23 +00:00
Yi-Ling Chuang
4b6479bcf7 Merge "Remove viewFlipper used in contextual card dismissal." into qt-dev
am: 8b3cde0fb1

Change-Id: Ia9747b66b6e5f4ed332d979fcf6ecbe692bc5180
2019-04-09 10:45:10 -07:00
Yi-Ling Chuang
2bb41176cf Merge "Inflate dismissal background instead of drawing while swiping" into qt-dev
am: a31acac404

Change-Id: Ibf89f70e45518ff4b6a99a745949661715d2149e
2019-04-09 10:44:08 -07:00
Amin Shaikh
2a9911e3a0 Show Styles & Wallpaper in Settings
Show "Styles & Wallpaper" in Settings based on whether the ThemePicker
component is availalable. Also update dashboard summary for display.

Bug: 129874298
Test: m RunSettingsRoboTests
Change-Id: Id7e0bb9cbc689bb9e637919a10a7d1006397afab
2019-04-09 13:25:57 -04:00
Yi-Ling Chuang
e2aea6ffcd Merge "Only enable feedback dialog in debuggable build." into qt-dev
am: 3a9707b81a

Change-Id: Idb97798f0b10c5be584c15934486bec32492c7b7
2019-04-09 10:20:07 -07:00
Linda Tseng
7b50cf0192 Merge "Fix panel slices title not updated when locale changed" into qt-dev
am: 3ec5e76c86

Change-Id: Ia65ba2136400b6657275704d5e3d7f2b46751db4
2019-04-09 10:18:20 -07:00
TreeHugger Robot
8b3cde0fb1 Merge "Remove viewFlipper used in contextual card dismissal." into qt-dev 2019-04-09 17:11:40 +00:00
TreeHugger Robot
a31acac404 Merge "Inflate dismissal background instead of drawing while swiping" into qt-dev 2019-04-09 17:11:11 +00:00
TreeHugger Robot
3a9707b81a Merge "Only enable feedback dialog in debuggable build." into qt-dev 2019-04-09 17:00:13 +00:00
Linda Tseng
3ec5e76c86 Merge "Fix panel slices title not updated when locale changed" into qt-dev 2019-04-09 16:57:26 +00:00