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
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
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
TreeHugger Robot
c35af0eae2
Merge "Show Styles & Wallpaper in Settings" into qt-dev
2019-04-09 22:48:04 +00: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
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
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
Hai Zhang
b56125843e
Merge changes from topic "role-replace" into qt-dev am: 0aa0d665c0
...
am: b3299e654e
Change-Id: Iea7316880d6edb7b29d976f7caf54746add9b096
2019-04-09 03:28:48 -07:00
Yi-Ling Chuang
734d826117
Remove viewFlipper used in contextual card dismissal.
...
- Use view's visibility to control which view we should show.
- Slice view can be built with normal height after removing viewFlipper.
Bug: 129438972
Bug: 128689305
Test: robotests
Change-Id: If7e9bd30d5cb5bcd3b9ff9f09cc2eae36543b9e9
2019-04-09 10:24:10 +00:00
Yi-Ling Chuang
dc2b2c7929
Inflate dismissal background instead of drawing while swiping
...
- Only swipe the foreground out to have the background revealed.
- Inflate dismissal_swipe_background.xml while swiping.
- Fix the fly-in transition.
- Fix the overlapping problem.
Bug: 129742618
Test: robotests
Change-Id: I5311e50332d0ea0437d1693d075d5c3a2176a443
2019-04-09 10:21:14 +00:00
Yi-Ling Chuang
21ffc13e5a
Only enable feedback dialog in debuggable build.
...
Bug: 129881534
Test: robotests
Change-Id: I0dbd8c06f650cc7b3c32697f0c3af055912fab59
2019-04-09 18:07:50 +08:00
Clown SHEN
31d150d16b
Merge "Redraw WiFi detail page's header icon" into qt-dev
...
am: 740dd43700
Change-Id: Ie615a11fbbe0a033d789ec265a1ef2a3f3c0880f
2019-04-09 00:35:10 -07:00
Hai Zhang
b3299e654e
Merge changes from topic "role-replace" into qt-dev
...
am: 0aa0d665c0
Change-Id: Ia95fc53c0e322b07f85ac2166a6c532f22b7b6f7
2019-04-09 00:26:01 -07:00
Clown SHEN
740dd43700
Merge "Redraw WiFi detail page's header icon" into qt-dev
2019-04-09 06:45:49 +00:00
TreeHugger Robot
0aa0d665c0
Merge changes from topic "role-replace" into qt-dev
...
* changes:
Remove old default apps code and use roles instead.
Move default payment app to special app access.
2019-04-09 05:33:21 +00:00
Hai Zhang
22f8d48df0
Remove old default apps code and use roles instead.
...
Default apps are moved into PermissionController.
Bug: 124452117
Bug: 124457823
Test: presubmit & manual
Change-Id: I5f68e5b77cd6163d093590185314270706d75391
2019-04-09 13:30:31 +08:00
Hai Zhang
470ec69461
Move default payment app to special app access.
...
Bug: 124452117
Bug: 124522992
Test: build
Change-Id: I58e7127920d939dc3635bcc2e608cee6baa21998
2019-04-09 13:30:14 +08:00
TreeHugger Robot
99c95a3a77
Merge "Implement context menu for ConnectedAccessPointPreference"
2019-04-09 04:49:50 +00:00
clownshen
6ef1eec2e2
Redraw WiFi detail page's header icon
...
Tint 87% dark in day mode and 100% white for night mode
Bug: 129413562
Test: make RunSettingsRoboTests -j32 ROBOTEST_FILTER=com.android.settings.wifi.details.WifiDetailPreferenceControllerTest
Test: manual test
Change-Id: Ia31231ca7871ac4efcea5e1232690ff4374df5b3
(cherry picked from commit 86f65ef488 )
2019-04-09 02:20:32 +00:00
cosmohsieh
9f8522565a
Implement context menu for ConnectedAccessPointPreference
...
1) User wants to long press ConnectedAccessPointPreference to forget network if this
is a captive portal network.
2) Change context menu string
Bug: 113756562
Test: make RunSettingsRoboTests -j32 ROBOTEST_FILTER=com.android.settings.wifi
Change-Id: If5c45c45fe126f627eeb53a6c1873a070ad23ae8
2019-04-09 10:17:20 +08:00
Xiangyu/Malcolm Chen
568b24f0a2
Merge "Revert switchBar if enable / disable subscription fails." into qt-dev am: 81f31ef4d3
...
am: 9106454fbd
Change-Id: I22c19ba2475250bb7e6a02954ff4f210d3ac2062
2019-04-08 18:28:29 -07:00