Linda Tseng
3682bf3950
Merge "Fix panel slices title not updated when locale changed" into qt-dev am: 3ec5e76c86
...
am: 7b50cf0192
Change-Id: Iccf7e20ed68074c3590962f2d2e4649b2c834488
2019-04-09 10:41:37 -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
Linda Tseng
3ec5e76c86
Merge "Fix panel slices title not updated when locale changed" into qt-dev
2019-04-09 16:57:26 +00:00
Arc Wang
a7d67bc2a6
Merge "Should not decode Wi-Fi QR code after onPause" into qt-dev am: d50bb09876
...
am: ce9e61ee8e
Change-Id: Id0da8742a507462e16f549afeae2b36dd47f0fc3
2019-04-09 04:07:33 -07: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
Fan Zhang
d532430fc6
Merge "Add null check in UserPreference" into qt-dev am: c11f792795
...
am: 9e9fccd707
Change-Id: Ib08b3d7dfb140a22ae7661f89291999c51e5553d
2019-04-09 03:27:55 -07:00
Arc Wang
787e37b962
Merge "Supports to share Wi-Fi networks of WPA3 security SAE & OWE via QR code generator" into qt-dev am: 48ed84ebf4
...
am: 01a26124d7
Change-Id: I7dc26c8ebd15fc07c994e97b0eff4d4108f59b75
2019-04-09 03:26:56 -07:00
Arc Wang
fa977e12db
Merge "Remove the PreferenceGroup without title in WifiNetworkDetailsFragment" into qt-dev am: 73f539d296
...
am: ee55582d8b
Change-Id: I653420aafabd30107b0f6f05b2cfc44978b2506b
2019-04-09 03:22:37 -07: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
Cn Chen
65c3be84f4
Merge "Fix fingerprint screens from "Anything else" screen not applying Stencil theme" into qt-dev am: 6b5d0230b4
...
am: cbd00c32c9
Change-Id: I5e54ab39143ea95859083a85f53da9a56556ee15
2019-04-09 00:31:59 -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
TreeHugger Robot
99c95a3a77
Merge "Implement context menu for ConnectedAccessPointPreference"
2019-04-09 04:49:50 +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
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
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
Arc Wang
73f539d296
Merge "Remove the PreferenceGroup without title in WifiNetworkDetailsFragment" into qt-dev
2019-04-09 01:39:35 +00: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
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
Andrew Sapperstein
0ac8d0f83b
Merge "Delete carrier entry from mobile network details page." into qt-dev am: b93761d252
...
am: 4bbd1e867b
Change-Id: I723dc4d67d16726c8b41cdc137f27dfb80b0b589
2019-04-08 18:26:47 -07:00
Clown SHEN
530438261b
Merge "Redraw WiFi detail page's header icon"
2019-04-09 00:52:57 +00:00
Xiangyu/Malcolm Chen
9106454fbd
Merge "Revert switchBar if enable / disable subscription fails." into qt-dev
...
am: 81f31ef4d3
Change-Id: I50d58d53ecd2f56fbd43bb616253c0433085d1c6
2019-04-08 15:09:40 -07:00
Xiangyu/Malcolm Chen
81f31ef4d3
Merge "Revert switchBar if enable / disable subscription fails." into qt-dev
2019-04-08 21:38:25 +00:00
Lei Yu
8f45be526d
Merge "Settings: [BT] Wrong Pairing Popup is shown on new pairing request." into qt-dev
2019-04-08 21:28:09 +00:00
Andrew Sapperstein
4bbd1e867b
Merge "Delete carrier entry from mobile network details page." into qt-dev
...
am: b93761d252
Change-Id: Iba51501adb7106d1ca6b0fbf4327bc94c9e58c41
2019-04-08 14:04:11 -07:00
Fan Zhang
f2390512c1
Add null check in UserPreference
...
The comparator can get null objects according to bug report.
Fixes: 130144755
Test: manual
Change-Id: Ic8a332d390f411d2eb69c944fb7fd166d9961535
2019-04-08 13:55:58 -07:00
TreeHugger Robot
b93761d252
Merge "Delete carrier entry from mobile network details page." into qt-dev
2019-04-08 20:00:29 +00:00
Antony Sargent
da62a42ef8
Merge "Fix 'Advanced' collapse point on Network & internet page" into qt-dev
...
am: 5c28e42538
Change-Id: I886e9b11d7b0ec8c7a9742388cc0867f24f50850
2019-04-08 11:43:38 -07:00
Malcolm Chen
046419a92a
Revert switchBar if enable / disable subscription fails.
...
Bug: 123321718
Test: build manual test
Change-Id: Ia7e8c762d91f81b67e0d0b11d36dfa78ec1e2d18
2019-04-08 18:42:06 +00:00
Sumit Deshmukh
c00e137a55
Settings: [BT] Wrong Pairing Popup is shown on new pairing request.
...
Usecase:
1. Start advertising from DUT (using BLE Smartertooth app).
2. Scan and connect from central device.
3. Now initiate bond from central and accept pairing request.
(Consent Pairing Dialog will be shown on DUT)
4. Notification will be received for PASSKEY CONFIRMATION Dialog.
Do not open notification and let it timeout.
5. Repeat steps 2 and 3. At step 3, Passkey Confirmation pairing
dialog is show instead of Consent pairing dialog.
Issue:
Wrong Pairing Popup is shown. Passkey Confirmation pairing
dialog is show instead of Consent pairing dialog.
Reproducible Rate: 100%
Root Cause:
PendingIntent created for showing pairing notification are getting
reused as only FLAG_ONE_SHOT is used. This flag is not updating new
extra's in the pending intent.
Fix:
Use flag FLAG_UPDATE_CURRENT in pending Intent.
Test: Tested above mentioned testcase and pairing scenarios.
Fix: 129479787
Bug: 129456113
Change-Id: I46813f355cd796cee1b472774b494c8580b39784
2019-04-08 18:20:36 +00:00
TreeHugger Robot
5c28e42538
Merge "Fix 'Advanced' collapse point on Network & internet page" into qt-dev
2019-04-08 18:15:57 +00:00
Andrew Sapperstein
95c915d9dc
Delete carrier entry from mobile network details page.
...
Followup CL will need to delete the backing code after we remove the feature flag.
Bug: 127540176
Test: robotests and visual inspection
Change-Id: I17e917b9726cf7f5470af09332ede38f8c253eed
2019-04-08 11:15:47 -07:00
Amin Shaikh
3c77da98ca
Merge "Fix battery color tint issue." into qt-dev
...
am: f1cea95f3e
Change-Id: I75046ab74618c513d70b60fab8f753ea094efbec
2019-04-08 08:37:21 -07:00
Svetoslav Ganov
7b5fe13e0c
Merge "Update Settings to use the proper DeviceConfig API." into qt-dev
...
am: d5161f8d90
Change-Id: Idc44f6c4358c0061158c4b5715c67bd4a2faca1e
2019-04-08 08:20:14 -07:00
TreeHugger Robot
f1cea95f3e
Merge "Fix battery color tint issue." into qt-dev
2019-04-08 15:03:58 +00:00
Svetoslav Ganov
d5161f8d90
Merge "Update Settings to use the proper DeviceConfig API." into qt-dev
2019-04-08 14:54:03 +00:00
Arc Wang
63b4c1ab85
Remove the PreferenceGroup without title in WifiNetworkDetailsFragment
...
To remove the PreferenceGroup title space.
Bug: 129683066
Test: manual
Change-Id: I00bced8038a01c0ef7e8f4dfa0b82e36a275004e
2019-04-08 20:19:11 +08:00