Commit Graph

47350 Commits

Author SHA1 Message Date
TreeHugger Robot
a439fec1c8 Merge changes Idb448ea3,I7dc26369
* changes:
  Fix crash on "Set up Wi-Fi NFC tag" dialog
  Fix bug about Wi-Fi dialog rotation
2018-08-17 15:35:20 +00:00
TreeHugger Robot
090d9b22df Merge "Remove LocalBluetoothAdapter from CachedBluetoothDeviceManager::addDevice()" 2018-08-17 08:51:17 +00:00
tmfang
5f7c991162 Fix crash on "Set up Wi-Fi NFC tag" dialog
When user launches "Set up Wi-Fi NFC tag" dialog
and then tries to rotate screen, device will
crash.
Because isShowing() of dialog won't return true
anymore when fragment calls onSaveIntance(),
we can't save status of dialog successfully.
And then, when fragment called onCreateDialog()
again, it can't get any dialog object.
So, we only check dialog whether is null or not.
If dialog is null, it means that there is no dialog
was shown before user rotates the screen.

Fixes: 112741721
Test: NFC tag wifi test, robo test

Change-Id: Idb448ea32c4215d8380c69bfd896cc91d8c1f8d1
2018-08-17 15:26:13 +08:00
tmfang
b53cdf09dd Fix bug about Wi-Fi dialog rotation
When user clicks a Wi-Fi access point in WifiSettings,
screen pops up a Wi-Fi point dialog. And then user
rotates the screen, Wi-Fi access dialog changes to
"Add network" full screen dialog.

In old code, we check whether dialog is showing by
dialog.isShowing() in onSaveInstanceState.
For now, this design is not appropriate. Since isShowing()
won't return true anymore when fragment calls onSaveInstanceState.

So, we check dialog object whether is null or not now.
If dialog is null, it means that there is no dialog was shown,
before user rotates the screen.

Change-Id: I7dc26369c005f576fe679abc70327f6a02620935
Fixes: 112624846
Test: manual test, robo test
2018-08-17 14:09:02 +08:00
ChenChen Chen
8b4b27efb3 Merge "Always show items in options menu for Wi-Fi Direct settings" am: 1e160cc8bf am: 0173130d73
am: c31869a940

Change-Id: I545d38612f05c35949d37037c0744a57bcf8164f
2018-08-16 20:46:02 -07:00
ChenChen Chen
c31869a940 Merge "Always show items in options menu for Wi-Fi Direct settings" am: 1e160cc8bf
am: 0173130d73

Change-Id: I7e70b3f2140301673b45beb3fb7ad7ed2d848a1d
2018-08-16 20:29:49 -07:00
Matthew Fritze
43f56d38af [automerger skipped] Merge "Hide SettingsSlice provider" into pi-dev am: 041bfbd2b6
am: e48cf70a96  -s ours

Change-Id: Ibac67440b71883a94d9e008d2cbf395c5b9a2a2e
2018-08-16 20:07:46 -07:00
ChenChen Chen
0173130d73 Merge "Always show items in options menu for Wi-Fi Direct settings"
am: 1e160cc8bf

Change-Id: Ie1edf750d2f205be97b07c84429e2c1468aa6c58
2018-08-16 17:39:00 -07:00
Matthew Fritze
e48cf70a96 Merge "Hide SettingsSlice provider" into pi-dev
am: 041bfbd2b6

Change-Id: I9e9f0cfc71a6352f7adfa3072a097dd126f38a29
2018-08-16 17:33:01 -07:00
TreeHugger Robot
259986da75 Merge "Add 'Reach to check' to lock screen settings" 2018-08-16 21:45:53 +00:00
TreeHugger Robot
041bfbd2b6 Merge "Hide SettingsSlice provider" into pi-dev 2018-08-16 21:23:17 +00:00
TreeHugger Robot
25ce6930b0 Merge "Refined the StrictMode for CardContentProvider" 2018-08-16 20:53:30 +00:00
TreeHugger Robot
8419e4d127 Merge "Check condition displayable state in parallel." 2018-08-16 20:18:20 +00:00
TreeHugger Robot
6c0a9e1e3c Merge "Launch work profile activity to add Autofill service" 2018-08-16 19:56:37 +00:00
Fan Zhang
723d39c950 Refined the StrictMode for CardContentProvider
- Modify CardContentProvider and add Mainthread checking

Bug: 111820446
Test: robotest
Change-Id: I7af25e8938b79c4c0fe225d58d59da4dde15ba45
2018-08-16 12:43:17 -07:00
Fan Zhang
2b575a40f3 Check condition displayable state in parallel.
This speeds up condition display by about 40 ms.

Bug: 112485407
Test: robotests still passes
Change-Id: Iac66354492496a9ece9178c438db6506e6fe7be5
2018-08-16 19:10:19 +00:00
Zimuzo
7193895c6a Launch work profile activity to add Autofill service
ag/4666330 allowed choosing separate Autofill services for the main and work profile. However, the 'Add service' button for work profile always resolved action_view intent as the main user even when clicking the work profile preference. Now the intent is resolved to the right profile depending on the preference clicked.

BUG: 112610177
Test: Verified manually
Change-Id: I870346d7b5618e7c230edebd59ac7f52f8495d47
2018-08-16 19:32:02 +01:00
TreeHugger Robot
059c9c8e5e Merge "Declare "searchable" attribute for preferences." 2018-08-16 17:20:37 +00:00
Treehugger Robot
1e160cc8bf Merge "Always show items in options menu for Wi-Fi Direct settings" 2018-08-16 17:15:40 +00:00
TreeHugger Robot
e45d89c5bc Merge "Fix typo in the SD Card Formatting screen." 2018-08-16 16:24:58 +00:00
Fan Zhang
a79c377fbc Declare "searchable" attribute for preferences.
Now we can easily mark a preference nonIndexable in xml instead of
adding key into searchIndexProvider.

Bug: 112608186
Test: robotests
Change-Id: I0ff16d44bb7b6ad148d3d35f09ca0da0163f73f4
2018-08-16 09:06:39 -07:00
TreeHugger Robot
3613fd07af Merge "Hide SettingsSlice provider" 2018-08-16 15:56:14 +00:00
TreeHugger Robot
119511154e Merge "Add colors to whitelist" 2018-08-16 15:48:56 +00:00
ChenChen Chen
16d1bf0cde Always show items in options menu for Wi-Fi Direct settings
Remove MenuItem.SHOW_AS_ACTION_IF_ROOM flag for menu items
to avoid showing truncated texts on action bar.

Bug: 112671955
Test: Manual
Change-Id: I1c9678321442169bc86d719e820d4af68261dee1
2018-08-16 15:13:33 +09:00
timhypeng
f43a1f185d Remove test-purpose constructor from SavedBluetoothDeviceUpdater
- replace mock object with ShadowBluetoothAdapter

Bug: 111848213
Test: make -j50 RunSettingsRoboTests
Change-Id: Iff69ed511b23846078925609bb603ae414956ea3
2018-08-16 01:25:01 +00:00
timhypeng
47a6dbcd94 Remove test-purpose constructor from AvailableMediaBluetoothDeviceUpdater
- replace mock object with ShadowCachedBluetoothDeviceManager to test CachedBluetoothDevice
- rename cachedDevices to mCachedDevices

Bug: 111848213
Test: make -j50 RunSettingsRoboTests
Change-Id: I3028a6fe06c39c48e7cee33976bdfcab2c8b73c8
2018-08-16 01:24:52 +00:00
timhypeng
273c6d3918 Remove test-purpose constructor from ConnectedBluetoothDeviceUpdater
- replace mock object with ShadowCachedBluetoothDeviceManager to test CachedBluetoothDevice
- rename cachedDevices to mCachedDevices

Bug: 111848213
Test: make -j50 RunSettingsRoboTests
Change-Id: Ib024a3e9c3af745b1ab0be36361165a547cfa756
2018-08-16 01:24:40 +00:00
Jordan Liu
1aabc2cc4e Merge "Refresh subscription info when subid changes" am: 5226ac6110 am: 114cacf2a8
am: 611d824110

Change-Id: I29492ef016c8ca9836ecf28c787e441629cfecb0
2018-08-15 18:23:10 -07:00
Jordan Liu
611d824110 Merge "Refresh subscription info when subid changes" am: 5226ac6110
am: 114cacf2a8

Change-Id: If8e2d3a2045b7db65856673a7aed5192d7ff4bc9
2018-08-15 17:06:22 -07:00
Kevin Chyn
520befff01 Add colors to whitelist
export ANDROID_LINT_JARS=$(gettop)/prebuilts/checkcolor/checkcolor.jar
lint --check HardCodedColor --xml color-check-baseline.xml .

Bug: 112005540

Test: builds
Change-Id: Ibac23dda42e797fc01141cbe85d232ba5ea63139
2018-08-15 17:04:42 -07:00
Jordan Liu
114cacf2a8 Merge "Refresh subscription info when subid changes"
am: 5226ac6110

Change-Id: I874fb7e8f3d3146cb614de3ee088e93c1863a592
2018-08-15 16:29:14 -07:00
Bill Yi
e34c5853e9 Fix typo in the SD Card Formatting screen.
credit: cl/208558166

TEST:none
Change-Id: I15e2f396ad1e1dd2364c9a2d38e3a34203e121ba
2018-08-15 23:06:50 +00:00
Mady Mellor
ef724a9f87 Fix indexing after slices api changes
Test: make -j40 RunSettingsGoogleRoboTests
      make -j40 RunSettingsRoboTests ROBOTEST_FILTER="Slice"
Change-Id: Ib599a8c814942a80d7b60fc3b40b284ce2b55775
2018-08-15 22:30:56 +00:00
TreeHugger Robot
ac03e735df Merge "Implement createPrefControllers for tether page" 2018-08-15 22:21:18 +00:00
Matthew Fritze
e8d66bb783 Hide SettingsSlice provider
Explicitly set the Settings SliceBroadcastReceiver to
be non-exported and remove the intent-filter.

Add a second provider: SliceRelayReceiver to receive
broadcasts from SysUI to alert Settings to potential
changes to bound Settings Slices. The new receiver is
exported, but only notifies changes to Settings, and
doesn't make any changes itself.

Change-Id: I80d070f7636614135ebe4f57a16f12a3eb6dee81
Fixes: 111330641
Test: boot, robolectric, Slicebrowser
2018-08-15 15:17:02 -07:00
Matthew Fritze
6409cf5c94 Hide SettingsSlice provider
Explicitly set the Settings SliceBroadcastReceiver to
be non-exported and remove the intent-filter.

Add a second provider: SliceRelayReceiver to receive
broadcasts from SysUI to alert Settings to potential
changes to bound Settings Slices. The new receiver is
exported, but only notifies changes to Settings, and
doesn't make any changes itself.

Change-Id: I422c0b07a61efa8996e9fdfa398eee84bbc1796f
Merged-In: I80d070f7636614135ebe4f57a16f12a3eb6dee81
Fixes: 111330641
Test: boot, robolectric, Slicebrowser
2018-08-15 15:09:34 -07:00
Jordan Liu
5226ac6110 Merge "Refresh subscription info when subid changes" 2018-08-15 21:48:01 +00:00
TreeHugger Robot
537d6f29f1 Merge "Disable bg restriction for "Disallow apps control"" 2018-08-15 21:15:06 +00:00
jackqdyulei
f5aa59e99e Implement createPrefControllers for tether page
So tether preferences could show up in search

Change-Id: I234680aff878451df2a634cb58538bb2627d2eff
Fixes: 112599941
Test: Robotests
2018-08-15 13:15:04 -07:00
Jordan Liu
b1facd2001 Refresh subscription info when subid changes
We store the initial subId and check if it has changed so that we always
have the updated subscription info in fillList().

Fixes: 111731641
Test: manually verify that swapping the SIM loads new APNs
Change-Id: I3475915f2c380fb67b2e56436423d491e489d91e
2018-08-15 11:37:24 -07:00
TreeHugger Robot
097cfa7251 Merge "Migrate all remaining condition cards to v2." 2018-08-15 18:02:35 +00:00
Fan Zhang
7373ec042b Migrate all remaining condition cards to v2.
Bug: 112485407
Test: robotests
Change-Id: I3c304c308fa6f499b4b5e21d4c5735cde7b90220
2018-08-15 09:48:38 -07:00
Jordan Liu
0f54511eb8 [automerger skipped] Merge "Reload APNs setting page when receive the intent ACTION_SUBSCRIPTION_CARRIER_IDENTITY_CHANGED" am: 5b7535d5b4 am: b951ba66e5
am: 63910710ef  -s ours

Change-Id: I577cb63948f594e0505ce9c19bb3cd1e9c4613f7
2018-08-15 04:54:56 -07:00
Jordan Liu
63910710ef Merge "Reload APNs setting page when receive the intent ACTION_SUBSCRIPTION_CARRIER_IDENTITY_CHANGED" am: 5b7535d5b4
am: b951ba66e5

Change-Id: I15b5f716f97efe9ba54a5dee25f2e0cbb33fecff
2018-08-15 00:44:42 -07:00
Kevin Chyn
af643d3690 Merge "7/n: Add enrollment animation" 2018-08-15 06:34:41 +00:00
Kevin Chyn
e9117d9b95 7/n: Add enrollment animation
Fixes: 112005540

Test: Tested with ag/4749121

Change-Id: I7d51187f7b8b7a6c2c34c984740b76bc9fd89262
2018-08-14 22:22:53 -07:00
timhypeng
f5c0145912 Remove LocalBluetoothAdapter from CachedBluetoothDeviceManager::addDevice()
Bug: 111815935
Test: make -j50 RunSettingsRoboTests

Change-Id: I5294439853ce35bccd883ed2aa21b33802d76cb1
2018-08-15 03:52:52 +00:00
Jordan Liu
b951ba66e5 Merge "Reload APNs setting page when receive the intent ACTION_SUBSCRIPTION_CARRIER_IDENTITY_CHANGED"
am: 5b7535d5b4

Change-Id: I7b1f6e53c521c0f17d17199de2f185eb64fd3c59
2018-08-14 20:09:31 -07:00
Jordan Liu
5b7535d5b4 Merge "Reload APNs setting page when receive the intent ACTION_SUBSCRIPTION_CARRIER_IDENTITY_CHANGED" 2018-08-14 23:54:12 +00:00
Xiangyu/Malcolm Chen
5d4bedb7d2 [automerger skipped] Merge "Use new SubscriptionInfo constructor" am: e8e24e7e0b am: 188272e12b
am: d78a882bb1  -s ours

Change-Id: Idffe865742097d74f4d5373a41c5c2cf240f0032
2018-08-14 16:25:53 -07:00