Commit Graph

17050 Commits

Author SHA1 Message Date
Maurice Lam
c7e0fd90fb Enable redaction interstitial after setting up pattern
Test: cd tests/robotests && mma
Bug: 37514884
Change-Id: Ie9342ca0ea893a687284d8b864c6d53a79f88086
2017-04-26 17:54:55 +00:00
jackqdyulei
d1a1fede6f Add method to check whether to enable anomaly detection
Bug: 37709022
Test: RunSettingsGoogleRoboTests
Change-Id: Ie95b8899f0201d392ba06e4747a0d926d7474d68
2017-04-26 10:48:05 -07:00
Charles He
65fa77889a Merge "Turn off QUIET_MODE before changing unified lock credential." into oc-dev am: 09317a6545
am: 4aad6f98f4

Change-Id: I79b3b079cf307e9110da54a47082751d67107c76
2017-04-26 17:07:31 +00:00
Fan Zhang
61183bfa45 Merge "Add search index provider for ConfigureNotificationSettings" into oc-dev am: f650c82b16
am: 07309c8f2a

Change-Id: I2b37d576000d9204c960d01da21a9df04006ea59
2017-04-26 17:07:07 +00:00
Daniel Nishi
f9a073bb69 Merge "Don't shows Files when storage is adopted." into oc-dev am: 980155fb30
am: 23f6fcf90a

Change-Id: I8449865c72091f6a6752bebc17d14848e17e2776
2017-04-26 17:06:32 +00:00
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
Daniel Nishi
a16837769c Make the storage free/total sizes consistent.
We were using a different calculation in the top level view compared to
within the Storage settings. Technically, both are correct (one of them
is aware that we're considering cache as free, one does not). This patch
aligns us on the cache as free strategy.

Change-Id: I9ac26683a4d2a30b77a1da534aa2ddd3d4da6657
Fixes: 37175551
Test: Settings robotest
2017-04-26 09:58:58 -07:00
Charles He
4aad6f98f4 Merge "Turn off QUIET_MODE before changing unified lock credential." into oc-dev
am: 09317a6545

Change-Id: I90022bf37658816f0d8deb9729f2682946389c22
2017-04-26 13:35:52 +00:00
Charles He
09317a6545 Merge "Turn off QUIET_MODE before changing unified lock credential." into oc-dev 2017-04-26 13:29:44 +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
Pavel Grafov
5d567c4786 Disable "Verify apps over usb" according to user restriction.
This is ag/2124876 which fails to automerge oc-dev->master, so
sending as a separate change. Will add Merged-In to the original CL
before submitting to oc-dev.

Bug: 37158436
Test: make ROBOTEST_FILTER=VerifyAppsOverUsbPreferenceControllerTest RunSettingsRoboTests
Change-Id: I52d40f4176ecd660c621ec056649c94fc29f2d4b
2017-04-26 11:54:13 +01:00
Fan Zhang
07309c8f2a Merge "Add search index provider for ConfigureNotificationSettings" into oc-dev
am: f650c82b16

Change-Id: Ib986a31914727d56ce4b71f360f5dd5f6ebf1dc6
2017-04-26 00:14:45 +00:00
TreeHugger Robot
f650c82b16 Merge "Add search index provider for ConfigureNotificationSettings" into oc-dev 2017-04-26 00:06:42 +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
23f6fcf90a Merge "Don't shows Files when storage is adopted." into oc-dev
am: 980155fb30

Change-Id: I90995dd52b20df2c1dcfe4670835bfd3988d6b41
2017-04-25 22:39:54 +00: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
980155fb30 Merge "Don't shows Files when storage is adopted." into oc-dev 2017-04-25 22:30:29 +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
Daniel Nishi
63a11c56de Always use GB as the unit in Storage Settings.
Bug: 36901322
Test: Settings unit tests

Change-Id: I08c711db6a271522942a01d1adf3e8e5223010f7
2017-04-25 15:23:49 -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
Sundeep Ghuman
87bf49a436 Force update APs when enabling wifi in WifiSettings.
This reverts commit b2bdc8f17b
and fixes a broken Espresso test case.

Reason for revert: Rolling forward after fix in ag/2133493, to fix b/37324736

Bug: b/37324736
Test: runtest --path
packages/apps/Settings/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java

Change-Id: I9cdf8cb1043af5d527eccbd9cc56d3b02419d7ac
2017-04-25 15:12:00 -07: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
Jack He
2a67cf0465 Bluetooth: Dismiss pairing dialog on user click
* Existing pairing dialog should be dismissed when user clicks on Yes/No
* In a pairing session with multiple pairing dialogs, this is necessary
  as otherwise the second pairing dialog will not be shown
* Modified unit test to test this behavior
* Launch pairing dialog as UserHandle.CURRENT to avoid Context warnings

Bug: 35833536
Test: make, unit test, pair with Bluetooth devices
Change-Id: I1823b78d287134505f59eab7caca2329ecc3a36f
2017-04-25 14:13:26 -07:00
Daniel Sheng
e531c540c2 Merge "Added settings UI for camera lift trigger 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
Fan Zhang
a25bc6983e Add search index provider for ConfigureNotificationSettings
Change-Id: I1da8e318a8823ffe54b2edd7a83a8c7e31ee34e6
Fix: 37593839
Test: make RunSettingsRoboTests
2017-04-25 13:01:36 -07: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