191651 Commits

Author SHA1 Message Date
Adam Powell
5fccffd573 Merge "Bringing new Chooser UI closer to spec" into mnc-dev 2015-05-11 19:17:29 +00:00
Adam Powell
7d7580019e Bringing new Chooser UI closer to spec
Separate the chooser targets into rows by type. Remove some API that
was redundant with LabeledIntent, simplifying ChooserTarget.

Change-Id: I90de471825f05d85e6ffbe72a32fb597be824a30
2015-05-11 12:16:19 -07:00
Miao Wang
d6f3ebf1d0 Merge "[RenderScript] (minor) fix validation of L3 BLAS" into mnc-dev 2015-05-11 19:11:44 +00:00
Miao Wang
50a8ff108f [RenderScript] (minor) fix validation of L3 BLAS
bug: 21028875

Change-Id: I9fd48c57b6518e06ee1d9d7d4ca44faa96d887b0
2015-05-11 12:08:02 -07:00
Alex Klyubin
e1176f10eb Merge "Fix KeyStoreTest now that begin requires parameters." into mnc-dev 2015-05-11 18:29:54 +00:00
John Reck
30e175c8be Merge "Clarify assert" into mnc-dev 2015-05-11 18:16:33 +00:00
Alex Klyubin
292102459b Fix KeyStoreTest now that begin requires parameters.
Keystore's begin operation now requires parameters which describe the
operation (e.g., algorithm, block mode, padding). This adjusts
KeyStoreTest to provide the necessary parameters.

(cherry-picked from commit c5e4d7af22793072a2620805f5e0e23bf15e7110)

Bug: 19509156
Change-Id: Ibc665fbc893766a683a4aadc97a64ffdf2d0d85f
2015-05-11 11:12:34 -07:00
John Reck
9298c54141 Clarify assert
Bug: 20918138
Change-Id: I39a9f8bbfb3752f9a6e5f5215ed8cd3c93ce87fc
2015-05-11 11:03:43 -07:00
Jeff Davidson
0a775ce980 Ensure VPN consent is not revoked in prepare/establish.
Covers cases where VPN is prepared, but the consent bit has been lost,
e.g. because updates were uninstalled on the current VPN app. In this
case we want prepare to re-trigger the consent flow, and we do not
want establish() to work.

So, when prepare(package, null) is called, as VpnService.prepare()
will do, if we would have otherwise taken no action and returned true
because the VPN was already prepared, we now check if package has lost
its consent and unprepare the VPN (so that it can be prepared by the
VpnSettings ConfirmDialog).

Bug: 18491424
Change-Id: I8fa60dbc2b95e15f9ce61f9b7e6735db745babba
2015-05-11 17:50:07 +00:00
Chirag Shah
3ce72722ca Merge "Revert the AssistAction class." into mnc-dev 2015-05-11 17:39:49 +00:00
Jean-Michel Trivi
3b12261c50 Merge "android.media.AudioRecord.Builder: no "capture preset"" into mnc-dev 2015-05-11 17:39:29 +00:00
Mady Mellor
15445a652b Merge "Provide a way for a stylus to access the quick settings menu" into mnc-dev 2015-05-11 17:28:46 +00:00
John Spurlock
b7c9b2259f Merge "QS: Defer tile view updates when opening the detail panel." into mnc-dev 2015-05-11 17:28:00 +00:00
John Spurlock
20c8905869 QS: Defer tile view updates when opening the detail panel.
Bug: 20916542
Change-Id: I8e367fb2f8274eafb8d142fbfb54bc9be66b7546
2015-05-11 13:24:23 -04:00
George Mount
3dec0d4721 Merge "Disable input during Activity Transition." into mnc-dev 2015-05-11 17:19:03 +00:00
John Reck
78fad5724d Merge "Add a few missing asserts" into mnc-dev 2015-05-11 17:15:32 +00:00
Jason Monk
d567d88e10 Merge "SettingsLib: Do wifi processing in background" into mnc-dev 2015-05-11 16:57:23 +00:00
John Reck
ad57442fd0 Add a few missing asserts
Bug: 20918138
Change-Id: I6823cfe531ff6f63a7d9fde22278e6780726c9f1
2015-05-11 09:43:47 -07:00
Jason Monk
30d8004dbf SettingsLib: Do wifi processing in background
Bug: 19520495
Change-Id: Iefad932bd523b26a19e5f902133563341aea7426
2015-05-11 12:37:43 -04:00
Zoltan Szatmary-Ban
11a1086f69 Merge "Improve javadoc on android.permission.PACKAGE_USAGE_STATS" into mnc-dev 2015-05-11 16:24:52 +00:00
Steve McKay
b3100f4b13 Merge "Delete StandaloneActivity from M (DO NOT MERGE)" into mnc-dev 2015-05-11 16:21:02 +00:00
Steve McKay
6e02dc8cd6 Delete StandaloneActivity from M (DO NOT MERGE)
The activity is already disabled by default.
Fix an issue where copy support error handling was attempting to invoke StandaloneActivity.

Change-Id: If15c312a183cae1b2a84517e7f7b3123c11bd619
2015-05-11 16:19:00 +00:00
John Spurlock
13ea79dea4 Merge "Volume: Separate tint colors for active vs inactive sliders." into mnc-dev 2015-05-11 16:15:22 +00:00
Geoff Mendal
7846d966f5 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-05-11 16:15:01 +00:00
John Spurlock
77bb25af3d Volume: Separate tint colors for active vs inactive sliders.
Bug: 20889746
Change-Id: I98f6a0eab8f2db41ea7e1ba8e141752ef774de9e
2015-05-11 12:12:07 -04:00
Amith Yamasani
a5b2684c25 Merge "Rename *AppIdle to *AppInactive per api-council" into mnc-dev 2015-05-11 16:11:14 +00:00
Geoff Mendal
fc0a274438 Import translations. DO NOT MERGE
Change-Id: I9eba7c09bb5f603b1260ede6a3de590670af76ff
Auto-generated-cl: translation import
2015-05-11 09:02:26 -07:00
Zoltan Szatmary-Ban
763e170f58 Improve javadoc on android.permission.PACKAGE_USAGE_STATS
Bug: 20642656
Change-Id: Ib0cedee487950dab16134edd383ce5bd5374ff65
2015-05-11 16:01:33 +00:00
John Spurlock
c454f786e2 Merge "Volume: Use teal color for "End now"." into mnc-dev 2015-05-11 15:57:50 +00:00
John Spurlock
e71442521a Volume: Use teal color for "End now".
Bug: 20888718
Change-Id: I7f485dd5faa42ec7c2631c7bdeb3c03ddb46c530
2015-05-11 11:55:40 -04:00
John Spurlock
4cf2ae9c55 Merge "Add new metrics categories for the two notification access screens." into mnc-dev 2015-05-11 15:48:47 +00:00
Paul McLean
1c82b221d4 Merge "Changes as per API council review." into mnc-dev 2015-05-11 15:39:29 +00:00
Abodunrinwa Toki
f864d925bf Merge "Set FloatingToolbar width for portrait and landscape." into mnc-dev 2015-05-11 15:27:26 +00:00
John Spurlock
cfc66e3339 Add new metrics categories for the two notification access screens.
Bug: 20916418
Change-Id: Iafcaccaa465a2f121a6a1a2ba54b122173e45dc6
2015-05-11 11:19:55 -04:00
Chris Wren
df2e2809bf Merge "log more settings actions" into mnc-dev 2015-05-11 15:07:21 +00:00
Narayan Kamath
d7b2a2e456 Merge "Be more accepting of dex2oat errors." into mnc-dev 2015-05-11 14:16:45 +00:00
Abodunrinwa Toki
c0fa6bd7ac Set FloatingToolbar width for portrait and landscape.
Bug: 20711006
Change-Id: Iee061a1031406780eb0f85201543b644fbb4d813
2015-05-11 14:28:48 +01:00
Geoff Mendal
aaefe3733b Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-05-11 13:24:59 +00:00
Geoff Mendal
cac1cad78f Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-05-11 13:22:36 +00:00
Geoff Mendal
df0d37289e Import translations. DO NOT MERGE
Change-Id: I3b9bc4b615456852e450db14f517a103fd8cb697
Auto-generated-cl: translation import
2015-05-11 06:21:28 -07:00
Geoff Mendal
5851438476 Import translations. DO NOT MERGE
Change-Id: Ia8e10381534c60257e959e7d0eaf02deb0097142
Auto-generated-cl: translation import
2015-05-11 06:17:31 -07:00
Geoff Mendal
ebb3a45a67 Import translations. DO NOT MERGE
Change-Id: I0999d1abf6951574e9ba7fc6c8a608aaea4540de
Auto-generated-cl: translation import
2015-05-11 06:14:14 -07:00
Nick Kralevich
d9c7f24569 UsbManager / UsbService / UsbDeviceManager: delete unused code
These functions are never called.

Change-Id: Ic436e1036bed717d2c64701fddd9a810abb9443e
2015-05-10 21:57:56 -07:00
Jinsuk Kim
1c86159142 Merge "CEC: Update ARC feature flag on hotplug" into mnc-dev 2015-05-10 23:12:16 +00:00
Jinsuk Kim
37f5bc281c CEC: Update ARC feature flag on hotplug
ARC feature flag should have been updated whenever hotplug[on]
was detected, so that the ARC can be established upon device
discovery. This CL rectifies the bug.

Bug: 20817208
Change-Id: I5053ad3f576d0e405b6d8fc0c4e6584e66ed0a86
2015-05-11 08:10:35 +09:00
Jeff Sharkey
fced534dec Fix devices with primary physical storage.
Always assume the factory-reset default primary storage before parsing
storage settings.  Without this, we'd always default to picking
internal emulated storage during first boot or upgrade.

Bump version code to re-evaluate this for devices that default to
physical storage as primary.

Also restrict available move targets when storage is physical, since
we can't really translate between multi-user and non-multi-user aware
storage.

Bug: 20836019
Change-Id: I186ded1aa3dd9cea67497a4f53b0973031174ccd
2015-05-10 14:53:37 -07:00
Dirk Dougherty
a2e26b4953 am d3b2d050: am 674b1fcb: Doc change: Update cards and landing contents.
* commit 'd3b2d0502dd30039789f2a2b6380a4344fdc865e':
  Doc change: Update cards and landing contents.
2015-05-09 04:49:22 +00:00
Dirk Dougherty
d3b2d0502d am 674b1fcb: Doc change: Update cards and landing contents.
* commit '674b1fcbaae2142666a6fb8eea4595fa8c64e406':
  Doc change: Update cards and landing contents.
2015-05-09 04:37:37 +00:00
Dirk Dougherty
674b1fcbaa Doc change: Update cards and landing contents.
Change-Id: Iecb6a6aa0fd3835750979bea49ac782abaa3364a
2015-05-08 20:48:34 -07:00
Chris Wren
9e7283f6a3 log more settings actions
airplane: quick and slow settings
  bluetooth: quick and slow settings
  cellular data: quick and slow settings
  dnd: quick and slow settings
  wifi: quick settings (slow already done)
  cast: quick settings
  user: quick settings

include state of the toggle in the action log

Back away slowly from the over-generalization of logging
around handleClick, the semantics of mState are particular
to the individual tiles.

Bug: 20264417
Change-Id: I4cecbd3361af64d08de9fb41b8dca210a8086a80
2015-05-08 22:25:40 -04:00