Commit Graph

35526 Commits

Author SHA1 Message Date
Ajay Panicker
9090f85a12 Limit btsnoop file size (4/8)
Limit btsnoop file size by rotating between snoop files. The rotation occurrs
when a fixed number of packets have been logged and will start overwriting
the older file.

Bug: 35998031
Test: Enable snoop logs from developer options and let logs get large
Merged-In: I94f8f6bc12ab3f7ff406c9392934ecb7209cd635
Change-Id: I94f8f6bc12ab3f7ff406c9392934ecb7209cd635
2017-04-27 00:15:16 +00:00
TreeHugger Robot
7e73da9d29 Merge "Allow scaling up fingerprint icon" 2017-04-26 23:58:15 +00:00
Ajay Panicker
5d51aa4542 Merge "Limit btsnoop file size (4/8)" 2017-04-26 23:02:40 +00:00
Fan Zhang
022ef86f1a Update UI for Wifi Direct settings
- Change the launching preference from using an intent to directly a
fragemnt
- Partially convert WifiP2pSettings to a DashboardFragment
- Add a controller to control each pref category, when they have no
child, hide.
- Add a controller to control device's own AP name.

Change-Id: I23685c4d4a85f80ceab5a576005e693e6f8b7cc4
Fix: 36859626
Test: make RunSettingsRoboTests
2017-04-26 15:54:07 -07:00
Fan Zhang
3c7ca105df Resolve intent before launching from DashboardFragment.
Once dashboard tile is displayed, the underlying intent can be disabled.
We will eventually hide the item from UI, but there can be a brief
moment before we are able to hide it. So to prevent user click and
launch a non-exist intent, we will try to resolve it first before
launching anything.

Change-Id: Ic8d790bf3c5d4d269eadb757f789a1641928a7b7
Fix: 36036097
Test: make RunSettingsRoboTests
2017-04-26 14:44:12 -07:00
Doris Ling
cf4a185aeb DO NOT MERGE: Revert "Add summary text to Display->Brightness level."
This reverts commit 03ee253701.

The change does not work properly and is causing confusion.

Bug: 36650108

Change-Id: I00acced742b20e215c869ed58eb8750c654f5742
2017-04-26 21:33:16 +00:00
Fan Zhang
3294a394ec Merge "No autofill password when in PIN settings" into oc-dev am: 3decc865dc
am: c02cbe698b

Change-Id: I833d994db8bf8285433fefa8b8456179128c50da
2017-04-26 21:14:05 +00:00
Fan Zhang
c02cbe698b Merge "No autofill password when in PIN settings" into oc-dev
am: 3decc865dc

Change-Id: I927cb611ea6e426bf7a85d949aaae698639eac32
2017-04-26 21:10:23 +00:00
TreeHugger Robot
3decc865dc Merge "No autofill password when in PIN settings" into oc-dev 2017-04-26 21:05:04 +00:00
Bill Yi
662d23cd74 Merge "Import translations. DO NOT MERGE" into oc-dev am: 4bce1569a1 -s ours
am: 663f6ba460  -s ours

Change-Id: I044850d494fddad71263e55f0fd86faff7315ef7
2017-04-26 20:02:02 +00:00
Bill Yi
663f6ba460 Merge "Import translations. DO NOT MERGE" into oc-dev
am: 4bce1569a1  -s ours

Change-Id: I45def8ddf5947cbc924809e147e0b4cdce98e172
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

Change-Id: I5490aab1d5b4845f912c6fcefda76587e09366ea
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

Change-Id: Ic398fbad1492c19db947462d0c54cf9391de58e3
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
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
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
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
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

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
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

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
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
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