Bill Yi
662d23cd74
Merge "Import translations. DO NOT MERGE" into oc-dev am: 4bce1569a1 -s ours
...
am: 663f6ba460
2017-04-26 20:02:02 +00:00
Bill Yi
663f6ba460
Merge "Import translations. DO NOT MERGE" into oc-dev
...
am: 4bce1569a1
2017-04-26 19:55:12 +00:00
TreeHugger Robot
4bce1569a1
Merge "Import translations. DO NOT MERGE" into oc-dev
2017-04-26 19:45:03 +00:00
TreeHugger Robot
3fb76069f3
Merge "Import translations. DO NOT MERGE"
2017-04-26 19:40:34 +00:00
Sundeep Ghuman
4b49c11d87
Merge "Force update APs when enabling wifi in WifiSettings." into oc-dev am: 9797a39ad7
...
am: f292f23c0c
2017-04-26 18:54:10 +00:00
Sundeep Ghuman
f292f23c0c
Merge "Force update APs when enabling wifi in WifiSettings." into oc-dev
...
am: 9797a39ad7
2017-04-26 18:45:09 +00:00
Sundeep Ghuman
9797a39ad7
Merge "Force update APs when enabling wifi in WifiSettings." into oc-dev
2017-04-26 18:32:48 +00:00
Doris Ling
6f3364bf78
Add summary to special app access.
...
Get the count of apps that has unrestricted data access and add that to
the summary for Apps & notifications -> Special app access.
Bug: 36376411
Test: make RunSettingsRoboTests
Change-Id: Id80a030e1e066f1391f94114f478091a2a87fcd8
2017-04-26 11:18:44 -07:00
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
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
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
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
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
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
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
2017-04-26 10:56:15 +00:00
jackqdyulei
89f27bcc2d
Merge "Move battery stats loading to AsyncLoader." into oc-dev am: d0ea1386ad
...
am: 303672f1d3
2017-04-26 10:55:55 +00:00
Fan Zhang
2e02794115
Merge changes I4ae01109,Ib45289c3 into oc-dev am: eda3e8c3d9
...
am: 7d04b2dab0
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
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
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
Maurice Lam
e4019f0aa4
Allow scaling up fingerprint icon
...
Add adjustViewBounds so the fingerprint icon can scale up to fill the
available space up to max size 264dp.
Test: Manual
Bug: 37668789
Change-Id: Ic875369b9bc5a7409ad665e4481728c1d553fb51
2017-04-25 17:28:35 -07:00
Fan Zhang
07309c8f2a
Merge "Add search index provider for ConfigureNotificationSettings" into oc-dev
...
am: f650c82b16
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
Bill Yi
35c16ec044
Import translations. DO NOT MERGE
...
Change-Id: I9e0bfb7ce4c27874f4ce613b12e7c9bf7e9a3fed
Auto-generated-cl: translation import
2017-04-25 16:18:44 -07: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
Bill Yi
a3f31766c9
Import translations. DO NOT MERGE
...
Change-Id: Ia07692e881b02a0f4ac62f1a714eb45319d063c8
Auto-generated-cl: translation import
2017-04-25 16:01:58 -07:00
Daniel Nishi
23f6fcf90a
Merge "Don't shows Files when storage is adopted." into oc-dev
...
am: 980155fb30
2017-04-25 22:39:54 +00:00
Daniel Nishi
3803bb966d
Merge "Don't crash on opening ejecting USB." into oc-dev
...
am: 32f95292bf
2017-04-25 22:39:35 +00:00
Felipe Leme
999f6a9a29
Merge "Implemented ACTION_REQUEST_SET_AUTOFILL_SERVICE." into oc-dev
...
am: c36ed203db
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
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
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
2017-04-25 22:18:28 +00:00
Sundeep Ghuman
87bf49a436
Force update APs when enabling wifi in WifiSettings.
...
This reverts commit b2bdc8f17b
2017-04-25 15:12:00 -07:00
Fan Zhang
19f5783b75
Use framework support to reserve icon space
...
Framework now has iconSpaceReserved attr to support reserving icon
space. We no longer need to use a custom layout for each preference.
What's removed:
- custom style for normal preference
- custom layout/style for dropdown preference
- custom style for EditTextPreference
Fix: 37572422
Test: visual
Change-Id: I48d2997e6269143f58c2edd2d9902cdc0519ed04
2017-04-25 22:07:24 +00:00
Julia Reynolds
bcf0c83ae2
Merge "'Allow sound' = let the app decide" into oc-dev
...
am: f9bfab880e
2017-04-25 21:56:00 +00:00
jackqdyulei
0fbccaa30b
Merge "Distribute the misc among all the apps" into oc-dev
...
am: e494a3e59b
2017-04-25 21:55:34 +00:00
jackqdyulei
303672f1d3
Merge "Move battery stats loading to AsyncLoader." into oc-dev
...
am: d0ea1386ad
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
