OSDN Git Service

android-x86/packages-apps-Settings.git
5 years agoAdd Settings Search Regression test
Matthew Fritze [Tue, 17 Jul 2018 20:47:39 +0000 (13:47 -0700)]
Add Settings Search Regression test

Take a snapshot of the currently available search results, and
verify that search results aren't accidentally removed.

We use 4 items to identify a search result:
- Title
- Data Key
- Slice Uri

We use Title & Key to identify the search result, since they should not change.
The Slice Uri is used to make sure we don't regress on Slice Availability.

Test: runtest --path packages/apps/Settings/tests/unit/src/com/android/settings/search/SettingsSearchResultRegressionTest.java
Change-Id: I22498229bbcd1e90c9e0a026af9df4367a98190a

6 years agoMerge "Hook up feature flag to mobile network controller"
Lei Yu [Thu, 23 Aug 2018 19:39:29 +0000 (19:39 +0000)]
Merge "Hook up feature flag to mobile network controller"

6 years agoMerge "Use BluetoothDevice.ACCESS_* instead of CachedBluetoothDevice.ACCESS_*"
TreeHugger Robot [Thu, 23 Aug 2018 19:09:48 +0000 (19:09 +0000)]
Merge "Use BluetoothDevice.ACCESS_* instead of CachedBluetoothDevice.ACCESS_*"

6 years ago[automerger skipped] Merge "DO NOT MERGE Fix summary text for advanced button." am...
Fan Zhang [Thu, 23 Aug 2018 18:20:07 +0000 (11:20 -0700)]
[automerger skipped] Merge "DO NOT MERGE Fix summary text for advanced button." am: da38b41b9a  -s ours am: 5c6f6949bf  -s ours
am: b984c81371  -s ours

Change-Id: I6d6584924602bf9f7d8f267cccfae8adce744f66

6 years ago[automerger skipped] Merge "DO NOT MERGE Fix summary text for advanced button." am...
Fan Zhang [Thu, 23 Aug 2018 18:13:33 +0000 (11:13 -0700)]
[automerger skipped] Merge "DO NOT MERGE Fix summary text for advanced button." am: da38b41b9a  -s ours
am: 5c6f6949bf  -s ours

Change-Id: I5857d75e1b068446ccfba8859c11e968bc7dade3

6 years ago[automerger skipped] Merge "DO NOT MERGE Fix summary text for advanced button."
Fan Zhang [Thu, 23 Aug 2018 18:08:32 +0000 (11:08 -0700)]
[automerger skipped] Merge "DO NOT MERGE Fix summary text for advanced button."
am: da38b41b9a  -s ours

Change-Id: I1dadf9bcd016e61ea04fe5b851e6430b1d63574d

6 years agoMerge "DO NOT MERGE Fix summary text for advanced button."
Treehugger Robot [Thu, 23 Aug 2018 17:38:38 +0000 (17:38 +0000)]
Merge "DO NOT MERGE Fix summary text for advanced button."

6 years agoDO NOT MERGE Fix summary text for advanced button.
Fan Zhang [Thu, 23 Aug 2018 16:25:18 +0000 (09:25 -0700)]
DO NOT MERGE Fix summary text for advanced button.

- the resource for the summary text is in the support library. However,
the prebuilt version in the build does not contain the latest change for
the summary text. Add the overlay for the summary resource here with the
updated translation to remove the redundant summary prefix in the
advanced button.

Change-Id: Ib6db0c402d79a2d965e6060b1851d7b898ae3f94
Fixes: 112986476
Bug: 111195268
Test: manual

6 years agoMerge "Check StorageWizardFormatConfirm runs smoothly"
TreeHugger Robot [Thu, 23 Aug 2018 15:56:18 +0000 (15:56 +0000)]
Merge "Check StorageWizardFormatConfirm runs smoothly"

6 years agoMerge "Check getLastCustomNonConfigurationInstance() works well"
TreeHugger Robot [Thu, 23 Aug 2018 15:52:00 +0000 (15:52 +0000)]
Merge "Check getLastCustomNonConfigurationInstance() works well"

6 years agoCheck StorageWizardFormatConfirm runs smoothly
Mill Chen [Thu, 23 Aug 2018 12:58:04 +0000 (20:58 +0800)]
Check StorageWizardFormatConfirm runs smoothly

- confirm that StorageWizardFormatConfirm works well after
  changing calling method from showAllowingStateLoss() to show().

Bug: 111150236
Test: manual
Change-Id: I0ad6c54aaa2572fc5798ede900e0a6d10d2fbd35

6 years agoCheck getLastCustomNonConfigurationInstance() works well
Mill Chen [Thu, 23 Aug 2018 06:27:49 +0000 (14:27 +0800)]
Check getLastCustomNonConfigurationInstance() works well

- make sure that StorageWizardFormatProgress runs smoothly.
- confirm that mTask has the same object id when changing the screen
orientation.

Bug: 111151113
Test: manual
Change-Id: I730c1b0f08e8a20a1aafa668fb02cd5a09fdd70a

6 years agoUse BluetoothDevice.ACCESS_* instead of CachedBluetoothDevice.ACCESS_*
hughchen [Mon, 20 Aug 2018 09:22:32 +0000 (17:22 +0800)]
Use BluetoothDevice.ACCESS_* instead of CachedBluetoothDevice.ACCESS_*

1. Use BluetoothDevice.ACCESS_* instead of CachedBluetoothDevice.ACCESS_*
2. Use BluetoothDevice.setPhonebookAccessPermission() directly.
3. Use BluetoothDevice.setMessageAccessPermission() directly.
4. Use BluetoothDevice.getPhonebookAccessPermission() directly.
5. Use BluetoothDevice.getMessageAccessPermission() directly.
6. Use BluetoothDevice.getSimAccessPermission() directly.

Bug: 112517004
Test: make -j42 RunSettingsRoboTests
Change-Id: Ibe6b207b891b9bd2b328a2e2c7264a9a78cb498f

6 years agoMerge "Fix special access summary text"
TreeHugger Robot [Thu, 23 Aug 2018 02:13:20 +0000 (02:13 +0000)]
Merge "Fix special access summary text"

6 years agoMerge "Remove unnecessary check when setting permission summary"
TreeHugger Robot [Thu, 23 Aug 2018 01:33:39 +0000 (01:33 +0000)]
Merge "Remove unnecessary check when setting permission summary"

6 years agoHook up feature flag to mobile network controller
jackqdyulei [Thu, 23 Aug 2018 00:45:23 +0000 (17:45 -0700)]
Hook up feature flag to mobile network controller

Send intent to phone process if the flag is false.

Bug: 113069948
Test: RunSettingsRoboTests
Change-Id: Ie9726470e718144557f318fe7ea28e863d63679c

6 years agoFix special access summary text
Fan Zhang [Wed, 22 Aug 2018 18:06:07 +0000 (11:06 -0700)]
Fix special access summary text

Use ApplicationState to count number of apps using unrestricted_data.

Change-Id: I083ff50e3e516536c87afa71d786b22e83d9a498
Fixes: 69313992
Test: robotests

6 years agoRemove unnecessary check when setting permission summary
Fan Zhang [Thu, 23 Aug 2018 00:04:57 +0000 (17:04 -0700)]
Remove unnecessary check when setting permission summary

Activity null check is probably necessary when this logic is written in
fragment, now the logic is in a controller where all dependencies are
self contained, so we don't need to check activity null here.

Change-Id: Ifa32e0d6563c411f19bec07f176765a7c94c8a40
Fixes: 112289663
Test: robotests

6 years agoFix the time flicker in battery settings page
jackqdyulei [Wed, 22 Aug 2018 21:44:29 +0000 (14:44 -0700)]
Fix the time flicker in battery settings page

Don't clear the text when reciever has been re-registered in
onResume(), where quickUpdate has been called.

Change-Id: Ie056dfb225a1bf6c224932b310a97499fc26e8f0
Fixes: 69312991
Test: RunSettingsRoboTests

6 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Wed, 22 Aug 2018 19:22:33 +0000 (19:22 +0000)]
Merge "Import translations. DO NOT MERGE"

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 22 Aug 2018 01:59:52 +0000 (18:59 -0700)]
Import translations. DO NOT MERGE

Change-Id: I6b36fe9f3af6121ff58f7c6b32713df7e66b3b8f
Auto-generated-cl: translation import

6 years ago[automerger skipped] DO NOT MERGE leverage default_theme string for display_cutout_em...
Adrian Roos [Wed, 22 Aug 2018 01:44:07 +0000 (18:44 -0700)]
[automerger skipped] DO NOT MERGE leverage default_theme string for display_cutout_emulation_device_default am: 12c9be1255  -s ours
am: c843167b3f  -s ours

Change-Id: I503f6e405a90d2e2b83794310da8f45bc4aa91c3

6 years ago[automerger skipped] DO NOT MERGE leverage default_theme string for display_cutout_em...
Adrian Roos [Tue, 21 Aug 2018 23:43:39 +0000 (16:43 -0700)]
[automerger skipped] DO NOT MERGE leverage default_theme string for display_cutout_emulation_device_default
am: 12c9be1255  -s ours

Change-Id: Iaeffe4999365f975887b336598a7ab4bf078c7b9

6 years agoMerge "Remove getExtraAction() from DashboardFeatureProvider."
Fan Zhang [Tue, 21 Aug 2018 23:13:56 +0000 (23:13 +0000)]
Merge "Remove getExtraAction() from DashboardFeatureProvider."

6 years ago[automerger skipped] Merge "Cutout emulation: string changes and ordering" into pi...
Adrian Roos [Tue, 21 Aug 2018 22:07:59 +0000 (15:07 -0700)]
[automerger skipped] Merge "Cutout emulation: string changes and ordering" into pi-dev am: 8d82158036
am: 80c53bce68  -s ours

Change-Id: Ie247f02047b3d1f646dbdd762e94d9daac6ff18b

6 years agoDO NOT MERGE leverage default_theme string for display_cutout_emulation_device_default
Adrian Roos [Tue, 21 Aug 2018 18:25:47 +0000 (20:25 +0200)]
DO NOT MERGE leverage default_theme string for display_cutout_emulation_device_default

Bug: 112876936
Test: manual
Change-Id: I1a41b96f9f19a5d5854eb1cce214616e303ca4f9

6 years agoMerge "Remove condition manager v1 code."
TreeHugger Robot [Tue, 21 Aug 2018 21:32:35 +0000 (21:32 +0000)]
Merge "Remove condition manager v1 code."

6 years agoMerge "Cutout emulation: string changes and ordering" into pi-dev
Adrian Roos [Tue, 21 Aug 2018 20:59:45 +0000 (13:59 -0700)]
Merge "Cutout emulation: string changes and ordering" into pi-dev
am: 8d82158036

Change-Id: I6d6c191e1dc511d2ab6e563f7bbea27962fe7b63

6 years agoMerge "Cutout emulation: string changes and ordering" into pi-dev
TreeHugger Robot [Tue, 21 Aug 2018 20:49:37 +0000 (20:49 +0000)]
Merge "Cutout emulation: string changes and ordering" into pi-dev

6 years agoRemove condition manager v1 code.
Fan Zhang [Tue, 21 Aug 2018 19:15:42 +0000 (12:15 -0700)]
Remove condition manager v1 code.

Change-Id: I866c1f7c493c6080ccf766ecfc8e6b00dafeecd9
Fixes: 112485407
Test: robotests

6 years agoMerge "Cutout emulation: string changes and ordering"
Adrian Roos [Tue, 21 Aug 2018 19:53:56 +0000 (19:53 +0000)]
Merge "Cutout emulation: string changes and ordering"

6 years agoMerge "Use title in ManagedServiceSetting dialogs"
TreeHugger Robot [Tue, 21 Aug 2018 19:14:59 +0000 (19:14 +0000)]
Merge "Use title in ManagedServiceSetting dialogs"

6 years agoMerge changes from topics "remove_tile_summary_cache", "remove_tile_title"
TreeHugger Robot [Tue, 21 Aug 2018 19:01:31 +0000 (19:01 +0000)]
Merge changes from topics "remove_tile_summary_cache", "remove_tile_title"

* changes:
  Use getSummary() to get tile summary text.
  Use tile.getTitle(context) to get tile title.

6 years agoCutout emulation: string changes and ordering
Adrian Roos [Tue, 21 Aug 2018 16:26:29 +0000 (18:26 +0200)]
Cutout emulation: string changes and ordering

Updates strings according to spec. Also ensures
that the emulation overlays are shown in the
order of their priority.

Bug: 112876936
Test: Open developer options, go to "display cutout", verify strings.
Change-Id: If2d05595d02a277896202ab2a6262c99508a3a17

6 years agoCutout emulation: string changes and ordering
Adrian Roos [Tue, 21 Aug 2018 16:26:29 +0000 (18:26 +0200)]
Cutout emulation: string changes and ordering

Updates strings according to spec. Also ensures
that the emulation overlays are shown in the
order of their priority.

Bug: 112876936
Test: Open developer options, go to "display cutout", verify strings.
Change-Id: If2d05595d02a277896202ab2a6262c99508a3a17
Merged-In: If2d05595d02a277896202ab2a6262c99508a3a17

6 years agoUse title in ManagedServiceSetting dialogs
Beverly [Tue, 21 Aug 2018 15:35:54 +0000 (11:35 -0400)]
Use title in ManagedServiceSetting dialogs

- Use the title (not summary) of the preference in its warning dialogs

Test: manual
Bug: 112687996
Change-Id: Ia217e5252cf7a48450da853c0270093ffb57dca7

6 years agoMerge "Use searchable="false" to suppress nonIndexables."
Fan Zhang [Tue, 21 Aug 2018 16:19:12 +0000 (16:19 +0000)]
Merge "Use searchable="false" to suppress nonIndexables."

6 years agoFix notifications crash
Julia Reynolds [Tue, 21 Aug 2018 14:39:07 +0000 (10:39 -0400)]
Fix notifications crash

Change-Id: I75a34beb124de92c0d7d9033e3fe21dbdeb67ed3
Fixes: 112656503
Test: manual

6 years agoMerge "Add RecyclerView for contextual settings homepage."
TreeHugger Robot [Tue, 21 Aug 2018 00:49:31 +0000 (00:49 +0000)]
Merge "Add RecyclerView for contextual settings homepage."

6 years agoMerge "Refactor add network page"
TreeHugger Robot [Tue, 21 Aug 2018 00:21:07 +0000 (00:21 +0000)]
Merge "Refactor add network page"

6 years agoAdd RecyclerView for contextual settings homepage.
Emily Chuang [Mon, 20 Aug 2018 23:17:05 +0000 (07:17 +0800)]
Add RecyclerView for contextual settings homepage.

Bug: 111676964
Test: robotests
Change-Id: I36002a9085ca12ef027726c5a600ba833dd4f47e

6 years agoRemove getExtraAction() from DashboardFeatureProvider.
Fan Zhang [Mon, 20 Aug 2018 23:00:26 +0000 (16:00 -0700)]
Remove getExtraAction() from DashboardFeatureProvider.

It's always set to null and not doing anything.

Bug: 111427617
Test: robotest
Change-Id: I7172a31056950b1597f0b98625a3a2615305e466

6 years agoUse getSummary() to get tile summary text.
Fan Zhang [Mon, 20 Aug 2018 21:13:14 +0000 (14:13 -0700)]
Use getSummary() to get tile summary text.

Bug: 77600770
Test: robotests
Change-Id: Iecef09853bb49bc259502494912ed81d52e2d7ce

6 years agoUse tile.getTitle(context) to get tile title.
Fan Zhang [Fri, 17 Aug 2018 18:36:20 +0000 (11:36 -0700)]
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

6 years agoMerge "Update the method name from isA2dpDevice() to isConnectedA2dpDevice()"
TreeHugger Robot [Mon, 20 Aug 2018 18:02:35 +0000 (18:02 +0000)]
Merge "Update the method name from isA2dpDevice() to isConnectedA2dpDevice()"

6 years agoMerge "Update the method name from isHfpDevice() to isConnectedHfpDevice()"
TreeHugger Robot [Mon, 20 Aug 2018 17:53:24 +0000 (17:53 +0000)]
Merge "Update the method name from isHfpDevice() to isConnectedHfpDevice()"

6 years agoMerge "Don't offer "None" lock type for work profiles."
TreeHugger Robot [Mon, 20 Aug 2018 16:39:30 +0000 (16:39 +0000)]
Merge "Don't offer "None" lock type for work profiles."

6 years agoMerge "Refactor WifiSlice to CustomSliceManager"
TreeHugger Robot [Mon, 20 Aug 2018 16:19:57 +0000 (16:19 +0000)]
Merge "Refactor WifiSlice to CustomSliceManager"

6 years agoRefactor WifiSlice to CustomSliceManager
Matthew Fritze [Fri, 20 Jul 2018 16:41:40 +0000 (09:41 -0700)]
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

6 years agoUpdate the method name from isHfpDevice() to isConnectedHfpDevice()
timhypeng [Mon, 20 Aug 2018 08:03:02 +0000 (16:03 +0800)]
Update the method name from isHfpDevice() to isConnectedHfpDevice()

Bug: 110072747
Test: make -j50 RunSettingsRoboTests
Change-Id: I4f42a4d55a107c870c76761434f4e5999ac76904

6 years agoUpdate the method name from isA2dpDevice() to isConnectedA2dpDevice()
timhypeng [Mon, 20 Aug 2018 07:53:37 +0000 (15:53 +0800)]
Update the method name from isA2dpDevice() to isConnectedA2dpDevice()

Bug: 110072747
Test: make -j50 RunSettingsRoboTests
Change-Id: Id3ceb3a62b888a2bde82a1372edf26454e525ea1

6 years agoDon't offer "None" lock type for work profiles.
Pavel Grafov [Wed, 15 Aug 2018 20:07:01 +0000 (21:07 +0100)]
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

6 years agoMerge "Bluetooth: PBAP not disconnected on disabling contact sharing" am: 84bb2293ae...
Hemant Gupta [Fri, 17 Aug 2018 20:41:13 +0000 (13:41 -0700)]
Merge "Bluetooth: PBAP not disconnected on disabling contact sharing" am: 84bb2293ae am: ff985c6bc7
am: 0c75671a5f

Change-Id: Icc7d90a0e440d3d8f462d61821c602b26f79dbb7

6 years agoMerge "Bluetooth: PBAP not disconnected on disabling contact sharing" am: 84bb2293ae
Hemant Gupta [Fri, 17 Aug 2018 19:57:33 +0000 (12:57 -0700)]
Merge "Bluetooth: PBAP not disconnected on disabling contact sharing" am: 84bb2293ae
am: ff985c6bc7

Change-Id: I9c2c99a0f3999c550195b4ed7eed5a31caea9d2a

6 years agoMerge "Fix indexing after slices api changes"
TreeHugger Robot [Fri, 17 Aug 2018 19:15:23 +0000 (19:15 +0000)]
Merge "Fix indexing after slices api changes"

6 years agoMerge "Bluetooth: PBAP not disconnected on disabling contact sharing"
Hemant Gupta [Fri, 17 Aug 2018 19:11:27 +0000 (12:11 -0700)]
Merge "Bluetooth: PBAP not disconnected on disabling contact sharing"
am: 84bb2293ae

Change-Id: Ief10c8b5b3cdae90ba37a6349528f85e59562dc9

6 years ago[automerger skipped] Merge "Fix memory leaks in Settings" into pi-dev am: be13e74deb
Fan Zhang [Fri, 17 Aug 2018 18:55:38 +0000 (11:55 -0700)]
[automerger skipped] Merge "Fix memory leaks in Settings" into pi-dev am: be13e74deb
am: 6136194c4d  -s ours

Change-Id: I5499ae3769b11cc22b68f4c1033fcff9d82b21cb

6 years agoMerge "Fix memory leaks in Settings" into pi-dev
Fan Zhang [Fri, 17 Aug 2018 18:34:53 +0000 (11:34 -0700)]
Merge "Fix memory leaks in Settings" into pi-dev
am: be13e74deb

Change-Id: I51e9c6682a0589afbdfcc8799b10598eac496396

6 years agoMerge "Bluetooth: PBAP not disconnected on disabling contact sharing"
Treehugger Robot [Fri, 17 Aug 2018 18:05:21 +0000 (18:05 +0000)]
Merge "Bluetooth: PBAP not disconnected on disabling contact sharing"

6 years agoMerge "Fix memory leaks in Settings" into pi-dev
TreeHugger Robot [Fri, 17 Aug 2018 18:04:44 +0000 (18:04 +0000)]
Merge "Fix memory leaks in Settings" into pi-dev

6 years agoUse searchable="false" to suppress nonIndexables.
Fan Zhang [Wed, 15 Aug 2018 19:55:56 +0000 (12:55 -0700)]
Use searchable="false" to suppress nonIndexables.

When possible, remove or simplify getNonIndexable() logic in fragments,
and use searchable="false" in xml to suppress index.

Change-Id: I5bdf5bc7d5494a64cdd9e230a51321a4b210af69
Fixes: 112608186
Test: robotest and manual search

6 years agoRefactor add network page
tmfang [Thu, 9 Aug 2018 16:25:47 +0000 (00:25 +0800)]
Refactor add network page

WifiDialog.java can be launched as "full screen mode"
in some use cases. However the way it's done is that
it uses theme to fake the full screen appearance.
It just feels hacky to use a dialog for full screen UI.
So, we created an "AddNetworkFragment" to make this
page can look like a normal fragment.

Also, clean up some useless code about "full screen mode"
of WifiDialog.

Change-Id: Iedd04c6a8e403cbceb872313314e1cba0d514246
Fixes: 111875856
Test: robo test, manual test

6 years agoMerge changes Idb448ea3,I7dc26369
TreeHugger Robot [Fri, 17 Aug 2018 15:35:20 +0000 (15:35 +0000)]
Merge changes Idb448ea3,I7dc26369

* changes:
  Fix crash on "Set up Wi-Fi NFC tag" dialog
  Fix bug about Wi-Fi dialog rotation

6 years agoMerge "Remove LocalBluetoothAdapter from CachedBluetoothDeviceManager::addDevice()"
TreeHugger Robot [Fri, 17 Aug 2018 08:51:17 +0000 (08:51 +0000)]
Merge "Remove LocalBluetoothAdapter from CachedBluetoothDeviceManager::addDevice()"

6 years agoFix crash on "Set up Wi-Fi NFC tag" dialog
tmfang [Fri, 17 Aug 2018 07:16:12 +0000 (15:16 +0800)]
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

6 years agoFix bug about Wi-Fi dialog rotation
tmfang [Thu, 16 Aug 2018 06:20:29 +0000 (14:20 +0800)]
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

6 years agoMerge "Always show items in options menu for Wi-Fi Direct settings" am: 1e160cc8bf...
ChenChen Chen [Fri, 17 Aug 2018 03:46:02 +0000 (20:46 -0700)]
Merge "Always show items in options menu for Wi-Fi Direct settings" am: 1e160cc8bf am: 0173130d73
am: c31869a940

Change-Id: I545d38612f05c35949d37037c0744a57bcf8164f

6 years agoMerge "Always show items in options menu for Wi-Fi Direct settings" am: 1e160cc8bf
ChenChen Chen [Fri, 17 Aug 2018 03:29:49 +0000 (20:29 -0700)]
Merge "Always show items in options menu for Wi-Fi Direct settings" am: 1e160cc8bf
am: 0173130d73

Change-Id: I7e70b3f2140301673b45beb3fb7ad7ed2d848a1d

6 years ago[automerger skipped] Merge "Hide SettingsSlice provider" into pi-dev am: 041bfbd2b6
Matthew Fritze [Fri, 17 Aug 2018 03:07:46 +0000 (20:07 -0700)]
[automerger skipped] Merge "Hide SettingsSlice provider" into pi-dev am: 041bfbd2b6
am: e48cf70a96  -s ours

Change-Id: Ibac67440b71883a94d9e008d2cbf395c5b9a2a2e

6 years agoMerge "Always show items in options menu for Wi-Fi Direct settings"
ChenChen Chen [Fri, 17 Aug 2018 00:39:00 +0000 (17:39 -0700)]
Merge "Always show items in options menu for Wi-Fi Direct settings"
am: 1e160cc8bf

Change-Id: Ie1edf750d2f205be97b07c84429e2c1468aa6c58

6 years agoMerge "Hide SettingsSlice provider" into pi-dev
Matthew Fritze [Fri, 17 Aug 2018 00:33:01 +0000 (17:33 -0700)]
Merge "Hide SettingsSlice provider" into pi-dev
am: 041bfbd2b6

Change-Id: I9e9f0cfc71a6352f7adfa3072a097dd126f38a29

6 years agoMerge "Add 'Reach to check' to lock screen settings"
TreeHugger Robot [Thu, 16 Aug 2018 21:45:53 +0000 (21:45 +0000)]
Merge "Add 'Reach to check' to lock screen settings"

6 years agoMerge "Hide SettingsSlice provider" into pi-dev
TreeHugger Robot [Thu, 16 Aug 2018 21:23:17 +0000 (21:23 +0000)]
Merge "Hide SettingsSlice provider" into pi-dev

6 years agoMerge "Refined the StrictMode for CardContentProvider"
TreeHugger Robot [Thu, 16 Aug 2018 20:53:30 +0000 (20:53 +0000)]
Merge "Refined the StrictMode for CardContentProvider"

6 years agoMerge "Check condition displayable state in parallel."
TreeHugger Robot [Thu, 16 Aug 2018 20:18:20 +0000 (20:18 +0000)]
Merge "Check condition displayable state in parallel."

6 years agoMerge "Launch work profile activity to add Autofill service"
TreeHugger Robot [Thu, 16 Aug 2018 19:56:37 +0000 (19:56 +0000)]
Merge "Launch work profile activity to add Autofill service"

6 years agoRefined the StrictMode for CardContentProvider
Fan Zhang [Thu, 16 Aug 2018 19:13:30 +0000 (12:13 -0700)]
Refined the StrictMode for CardContentProvider

- Modify CardContentProvider and add Mainthread checking

Bug: 111820446
Test: robotest
Change-Id: I7af25e8938b79c4c0fe225d58d59da4dde15ba45

6 years agoCheck condition displayable state in parallel.
Fan Zhang [Thu, 16 Aug 2018 17:41:08 +0000 (10:41 -0700)]
Check condition displayable state in parallel.

This speeds up condition display by about 40 ms.

Bug: 112485407
Test: robotests still passes
Change-Id: Iac66354492496a9ece9178c438db6506e6fe7be5

6 years agoLaunch work profile activity to add Autofill service
Zimuzo [Wed, 15 Aug 2018 14:10:20 +0000 (15:10 +0100)]
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

6 years agoMerge "Declare "searchable" attribute for preferences."
TreeHugger Robot [Thu, 16 Aug 2018 17:20:37 +0000 (17:20 +0000)]
Merge "Declare "searchable" attribute for preferences."

6 years agoMerge "Always show items in options menu for Wi-Fi Direct settings"
Treehugger Robot [Thu, 16 Aug 2018 17:15:40 +0000 (17:15 +0000)]
Merge "Always show items in options menu for Wi-Fi Direct settings"

6 years agoMerge "Fix typo in the SD Card Formatting screen."
TreeHugger Robot [Thu, 16 Aug 2018 16:24:58 +0000 (16:24 +0000)]
Merge "Fix typo in the SD Card Formatting screen."

6 years agoDeclare "searchable" attribute for preferences.
Fan Zhang [Tue, 14 Aug 2018 23:25:54 +0000 (16:25 -0700)]
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

6 years agoMerge "Hide SettingsSlice provider"
TreeHugger Robot [Thu, 16 Aug 2018 15:56:14 +0000 (15:56 +0000)]
Merge "Hide SettingsSlice provider"

6 years agoMerge "Add colors to whitelist"
TreeHugger Robot [Thu, 16 Aug 2018 15:48:56 +0000 (15:48 +0000)]
Merge "Add colors to whitelist"

6 years agoAlways show items in options menu for Wi-Fi Direct settings
ChenChen Chen [Tue, 14 Aug 2018 06:27:25 +0000 (14:27 +0800)]
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

6 years agoRemove test-purpose constructor from SavedBluetoothDeviceUpdater
timhypeng [Tue, 14 Aug 2018 10:45:18 +0000 (18:45 +0800)]
Remove test-purpose constructor from SavedBluetoothDeviceUpdater

- replace mock object with ShadowBluetoothAdapter

Bug: 111848213
Test: make -j50 RunSettingsRoboTests
Change-Id: Iff69ed511b23846078925609bb603ae414956ea3

6 years agoRemove test-purpose constructor from AvailableMediaBluetoothDeviceUpdater
timhypeng [Tue, 14 Aug 2018 02:30:50 +0000 (10:30 +0800)]
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

6 years agoRemove test-purpose constructor from ConnectedBluetoothDeviceUpdater
timhypeng [Mon, 13 Aug 2018 09:38:36 +0000 (17:38 +0800)]
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

6 years agoMerge "Refresh subscription info when subid changes" am: 5226ac6110 am: 114cacf2a8
Jordan Liu [Thu, 16 Aug 2018 01:23:10 +0000 (18:23 -0700)]
Merge "Refresh subscription info when subid changes" am: 5226ac6110 am: 114cacf2a8
am: 611d824110

Change-Id: I29492ef016c8ca9836ecf28c787e441629cfecb0

6 years agoMerge "Refresh subscription info when subid changes" am: 5226ac6110
Jordan Liu [Thu, 16 Aug 2018 00:06:22 +0000 (17:06 -0700)]
Merge "Refresh subscription info when subid changes" am: 5226ac6110
am: 114cacf2a8

Change-Id: If8e2d3a2045b7db65856673a7aed5192d7ff4bc9

6 years agoAdd colors to whitelist
Kevin Chyn [Thu, 16 Aug 2018 00:02:11 +0000 (17:02 -0700)]
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

6 years agoMerge "Refresh subscription info when subid changes"
Jordan Liu [Wed, 15 Aug 2018 23:29:14 +0000 (16:29 -0700)]
Merge "Refresh subscription info when subid changes"
am: 5226ac6110

Change-Id: I874fb7e8f3d3146cb614de3ee088e93c1863a592

6 years agoFix typo in the SD Card Formatting screen.
Bill Yi [Tue, 14 Aug 2018 22:00:13 +0000 (15:00 -0700)]
Fix typo in the SD Card Formatting screen.

credit: cl/208558166

TEST:none
Change-Id: I15e2f396ad1e1dd2364c9a2d38e3a34203e121ba

6 years agoFix indexing after slices api changes
Mady Mellor [Wed, 15 Aug 2018 22:11:51 +0000 (15:11 -0700)]
Fix indexing after slices api changes

Test: make -j40 RunSettingsGoogleRoboTests
      make -j40 RunSettingsRoboTests ROBOTEST_FILTER="Slice"
Change-Id: Ib599a8c814942a80d7b60fc3b40b284ce2b55775

6 years agoMerge "Implement createPrefControllers for tether page"
TreeHugger Robot [Wed, 15 Aug 2018 22:21:18 +0000 (22:21 +0000)]
Merge "Implement createPrefControllers for tether page"

6 years agoHide SettingsSlice provider
Matthew Fritze [Mon, 30 Jul 2018 21:12:50 +0000 (14:12 -0700)]
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

6 years agoHide SettingsSlice provider
Matthew Fritze [Mon, 30 Jul 2018 21:12:50 +0000 (14:12 -0700)]
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

6 years agoMerge "Refresh subscription info when subid changes"
Jordan Liu [Wed, 15 Aug 2018 21:48:01 +0000 (21:48 +0000)]
Merge "Refresh subscription info when subid changes"

6 years agoMerge "Disable bg restriction for "Disallow apps control""
TreeHugger Robot [Wed, 15 Aug 2018 21:15:06 +0000 (21:15 +0000)]
Merge "Disable bg restriction for "Disallow apps control""