Commit Graph

51189 Commits

Author SHA1 Message Date
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
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
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
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
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
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

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
Pasty Chang
608a634d2e Enable heavy theme for setupwizard pages
Stencil heavy theme is ready. Enable by setting the attribute to true.
light & heavy theme screenshot: https://screenshot.googleplex.com/15SXBK66NZX

Bug: 130208067
Test: atest
Change-Id: Ic3843b5f6724ed2f4fcdadf1ad634d918596c2ae
2019-04-09 13:38:12 +00:00
Jack Yu
7b95c5d217 Correct SecureNfc behavior in setting page
1. String under SecureNfc should update immediately when NFC toggle
2. SecureNfc state should remain the same after NFC toggle

Bug: 129037278
Test: Toggle NFC/SecureNfc option and check behavior
Change-Id: I9cbac4951f0c70accd92c43fc62658cb5dbb5c9b
2019-04-09 21:29:11 +08:00
Julia Reynolds
b8fa1028ac Merge "Move NAS selection to 'special app access'" into qt-dev
am: 8bf3ab9d5c

Change-Id: Ie408690b2352eda4cbb9549bb62df856a01d1fbe
2019-04-09 06:12:51 -07:00
Julia Reynolds
8bf3ab9d5c Merge "Move NAS selection to 'special app access'" into qt-dev 2019-04-09 12:56:40 +00:00
Pasty Chang
614d0cce2b Merge "Add strings used for setupwizard lockscreen skip dialog" into qt-dev
am: 6ffdbb6096

Change-Id: Ic60b4336b3e651681691b540db7a6239602ec5e6
2019-04-09 05:32:03 -07:00
Pasty Chang
6ffdbb6096 Merge "Add strings used for setupwizard lockscreen skip dialog" into qt-dev 2019-04-09 11:53:00 +00: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
Arc Wang
ce9e61ee8e Merge "Should not decode Wi-Fi QR code after onPause" into qt-dev
am: d50bb09876

Change-Id: I172943a14dffbde595440f9586598b5564e526c2
2019-04-09 01:54:36 -07:00
TreeHugger Robot
d50bb09876 Merge "Should not decode Wi-Fi QR code after onPause" into qt-dev 2019-04-09 08:30:33 +00: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