Commit Graph

35420 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Matthew Fritze
8465bd3adb Merge "Prevent search crashes from uninstalled apps" into oc-dev
am: 6d537b6767

Change-Id: I21b6bbf8a2c22fe98e0a2f03fc3f95cb9edc225e
2017-04-25 00:16:20 +00:00
TreeHugger Robot
6d537b6767 Merge "Prevent search crashes from uninstalled apps" into oc-dev 2017-04-25 00:12:34 +00:00
Amit Mahajan
1abe5a78b3 Merge "Do not call update() for read only APNs." into oc-dev am: 8f18f8e087
am: 563d2d5a29

Change-Id: I10631e103cfc784832216281a278128d740f8da6
2017-04-24 22:56:24 +00:00
Daniel Nishi
97686254be Merge "Fake data to be 0B after clearing." into oc-dev am: cba520fc9d
am: 8c6327cfe5

Change-Id: If56a028099b9b8eeb66a90fcb617be745ccac2c1
2017-04-24 22:56:01 +00:00
Lei Yu
b4da0a47ab Merge "Add TtsSpan for formatted time." into oc-dev am: 8f9f25c541
am: 8c2a018e77

Change-Id: I509533491925b9c49f9a5c905d1c2e5818978684
2017-04-24 22:55:33 +00:00
Lei Yu
7dc19949a4 Merge "Add device name for connect string" into oc-dev am: bcaabec925
am: 96cba04e0d

Change-Id: I4de396b85b039ea3e9e64040287b21d89cad173d
2017-04-24 22:55:09 +00:00
Bartosz Fabianowski
de61f78f68 Only show headers in Master Clear when there are multiple profiles am: 28ec98cd1f
am: 154bb00cb0

Change-Id: I8c3363ac310452067fb4e21fc1d8969b1010e231
2017-04-24 22:54:47 +00:00
Amit Mahajan
563d2d5a29 Merge "Do not call update() for read only APNs." into oc-dev
am: 8f18f8e087

Change-Id: I4afa467be33359cd09fde8d00b62fc299e01a85a
2017-04-24 22:19:40 +00:00
TreeHugger Robot
8f18f8e087 Merge "Do not call update() for read only APNs." into oc-dev 2017-04-24 22:16:32 +00:00
Daniel Sheng
1721b802c5 Added settings UI for camera lift trigger gesture
Bug: 37154489
Test: manual + make RunSettingsRoboTests

- Added preference fragment for camera lift gesture
- Added activity alias for camera lift gesture setting
- Added resources + overlays for camera lift gesture setting
- Added config flag for limiting camera lift gesture setting for Pixel
- Added Robolectric tests for camera lift gesture settings classes

Change-Id: Ie4846cb1ea6b5279a19f20cb0299426f0d5cbb71
2017-04-24 14:57:55 -07:00
Ruchi Kandoi
7ca6c2410c Add searchable index for Bluetooth and Nfc only if the feature exists
Test: make RunSettingsRoboTests
Bug: 35657961
Change-Id: Ie2f4722b2b1599981c933f87f95016909ba92022
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
2017-04-24 13:15:35 -07:00
Daniel Nishi
8c6327cfe5 Merge "Fake data to be 0B after clearing." into oc-dev
am: cba520fc9d

Change-Id: Ica285a037ead3cd869e3905489eb6abeb95c5194
2017-04-24 19:44:09 +00:00
Lei Yu
8c2a018e77 Merge "Add TtsSpan for formatted time." into oc-dev
am: 8f9f25c541

Change-Id: I2a1d2ccf3e7fd6353d58f30617deed756a71ddde
2017-04-24 19:43:33 +00:00
Lei Yu
96cba04e0d Merge "Add device name for connect string" into oc-dev
am: bcaabec925

Change-Id: I83920ad2cecfece9ed7bb4acb50fe6a6068bd51b
2017-04-24 19:43:08 +00:00
Bartosz Fabianowski
154bb00cb0 Only show headers in Master Clear when there are multiple profiles
am: 28ec98cd1f

Change-Id: I125a16685be88cfc309d70550e72247cecbb75cd
2017-04-24 19:42:34 +00:00