sj.cha
26412bb907
Merge "Fix code for NPE when click add and cancel repeatly VPN profile" am: 70cae1ce8d
...
am: 2c0ba8b48e
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
2019-04-09 11:41:26 -07:00
sj.cha
2c0ba8b48e
Merge "Fix code for NPE when click add and cancel repeatly VPN profile"
...
am: 70cae1ce8d
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
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
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
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
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
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
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
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
2019-04-09 00:35:10 -07:00
Hai Zhang
b3299e654e
Merge changes from topic "role-replace" into qt-dev
...
am: 0aa0d665c0
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
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
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
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
2019-04-08 21:12:12 -07:00
Arc Wang
4a5ff58511
Supports to share Wi-Fi networks of WPA3 security SAE & OWE via QR code generator
...
When scanned a no password ZXing QR code, add both open network &
enhanced open network to configured Wi-Fi network list because this kind
of QR code may refer to a open network or an enhanced open network.
Bug: 124131581
Test: manual
Change-Id: Id9f85ef8dcdf72347be8106938437aecd0eed9f5
2019-04-09 10:36:07 +08: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
pastychang
e82540f174
Add strings used for setupwizard lockscreen skip dialog
...
Test: atest
Bug: 124028212
Change-Id: I9f65022f6bbc70606a40b5b20e9484731376d203
2019-04-09 01:56:58 +00:00
Arc Wang
73f539d296
Merge "Remove the PreferenceGroup without title in WifiNetworkDetailsFragment" into qt-dev
2019-04-09 01:39:35 +00:00
Cn Chen
6b5d0230b4
Merge "Fix fingerprint screens from "Anything else" screen not applying Stencil theme" into qt-dev
2019-04-09 01:27:01 +00:00
Malcolm Chen
e0bc974553
[automerger skipped] Merge "Correct name of PRIMARY_SUBSCRIPTION_LIST_CHANGED." am: bf857c7374
...
am: d6875ddf82a05e6f8182
2019-04-08 17:21:41 -07:00
Bill Yi
b8678ee1e4
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: 00846385a5
2019-04-08 17:14:23 -07:00
TreeHugger Robot
00846385a5
Merge "Import translations. DO NOT MERGE" into qt-dev
2019-04-08 23:37:53 +00:00
Antony Sargent
4646fe8e63
Use active instead of available subscriptions in 2 places
...
In a couple of places we were showing DSDS UI using the list of
*available* subscriptions instead of the list of *active* ones. This
difference is relevant for instance if you have multiple eSIM profiles -
in typical hardware only one of those can be active at one time. This CL
fixes that problem in two places:
1) The header at the top of the Network & internet page
2) The ListPreference's on the mobile network detail page for selecting
the default subscription for Calls / SMS.
Fixes: 129673046
Test: make RunSettingsRoboTests
Change-Id: I891c856bdd4516286fcee1067684d9161ceaca80
2019-04-08 16:22:55 -07:00
Malcolm Chen
d6875ddf82
Merge "Correct name of PRIMARY_SUBSCRIPTION_LIST_CHANGED."
...
am: bf857c7374
2019-04-08 16:06:13 -07:00
Xiangyu/Malcolm Chen
9106454fbd
Merge "Revert switchBar if enable / disable subscription fails." into qt-dev
...
am: 81f31ef4d3
2019-04-08 15:09:40 -07:00
Lei Yu
afffd04568
Merge "Settings: [BT] Wrong Pairing Popup is shown on new pairing request." into qt-dev
...
am: 8f45be526d
2019-04-08 15:08:04 -07:00
Treehugger Robot
bf857c7374
Merge "Correct name of PRIMARY_SUBSCRIPTION_LIST_CHANGED."
2019-04-08 21:53:58 +00:00
Xiangyu/Malcolm Chen
81f31ef4d3
Merge "Revert switchBar if enable / disable subscription fails." into qt-dev
2019-04-08 21:38:25 +00:00
