Fan Zhang
1e5d1ba5ff
Merge "Batch rename: homepage_* to contextual_* or condtion_*" into qt-dev
...
am: aa599e737a
2019-04-10 12:49:12 -07:00
Jack Yu
f7422c7e68
Merge "Correct SecureNfc behavior in setting page" into qt-dev
...
am: 0333b07a1e
2019-04-10 11:56:38 -07:00
Lei Yu
01626fd7d5
Merge "Override height of SliceView in Settings" into qt-dev
...
am: 7c7dbe20c7
2019-04-10 11:55:41 -07:00
Andrew Sapperstein
028b2fec43
Merge "Updates to data usage prefs" into qt-dev
...
am: 8bd90f58bf
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
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
2019-04-10 11:08:54 -07:00
TreeHugger Robot
0333b07a1e
Merge "Correct SecureNfc behavior in setting page" into qt-dev
2019-04-10 17:18:03 +00: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
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
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
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
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
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
2019-04-09 18:41:50 -07:00
Amin Shaikh
7924c897e6
Merge "Show Styles & Wallpaper in Settings" into qt-dev
...
am: c35af0eae2
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
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: afa7f967682fa0b7ed85
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
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
2019-04-09 17:47:30 -07:00
Amit Mahajan
afa7f96768
Merge "Treat mcx apn type as not wild-cardable."
...
am: 61841ba690
2019-04-09 17:32:34 -07:00
Lei Yu
2ba8f2a98d
Merge "Move bitmap recycle to onDestroy()" into qt-dev
...
am: 72a162a17c
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
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
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
de3e40089d
Override height of SliceView in Settings
...
Fixes: 129012281
Test: Manual
Change-Id: I99ad80ea03a52f4a9edc0a7532ad4a0f2d33779e
2019-04-09 13:38:45 -07: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
2019-04-09 11:44:05 -07:00
