Commit Graph

8057 Commits

Author SHA1 Message Date
Raff Tsai
c52f3117f3 Merge "Remove old format contextual card log" into qt-dev am: cc0cec4636
am: c82c5ebfe6

Change-Id: Ic4f07000baaa07add48b4a673ebdb6430222ae8f
2019-04-11 00:25:30 -07:00
Julia Reynolds
51afd8c9a5 Merge "Changes for renamed API" into qt-dev am: b027acfc6b
am: ed234f41e1

Change-Id: I841887912957497f4c3bebda6e65880528902ff2
2019-04-10 23:19:43 -07:00
Raff Tsai
c82c5ebfe6 Merge "Remove old format contextual card log" into qt-dev
am: cc0cec4636

Change-Id: I8772494e7ff6e064f8be30a3ac1a3e15936a8e75
2019-04-10 20:20:20 -07:00
Julia Reynolds
ed234f41e1 Merge "Changes for renamed API" into qt-dev
am: b027acfc6b

Change-Id: I4bbb331c48f6a17605cdb19becca217df221e343
2019-04-10 18:54:03 -07:00
Antony Sargent
5cd5845752 Merge "Go to the correct subscription in WifiCallingSettings" into qt-dev am: 3b7cdfb708
am: a6b87a24f2

Change-Id: I204f41ee8c0bbf9159879e9b7014c240a19e6ce7
2019-04-10 17:29:32 -07:00
Raff Tsai
cc0cec4636 Merge "Remove old format contextual card log" into qt-dev 2019-04-10 23:42:48 +00:00
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
TreeHugger Robot
b027acfc6b Merge "Changes for renamed API" into qt-dev 2019-04-10 22:22:25 +00:00
Matthew Fritze
ec9bf86718 Merge "Fix up Network and Internet Slice" into qt-dev am: d79e9c498a
am: 7b5b8e620b

Change-Id: I8a94ce194a640d96f15903e083319e012fc68bcc
2019-04-10 15:20:19 -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
TreeHugger Robot
3b7cdfb708 Merge "Go to the correct subscription in WifiCallingSettings" into qt-dev 2019-04-10 20:01:32 +00:00
Julia Reynolds
002f8a09d3 Changes for renamed API
Test: atest
Bug: 130224929
Change-Id: Ia5003a31153da74347a3251a71dfcd423e65a462
2019-04-10 15:50:51 -04:00
TreeHugger Robot
d79e9c498a Merge "Fix up Network and Internet Slice" into qt-dev 2019-04-10 19:44:42 +00: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
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
Jonathan Koo
82af1830d7 Merge "Address UI change request for injected services" into qt-dev 2019-04-10 16:46:16 +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
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
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
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
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
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
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
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
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
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
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
TreeHugger Robot
c35af0eae2 Merge "Show Styles & Wallpaper in Settings" into qt-dev 2019-04-09 22:48:04 +00:00
Matthew Fritze
441a439431 Fix up Network and Internet Slice
- Fix pref key for Airplane mode
- Return null when no mobile data is available

Test: robotests
Fixes: 130244854
Change-Id: I88806cb9215af159114ac150c20cdb8fb413befe
2019-04-09 15:39:39 -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
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
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
Antony Sargent
bab7e3a3ee Merge "Use active instead of available subscriptions in 2 places" into qt-dev am: e4669acc91
am: f1129f72ef

Change-Id: Ie3a1be80a34e934669398e987ee83fdfb4385dab
2019-04-09 12:47:43 -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
Yi-Ling Chuang
ba4aed4897 Merge "Remove viewFlipper used in contextual card dismissal." into qt-dev am: 8b3cde0fb1
am: 4b6479bcf7

Change-Id: I4f69ba0dca1521987f87cc918d5746157eb1b644
2019-04-09 11:33:24 -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
Yi-Ling Chuang
3b53d2f98f Merge "Inflate dismissal background instead of drawing while swiping" into qt-dev am: a31acac404
am: 2bb41176cf

Change-Id: I180a8b423fa9d9823418d8e462931a97a5f14f75
2019-04-09 11:24:18 -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
Yi-Ling Chuang
3cffcbacab Merge "Only enable feedback dialog in debuggable build." into qt-dev am: 3a9707b81a
am: e2aea6ffcd

Change-Id: I1303bd76cd6764781242993ab9a9e04ab6de943f
2019-04-09 10:48:54 -07: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