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
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
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
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
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
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
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
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
lindatseng
083243df76
Fix panel slices title not updated when locale changed
...
When calling getSliceData from SliceDataConverter, we were returning
the old version of List<SliceData> if there's one already existed.
So when the Locale get changed and we are re-indexing data, we
are still inserting the old List<SliceData> in database. We should
reconstruct the List of SliceData instead of reusing the old
version here, since we only call SliceDataConverter#getSliceData
when we need to reindex.
Test: Manual verification
Fixes: 126732022
Change-Id: I42a3cf93dc313efefe50a34faabac9e1d616ef6c
2019-04-09 05:41:23 +00:00
Fan Zhang
9e9fccd707
Merge "Add null check in UserPreference" into qt-dev
...
am: c11f792795
Change-Id: I54c1d0317b93851f1951330028e3c600ba5bd02e
2019-04-08 22:39:28 -07: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
Arc Wang
01a26124d7
Merge "Supports to share Wi-Fi networks of WPA3 security SAE & OWE via QR code generator" into qt-dev
...
am: 48ed84ebf4
Change-Id: I4c6a63ec36bcbc209e3b67ae94070d9c8a003e28
2019-04-08 22:31:59 -07:00
Arc Wang
e2b4bccbf1
Should not decode Wi-Fi QR code after onPause
...
Bug: 130141694
Test: manual
atest WifiDppQrCodeScannerFragmentTest
Change-Id: I412fb7c06220c23bddc7b3c448fcc72a00bdecc3
2019-04-09 13:30:59 +08: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
c11f792795
Merge "Add null check in UserPreference" into qt-dev
2019-04-09 05:24:21 +00:00
Arc Wang
ee55582d8b
Merge "Remove the PreferenceGroup without title in WifiNetworkDetailsFragment" into qt-dev
...
am: 73f539d296
Change-Id: I24cae0f576594cd281cd3662cd07f2240c549423
2019-04-08 21:19:30 -07:00
TreeHugger Robot
48ed84ebf4
Merge "Supports to share Wi-Fi networks of WPA3 security SAE & OWE via QR code generator" into qt-dev
2019-04-09 04:18:09 +00:00
Cn Chen
cbd00c32c9
Merge "Fix fingerprint screens from "Anything else" screen not applying Stencil theme" into qt-dev
...
am: 6b5d0230b4
Change-Id: Ifac076a03821ebcf85d2742d47426f65a6100cf7
2019-04-08 21:12:12 -07:00