Commit Graph

47317 Commits

Author SHA1 Message Date
Fan Zhang
54cfb64987 Use tile.getTitle(context) to get tile title.
And switch to getId() instead of title when comparing 2 tiles. This is
more accurate and more efficient.

Bug: 77600770
Test: robotests
Change-Id: I587d90702d98956bf7b420529ac3280351ca4a10
2018-08-20 12:50:06 -07:00
TreeHugger Robot
e97c21b58d Merge "Update the method name from isA2dpDevice() to isConnectedA2dpDevice()" 2018-08-20 18:02:35 +00:00
TreeHugger Robot
b45a9e95e1 Merge "Update the method name from isHfpDevice() to isConnectedHfpDevice()" 2018-08-20 17:53:24 +00:00
TreeHugger Robot
594efe5bf7 Merge "Don't offer "None" lock type for work profiles." 2018-08-20 16:39:30 +00:00
TreeHugger Robot
64664898f1 Merge "Refactor WifiSlice to CustomSliceManager" 2018-08-20 16:19:57 +00:00
Matthew Fritze
7f0a30226a Refactor WifiSlice to CustomSliceManager
Modify the WifiSliceCode to follow the pattern for
Slices that do not match existing UI components.

Test: robotests
Bug: 80263568
Change-Id: Id69e019608777282f4b64ff945e8c30c97aaf577
2018-08-20 08:03:34 -07:00
timhypeng
f00a43a3e3 Update the method name from isHfpDevice() to isConnectedHfpDevice()
Bug: 110072747
Test: make -j50 RunSettingsRoboTests
Change-Id: I4f42a4d55a107c870c76761434f4e5999ac76904
2018-08-20 16:05:02 +08:00
timhypeng
156d52e14f Update the method name from isA2dpDevice() to isConnectedA2dpDevice()
Bug: 110072747
Test: make -j50 RunSettingsRoboTests
Change-Id: Id3ceb3a62b888a2bde82a1372edf26454e525ea1
2018-08-20 15:53:37 +08:00
Pavel Grafov
45927898c7 Don't offer "None" lock type for work profiles.
"None" doesn't make sense for work profiles because it makes
profile insecure even if primary user is secure. If the user
wants to get rid of separate challenge, it will be offered in
previous Settings page, "Use one lock", so this shouldn't cause
any confusion.

Test: atest tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java
Test: manual, tried setting personal an work challenges from Settings and via Intent.
Bug: 33656033
Change-Id: I830b3e372c1fe200fc4e02d59e3c3805bac5f9bb
2018-08-17 22:07:12 +00:00
Hemant Gupta
6fdf8c225d Merge "Bluetooth: PBAP not disconnected on disabling contact sharing" am: 84bb2293ae am: ff985c6bc7
am: 0c75671a5f

Change-Id: Icc7d90a0e440d3d8f462d61821c602b26f79dbb7
2018-08-17 13:41:13 -07:00
Hemant Gupta
0c75671a5f Merge "Bluetooth: PBAP not disconnected on disabling contact sharing" am: 84bb2293ae
am: ff985c6bc7

Change-Id: I9c2c99a0f3999c550195b4ed7eed5a31caea9d2a
2018-08-17 12:57:33 -07:00
TreeHugger Robot
3df19f92b0 Merge "Fix indexing after slices api changes" 2018-08-17 19:15:23 +00:00
Hemant Gupta
ff985c6bc7 Merge "Bluetooth: PBAP not disconnected on disabling contact sharing"
am: 84bb2293ae

Change-Id: Ief10c8b5b3cdae90ba37a6349528f85e59562dc9
2018-08-17 12:11:27 -07:00
Fan Zhang
0fdc9ad6da [automerger skipped] Merge "Fix memory leaks in Settings" into pi-dev am: be13e74deb
am: 6136194c4d  -s ours

Change-Id: I5499ae3769b11cc22b68f4c1033fcff9d82b21cb
2018-08-17 11:55:38 -07:00
Fan Zhang
6136194c4d Merge "Fix memory leaks in Settings" into pi-dev
am: be13e74deb

Change-Id: I51e9c6682a0589afbdfcc8799b10598eac496396
2018-08-17 11:34:53 -07:00
Treehugger Robot
84bb2293ae Merge "Bluetooth: PBAP not disconnected on disabling contact sharing" 2018-08-17 18:05:21 +00:00
TreeHugger Robot
be13e74deb Merge "Fix memory leaks in Settings" into pi-dev 2018-08-17 18:04:44 +00:00
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