Daniel Nishi
0f127e98e5
Merge "Don't crash on opening ejecting USB." into oc-dev am: 32f95292bf
...
am: 3803bb966d
Change-Id: Ie26202f072f11983f2f1883811585f77db40f84d
2017-04-26 17:05:59 +00:00
Tobias Thierer
5ce67493c3
resolve merge conflicts of 999f6a9a29 to master
...
Test: make
Change-Id: If37a66bc38d0fd02ef7465e9be86032c2aff6314
2017-04-26 12:21:23 +01:00
Julia Reynolds
e760f01788
Merge "'Allow sound' = let the app decide" into oc-dev am: f9bfab880e
...
am: bcf0c83ae2
Change-Id: Iedb174e98bae903b663f1f925ccdda0d7d4ca4a3
2017-04-26 10:56:34 +00:00
jackqdyulei
6a9e198851
Merge "Distribute the misc among all the apps" into oc-dev am: e494a3e59b
...
am: 0fbccaa30b
Change-Id: I901cff477dd1ad86a90a096a99346a745696854c
2017-04-26 10:56:15 +00:00
jackqdyulei
89f27bcc2d
Merge "Move battery stats loading to AsyncLoader." into oc-dev am: d0ea1386ad
...
am: 303672f1d3
Change-Id: I70f8b843f79ddac4a4dd80834a09846296e33667
2017-04-26 10:55:55 +00:00
Fan Zhang
2e02794115
Merge changes I4ae01109,Ib45289c3 into oc-dev am: eda3e8c3d9
...
am: 7d04b2dab0
Change-Id: Ieece29f0f8488a9932aa96be6958430337df8d4e
2017-04-26 10:55:34 +00:00
Ruchi Kandoi
068ba85a7e
Merge "Add searchable index for Bluetooth and Nfc only if the feature exists" into oc-dev am: 41a858fde1
...
am: 7094f1d170
Change-Id: Idde8d3b3782d8a6d111a9314a6a458ec650405e0
2017-04-26 10:55:10 +00:00
Charles He
073da5c4d9
Merge "Prevent fingerprint from bypassing work challenge" into oc-dev am: 24157209c5
...
am: 9c5e338850
Change-Id: Iba669e6ed51ed548d861001924847188c34c9c35
2017-04-26 10:54:38 +00:00
Fan Zhang
0576ea48b5
resolve merge conflicts of e8411c4454 to master
...
Test: make RunSettingsRoboTests
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I7575438bf364f3f4a6ea0372e6216fd5d5a5bb69
2017-04-25 16:16:12 -07:00
Daniel Nishi
3803bb966d
Merge "Don't crash on opening ejecting USB." into oc-dev
...
am: 32f95292bf
Change-Id: Iaceb5e9ec424cf8dc175ab4d2645c50eacc86408
2017-04-25 22:39:35 +00:00
Felipe Leme
999f6a9a29
Merge "Implemented ACTION_REQUEST_SET_AUTOFILL_SERVICE." into oc-dev
...
am: c36ed203db
Change-Id: I5c27b2def2e7bea0c0cf575f5ff18db032b4519d
2017-04-25 22:38:20 +00:00
Daniel Nishi
32f95292bf
Merge "Don't crash on opening ejecting USB." into oc-dev
2017-04-25 22:30:14 +00:00
TreeHugger Robot
c36ed203db
Merge "Implemented ACTION_REQUEST_SET_AUTOFILL_SERVICE." into oc-dev
2017-04-25 22:27:09 +00:00
Fan Zhang
bd3cbf44ac
Merge "Update account sync settings title." into oc-dev am: a031636725
...
am: c669438450
Change-Id: I5a163d5e3902c04f1006a15e4a330f55f6af0ef9
2017-04-25 22:19:10 +00:00
jackqdyulei
bf922da309
Merge "Remove STATE_TOP_SLEEPING from foreground time" into oc-dev am: e5fa4cd4b5
...
am: 1bc54ae5eb
Change-Id: I065332475ad70ef81367e37b608e1c18f358d6d6
2017-04-25 22:18:50 +00:00
Stephen Chen
d2fb2b7718
Merge "Make connected Wi-Fi message multiline to avoid cutoff." into oc-dev am: 6c85dbaea2
...
am: ae7d423c74
Change-Id: If846d21a52c35a67db443e6edee2074d28791386
2017-04-25 22:18:28 +00:00
Julia Reynolds
bcf0c83ae2
Merge "'Allow sound' = let the app decide" into oc-dev
...
am: f9bfab880e
Change-Id: I6f0fa367832a2b02af2b05ce563f59f8cf77ead2
2017-04-25 21:56:00 +00:00
jackqdyulei
0fbccaa30b
Merge "Distribute the misc among all the apps" into oc-dev
...
am: e494a3e59b
Change-Id: I58dbff46d38402162ce69e49f8d647efcb64fff2
2017-04-25 21:55:34 +00:00
jackqdyulei
303672f1d3
Merge "Move battery stats loading to AsyncLoader." into oc-dev
...
am: d0ea1386ad
Change-Id: Ic9e7b20ab191224061a7c43f2292978daa43582e
2017-04-25 21:55:10 +00:00
TreeHugger Robot
f9bfab880e
Merge "'Allow sound' = let the app decide" into oc-dev
2017-04-25 21:45:20 +00:00
TreeHugger Robot
e494a3e59b
Merge "Distribute the misc among all the apps" into oc-dev
2017-04-25 21:44:55 +00:00
TreeHugger Robot
d0ea1386ad
Merge "Move battery stats loading to AsyncLoader." into oc-dev
2017-04-25 21:44:06 +00:00
Daniel Sheng
e531c540c2
Merge "Added settings UI for camera lift trigger gesture"
2017-04-25 20:43:55 +00:00
Daniel Sheng
4cdc1d98b1
Merge "Added suggestion category for camera lift gesture"
2017-04-25 20:43:55 +00:00
Felipe Leme
db2b55a244
Implemented ACTION_REQUEST_SET_AUTOFILL_SERVICE.
...
Bug: 37673809
Fixes: 37576671
Test: manual verification
Test: make RunSettingsRoboTests -j90
Change-Id: I36170cb715473dfbf598deedd9719a46168aabc8
2017-04-25 13:30:05 -07:00
jackqdyulei
106dc459e0
Move battery stats loading to AsyncLoader.
...
It takes 3-4 seconds to load the battery settings page in Ryu. Main
reason is that it takes too long to init BatteryStatsHelper.
This cl moves loading code to AsyncLoader, and we will refresh ui once
the loading part is finished.
Following cl will add animation for the battery header to make it not
so janky
Bug: 37196170
Test: RunSettingsRoboTest
Change-Id: I40dfdde4a072e28a56c8fdf0ec6d671b5109fc6d
2017-04-25 13:26:17 -07:00
Fan Zhang
7d04b2dab0
Merge changes I4ae01109,Ib45289c3 into oc-dev
...
am: eda3e8c3d9
Change-Id: I897373ce37fd8352edb27ef954b1dc7792ea7026
2017-04-25 20:22:45 +00:00
TreeHugger Robot
eda3e8c3d9
Merge changes I4ae01109,Ib45289c3 into oc-dev
...
* changes:
Remove shadow below app info header.
Fix ANR in installed app details.
2017-04-25 20:16:20 +00:00
Ruchi Kandoi
7094f1d170
Merge "Add searchable index for Bluetooth and Nfc only if the feature exists" into oc-dev
...
am: 41a858fde1
Change-Id: Ida195181c34d5f53ea544b1a0c81d3154385219e
2017-04-25 19:20:06 +00:00
TreeHugger Robot
41a858fde1
Merge "Add searchable index for Bluetooth and Nfc only if the feature exists" into oc-dev
2017-04-25 19:05:42 +00:00
Charles He
9c5e338850
Merge "Prevent fingerprint from bypassing work challenge" into oc-dev
...
am: 24157209c5
Change-Id: I9d024aa89a2cf5315ef8e70d5bc93a472411d242
2017-04-25 19:01:35 +00:00
Fan Zhang
e8411c4454
Merge "Properly check wallpaper state before showing suggestion" into oc-dev
...
am: db68ddc1cc
Change-Id: I9fb77a7f0b01e694d51a4a08ae6f925dc868ce80
2017-04-25 18:59:52 +00:00
Fan Zhang
c669438450
Merge "Update account sync settings title." into oc-dev
...
am: a031636725
Change-Id: I77a1df15ab010b355ff1ccd8eb2da98c99487c32
2017-04-25 18:59:34 +00:00
TreeHugger Robot
24157209c5
Merge "Prevent fingerprint from bypassing work challenge" into oc-dev
2017-04-25 18:59:34 +00:00
Fan Zhang
db68ddc1cc
Merge "Properly check wallpaper state before showing suggestion" into oc-dev
2017-04-25 18:55:53 +00:00
Fan Zhang
a031636725
Merge "Update account sync settings title." into oc-dev
2017-04-25 18:55:29 +00:00
jackqdyulei
1bc54ae5eb
Merge "Remove STATE_TOP_SLEEPING from foreground time" into oc-dev
...
am: e5fa4cd4b5
Change-Id: Ic54a96a1fe33a8e733762b40cd3c8a1751619ce4
2017-04-25 18:53:30 +00:00
Stephen Chen
ae7d423c74
Merge "Make connected Wi-Fi message multiline to avoid cutoff." into oc-dev
...
am: 6c85dbaea2
Change-Id: Ie4e338759eb5e926297aa2691161dbf7fe16199c
2017-04-25 18:53:07 +00:00
jackqdyulei
a245188a65
Distribute the misc among all the apps
...
Distribute it in:
1. Battery main page(PowerUsageSummary)
2. Advanced battery page(PowerUsageAdvanced)
Bug: 37487061
Test: RunSettingsRoboTests
Change-Id: Id1810b81a6b380d908bcdc18421530e938578c37
2017-04-25 11:48:24 -07:00
TreeHugger Robot
e5fa4cd4b5
Merge "Remove STATE_TOP_SLEEPING from foreground time" into oc-dev
2017-04-25 18:36:01 +00:00
TreeHugger Robot
6c85dbaea2
Merge "Make connected Wi-Fi message multiline to avoid cutoff." into oc-dev
2017-04-25 18:33:50 +00:00
Fan Zhang
37b77bd232
Remove shadow below app info header.
...
Bug: 37670670
Test: visual
Change-Id: I4ae011098537a970568f9fa72c49847a595a7fe0
2017-04-25 11:18:30 -07:00
Denis Kuznetsov
f0a61dd112
DO Disclosures: detailed application lists
...
Add UI that lists enterprise set default apps for handling important intents
(opening browser, using camera, phone, etc).
Bug: 32692748
Test: m RunSettingsRoboTests
Change-Id: I75bb97d1b3728b1dcb90981b24d12edf510c4b04
2017-04-25 16:53:17 +02:00
Julia Reynolds
8da8951b4b
'Allow sound' = let the app decide
...
Bug: 37479730
Test: manual
Change-Id: Ia5073dd0ef79664229c5aff0b89e7ef36edb68ee
2017-04-25 08:53:26 -04:00
Denis Kuznetsov
60b2960cbb
DO Disclosure: add UI that lists apps that were managed by owner:
...
- had permissions granted by admin
- were installed by owner via policy
Bug: 32692748
Test: m RunSettingsRoboTests
Change-Id: I365e2f8f351671e68f83cceb7c0ca241d7a5a588
2017-04-25 11:08:56 +02:00
Fan Zhang
f6126e7a00
Fix ANR in installed app details.
...
InstalledAppDetails tries to refreshUi whenever something about a
package changes. It does not need to refresh when the changing package
is different from what's being displayed.
Change-Id: Ib45289c39ee402cf8974bf52c881f44d225b8be5
Fix: 37424866
Test: make RunSettingsRoboTests
2017-04-24 21:51:32 -07:00
Matthew Fritze
10ad029318
Merge "Update Search UX for OC" into oc-dev am: 0cdade8a78
...
am: 61255c0c93
Change-Id: I87d9dc74413d8ba34f7ab72dc047f1b29485e74a
2017-04-25 01:02:03 +00:00
Matthew Fritze
61255c0c93
Merge "Update Search UX for OC" into oc-dev
...
am: 0cdade8a78
Change-Id: Id21676b0e0fe9cb67474fa977f58e6c647db4fa8
2017-04-25 00:59:33 +00:00
TreeHugger Robot
0cdade8a78
Merge "Update Search UX for OC" into oc-dev
2017-04-25 00:55:03 +00:00
Matthew Fritze
a705701cdc
Merge "Prevent search crashes from uninstalled apps" into oc-dev am: 6d537b6767
...
am: 8465bd3adb -s ours
Change-Id: I1d807415b2a04632a644b0b15ce96cc3054e271a
2017-04-25 00:18:50 +00:00