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
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
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
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
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
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
Jordan Liu
8eb02d1e18
Merge "Do not reuse phonestatelistener"
2019-04-09 21:39:12 +00: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
sj.cha
44191cc4b0
Merge "Fix code for NPE when click add and cancel repeatly VPN profile" am: 70cae1ce8d
am: 2c0ba8b48e
...
am: 26412bb907
Change-Id: I88f6a19992c80342cd86d1ab031662a6e8824339
2019-04-09 13:29:09 -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