Commit Graph

47348 Commits

Author SHA1 Message Date
TreeHugger Robot
f2225d20f7 Merge "Fix special access summary text" 2018-08-23 02:13:20 +00:00
TreeHugger Robot
2534aea3c1 Merge "Remove unnecessary check when setting permission summary" 2018-08-23 01:33:39 +00:00
Fan Zhang
a2adcc57c8 Fix special access summary text
Use ApplicationState to count number of apps using unrestricted_data.

Change-Id: I083ff50e3e516536c87afa71d786b22e83d9a498
Fixes: 69313992
Test: robotests
2018-08-22 17:48:03 -07:00
Fan Zhang
e7c9744387 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
2018-08-22 17:06:58 -07:00
jackqdyulei
1becb7764d 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
2018-08-22 14:55:21 -07:00
TreeHugger Robot
b1fa21acd5 Merge "Import translations. DO NOT MERGE" 2018-08-22 19:22:33 +00:00
Bill Yi
49b4967c41 Import translations. DO NOT MERGE
Change-Id: I6b36fe9f3af6121ff58f7c6b32713df7e66b3b8f
Auto-generated-cl: translation import
2018-08-21 18:59:52 -07:00
Adrian Roos
48bbd85bd1 [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
2018-08-21 18:44:07 -07:00
Adrian Roos
c843167b3f [automerger skipped] DO NOT MERGE leverage default_theme string for display_cutout_emulation_device_default
am: 12c9be1255  -s ours

Change-Id: Iaeffe4999365f975887b336598a7ab4bf078c7b9
2018-08-21 16:43:39 -07:00
Fan Zhang
161ff18a0b Merge "Remove getExtraAction() from DashboardFeatureProvider." 2018-08-21 23:13:56 +00:00
Adrian Roos
e3ba5f6dfa [automerger skipped] Merge "Cutout emulation: string changes and ordering" into pi-dev am: 8d82158036
am: 80c53bce68  -s ours

Change-Id: Ie247f02047b3d1f646dbdd762e94d9daac6ff18b
2018-08-21 15:07:59 -07:00
Adrian Roos
12c9be1255 DO NOT MERGE leverage default_theme string for display_cutout_emulation_device_default
Bug: 112876936
Test: manual
Change-Id: I1a41b96f9f19a5d5854eb1cce214616e303ca4f9
2018-08-21 15:00:57 -07:00
TreeHugger Robot
68e9d6157a Merge "Remove condition manager v1 code." 2018-08-21 21:32:35 +00:00
Adrian Roos
80c53bce68 Merge "Cutout emulation: string changes and ordering" into pi-dev
am: 8d82158036

Change-Id: I6d6c191e1dc511d2ab6e563f7bbea27962fe7b63
2018-08-21 13:59:45 -07:00
TreeHugger Robot
8d82158036 Merge "Cutout emulation: string changes and ordering" into pi-dev 2018-08-21 20:49:37 +00:00
Fan Zhang
a4b14bd9f1 Remove condition manager v1 code.
Change-Id: I866c1f7c493c6080ccf766ecfc8e6b00dafeecd9
Fixes: 112485407
Test: robotests
2018-08-21 13:21:14 -07:00
Adrian Roos
2061a11073 Merge "Cutout emulation: string changes and ordering" 2018-08-21 19:53:56 +00:00
TreeHugger Robot
0aec0caed3 Merge "Use title in ManagedServiceSetting dialogs" 2018-08-21 19:14:59 +00:00
TreeHugger Robot
7e5ed0540f 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.
2018-08-21 19:01:31 +00:00
Adrian Roos
1be35697ed 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
2018-08-21 17:39:16 +00:00
Adrian Roos
57fcb2f1f1 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
2018-08-21 17:36:47 +00:00
Beverly
3cfa49e851 Use title in ManagedServiceSetting dialogs
- Use the title (not summary) of the preference in its warning dialogs

Test: manual
Bug: 112687996
Change-Id: Ia217e5252cf7a48450da853c0270093ffb57dca7
2018-08-21 12:46:00 -04:00
Fan Zhang
85a5f96051 Merge "Use searchable="false" to suppress nonIndexables." 2018-08-21 16:19:12 +00:00
Julia Reynolds
241a192a10 Fix notifications crash
Change-Id: I75a34beb124de92c0d7d9033e3fe21dbdeb67ed3
Fixes: 112656503
Test: manual
2018-08-21 10:41:47 -04:00
TreeHugger Robot
dcfb96ac06 Merge "Add RecyclerView for contextual settings homepage." 2018-08-21 00:49:31 +00:00
TreeHugger Robot
c748fee5d8 Merge "Refactor add network page" 2018-08-21 00:21:07 +00:00
Emily Chuang
150b2ba7ce Add RecyclerView for contextual settings homepage.
Bug: 111676964
Test: robotests
Change-Id: I36002a9085ca12ef027726c5a600ba833dd4f47e
2018-08-21 07:17:05 +08:00
Fan Zhang
d011d45da5 Remove getExtraAction() from DashboardFeatureProvider.
It's always set to null and not doing anything.

Bug: 111427617
Test: robotest
Change-Id: I7172a31056950b1597f0b98625a3a2615305e466
2018-08-20 16:14:16 -07:00
Fan Zhang
64951163b8 Use getSummary() to get tile summary text.
Bug: 77600770
Test: robotests
Change-Id: Iecef09853bb49bc259502494912ed81d52e2d7ce
2018-08-20 14:13:14 -07:00
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
Fan Zhang
9ce4a1fcde 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
2018-08-17 09:21:05 -07:00
tmfang
db00a3177a 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
2018-08-18 00:16:14 +08: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