drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
150,307 Commits 1 Branch 0 Tags
Commit Graph

43058 Commits

Author SHA1 Message Date
Adam Lesinski
7c97b74a05 am 1f5eb661: am 960ab6de: Merge "Add Shell command to set AppOps permissions" into lmp-dev 
* commit '1f5eb661b38dee97c65ddfb7a7dc720afbcca3bb':
  Add Shell command to set AppOps permissions
 2014-08-19 21:08:01 +00:00
George Mount
ed526817bc am cc3e585f: am 793b08cd: Merge "Set start transform before animator starts." into lmp-dev 
* commit 'cc3e585f57ff509531f19e3dc361e9c89177ff60':
  Set start transform before animator starts.
 2014-08-19 20:05:52 +00:00
Lorenzo Colitti
56d4c18e2f am 45b565ff: am 14152c79: Merge "Stop using LinkProperties for static configuration." into lmp-dev 
* commit '45b565ffdbd2962c336f385d80d6516cd1cc489a':
  Stop using LinkProperties for static configuration.
 2014-08-19 19:37:53 +00:00
Igor Murashkin
9423d558fd am 2cfef50a: am 77af33f8: Merge "camera2: Fix StreamConfigurationMap#getOutputSizes for ImageReader" into lmp-dev 
* commit '2cfef50a34cbffa77f15ee1e5fe962b8bc6659ed':
  camera2: Fix StreamConfigurationMap#getOutputSizes for ImageReader
 2014-08-19 18:54:48 +00:00
Igor Murashkin
fcfa4c9506 am 5e27ea67: am 3b690f25: Merge "camera2: (Legacy) Add control.sceneMode = DISABLED to templates" into lmp-dev 
* commit '5e27ea673ae91907f7b2316a6008db629356178c':
  camera2: (Legacy) Add control.sceneMode = DISABLED to templates
 2014-08-19 18:54:43 +00:00
George Mount
e36b9aef0e am 5bc2737b: am 2d0cb7d1: Add a way to get Transitions from a TransitionSet. 
* commit '5bc2737b2a98da670e7e8786c43df916a45f7eb2':
  Add a way to get Transitions from a TransitionSet.
 2014-08-19 16:58:32 +00:00
Nicolas Prevot
880ac4a37e am 07e5e66c: am 0587c834: When notify uri changes, changing the way we retrieve the userId. 
* commit '07e5e66cccfe6c442d7476525ea6a73669ca84d2':
  When notify uri changes, changing the way we retrieve the userId.
 2014-08-19 16:43:56 +00:00
George Mount
7f15164ecb Add a way to get Transitions from a TransitionSet. 
Bug 17113732

Change-Id: I0a157a59448e66560ba2252709971131c5dea401
 2014-08-19 16:43:06 +00:00
Nicolas Prevot
ec4bb45a8c When notify uri changes, changing the way we retrieve the userId. 
Changing from UserHandle.getCallingUserId() to UserHandle.myUserId().
This makes the DocumentProvider work across users.

BUG: 16126891

Change-Id: I8ede64f2087894bb85eff5286803cdebd57e7137
 2014-08-19 17:09:09 +01:00
Kenny Guy
7efc392b37 am 74c1c9db: am 181fc408: Merge "First part of renaming methods in LauncherApps." into lmp-dev 
* commit '74c1c9db0c20706a3eb571309bb7888a16495808':
  First part of renaming methods in LauncherApps.
 2014-08-19 11:23:06 +00:00
Jinsuk Kim
c98889df16 am 41869802: am 53130b88: Merge "CEC: Invoke events listener upon MHL device state change" into lmp-dev 
* commit '418698026e0a5303dc588c99efa64e3a9e401d47':
  CEC: Invoke events listener upon MHL device state change
 2014-08-19 06:15:40 +00:00
Jon Miranda
16adbb4222 am 4a5ac7db: am b315ca55: Merge "Exposes style and theme data, adds developer option." into lmp-dev 
* commit '4a5ac7db49117b5d14e82caca68405949eccfec5':
  Exposes style and theme data, adds developer option.
 2014-08-19 03:10:22 +00:00
Adam Lesinski
1bd805c943 Merge "Add Shell command to set AppOps permissions" into lmp-dev 2014-08-19 02:43:23 +00:00
Adam Lesinski
b5cf61be7c Add Shell command to set AppOps permissions 
Change-Id: I6446543b27f0d2d2e69590a2807e713c6d5ccbbc
 2014-08-19 11:27:19 -07:00
Igor Murashkin
3a6eba01c4 Merge "camera2: Fix StreamConfigurationMap#getOutputSizes for ImageReader" into lmp-dev 2014-08-19 02:43:23 +00:00
Igor Murashkin
517b74533a camera2: Fix StreamConfigurationMap#getOutputSizes for ImageReader 
Return empty array since no implementation-defined sizes are supported

Bug: 17007153
Change-Id: I178e89ef6b2640896f8657765beb458022d66ae5
 2014-08-19 10:51:30 -07:00
Igor Murashkin
ae0da7a81c Merge "camera2: (Legacy) Add control.sceneMode = DISABLED to templates" into lmp-dev 2014-08-19 02:43:23 +00:00
Igor Murashkin
981952d07a camera2: (Legacy) Add control.sceneMode = DISABLED to templates 
Bug: 17024375
Change-Id: Ie4e2a7f22caa842b4f3850f3739f22c5f6a9b88f
 2014-08-19 11:04:31 -07:00
Dianne Hackborn
178eea5547 am 900eb151: am 8c1c4875: Merge "Temporary: raise overflow limit, print all wake locks." into lmp-dev 
* commit '900eb15179fa1cbf58231715c9af3f65115631c1':
  Temporary: raise overflow limit, print all wake locks.
 2014-08-19 01:03:04 +00:00
Michael Wright
15253d0aea am 9df4c42a: am e835a130: Merge "Persist Show IME option." into lmp-dev 
* commit '9df4c42aaada081a128671f2a3f6e06a5effa5cc':
  Persist Show IME option.
 2014-08-19 00:48:56 +00:00
Michael Wright
37869daf5e am 0cddd377: am 6e1edc12: Merge "Update MenuItem#setShortcut docs" into lmp-dev 
* commit '0cddd377c9976b091457118a9a81b4a405958c2e':
  Update MenuItem#setShortcut docs
 2014-08-19 00:48:51 +00:00
destradaa
b35e41e122 am 8e9d264e: am 420fadbd: Merge "Add @SystemApi annotation to Geofence Hardware types." into lmp-dev 
* commit '8e9d264ef76061bbc33f79cbada560c5461c64b8':
  Add @SystemApi annotation to Geofence Hardware types.
 2014-08-19 00:09:06 +00:00
arete
9dae3b831a am d4f0067e: am 4aec0ea8: Merge "Expose system apis for backup transport migration" into lmp-dev 
* commit 'd4f0067eee8db6f0ec581d01a5611174761423c0':
  Expose system apis for backup transport migration
 2014-08-18 23:54:09 +00:00
Adam Powell
2b74dfa1ac am 9c7cf696: am d3b22a5c: Merge "Fix a bug propagating navigation button events from ToolbarActionBar" into lmp-dev 
* commit '9c7cf696ecb286c90ae19aaaa1e9080a9fb00b4e':
  Fix a bug propagating navigation button events from ToolbarActionBar
 2014-08-18 23:37:07 +00:00
Michael Wright
468fef6870 Merge "Persist Show IME option." into lmp-dev 2014-08-18 23:27:42 +00:00
arete
4220a9a9f6 Merge "Expose system apis for backup transport migration" into lmp-dev 2014-08-18 23:27:42 +00:00
Jeff Sharkey
fbc5d259db am 442dcce1: am 90870a5b: Merge "Progress towards staging ASECs." into lmp-dev 
* commit '442dcce17ee6f656c8a0ec872f3c6730dd603796':
  Progress towards staging ASECs.
 2014-08-18 23:16:36 +00:00
Alan Viverette
6d58ab0346 am 3d3783ec: am 417f92da: Merge "Update fast scroller preview for Material" into lmp-dev 
* commit '3d3783ec27d7b3aafbd08d6695d37543e9a337f8':
  Update fast scroller preview for Material
 2014-08-18 23:16:31 +00:00
George Mount
cd02b48b3d Merge "Set start transform before animator starts." into lmp-dev 2014-08-18 21:31:41 +00:00
George Mount
dbe3655c0b Set start transform before animator starts. 
Bug 16958319

ChangeImageTransform was waiting until the animator started
before setting the image matrix. Animators with a
start delay would leave the ImageView with the final transform
before the animator started.

Change-Id: I5ebc03b58a8697da3edf4a01c8906d60e7938f44
 2014-08-19 16:43:45 +00:00
Jon Miranda
611f8f17f3 Merge "Exposes style and theme data, adds developer option." into lmp-dev 2014-08-18 21:31:41 +00:00
Jon Miranda
836c0a8b94 Exposes style and theme data, adds developer option. 
Adds support for a String[] return type in ViewDebug; and in addition to that,
the hasAdjacentMapping method can use the String array as means to map a key to
its value.

Adds DEBUG_VIEW_ATTRIBUTES to Settings so that the heavy per-view
computations only affect those who opt in. This setting is used in
CoreSettingsObserver to avoid impacting start time.

Change-Id: I8f507e4e5361414c30d247e8d9815205feb5e91f
 2014-08-18 18:32:53 -07:00
Michael Wright
8b987196ca Merge "Update MenuItem#setShortcut docs" into lmp-dev 2014-08-18 21:31:41 +00:00
Alan Viverette
d59c585588 Merge "Update fast scroller preview for Material" into lmp-dev 2014-08-18 21:31:41 +00:00
Adam Powell
8f4a21e466 Merge "Fix a bug propagating navigation button events from ToolbarActionBar" into lmp-dev 2014-08-18 21:00:53 +00:00
Adam Powell
14e1afe0d8 Fix a bug propagating navigation button events from ToolbarActionBar 
Add a simple internal wrapper for dealing with window callback events.
This should also make working with things like action modes from
ToolbarActionBar significantly easier in later changes.

Bug 16980711

Change-Id: I2c3d7525489a21847f4af9b80f6ebf9b34b4dd58
 2014-08-18 15:58:23 -07:00
arete
ff31addb9b Expose system apis for backup transport migration 
Bug: 16542048
Change-Id: I45e710028316e7b2dc4195700a1e7344afb54691
 2014-08-18 20:34:43 +00:00
Nicolas Prevot
95f9f8535d am 3eb16dc4: am cdc4b08c: Merge "When forwarding intents, ignoring the package set in the intent." into lmp-dev 
* commit '3eb16dc478c0cacbf770d35b41d96448a0e96654':
  When forwarding intents, ignoring the package set in the intent.
 2014-08-18 19:29:14 +00:00
Dianne Hackborn
00eea5072b am 4a0bc3cc: am 2dff9254: Merge "Fix issue #14617210: Apps can gain access to any ContentProvider..." into lmp-dev 
* commit '4a0bc3cc94f034f0a83f1e68edf7d440181777ba':
  Fix issue #14617210: Apps can gain access to any ContentProvider...
 2014-08-18 19:29:08 +00:00
Nicolas Prévot
cf4d240140 am 9ecc411b: am 1e8e553b: Merge "Revert "Adding the requiredForProfile flag."" into lmp-dev 
* commit '9ecc411b74923957691a9150acb9c3b38d27cd41':
  Revert "Adding the requiredForProfile flag."
 2014-08-18 19:29:03 +00:00
Svetoslav
7a3867f3e5 am f0307cc9: am 1b3e768a: Merge "Fix a crash in RemoteViews." into lmp-dev 
* commit 'f0307cc91363b8e2b37372b72a5a44c3ce9aa9ab':
  Fix a crash in RemoteViews.
 2014-08-18 19:28:58 +00:00
Sunny Goyal
7bf7a25618 am 868b656d: am 860af1e5: Merge "Fixing bounds check." into lmp-dev 
* commit '868b656d19dc6920fbcabe61e4913f95c4b68de0':
  Fixing bounds check.
 2014-08-18 19:28:53 +00:00
Craig Stout
c27e79d3e1 am b23f941f: am a245102a: Merge "Fix alert, date picker, time picker dialogs for TV." into lmp-dev 
* commit 'b23f941f0f0b2ad267b8617aefd41bdc132fd21a':
  Fix alert, date picker, time picker dialogs for TV.
 2014-08-18 19:28:48 +00:00
Kenny Root
74a74b637e am b4b398b7: am 286a1434: Merge "Revert "Remove the warning if the caller gets the insecure variant and add hostname verification (SNI)"" into lmp-dev 
* commit 'b4b398b7cae59c581930acc58d9b9f09262c0695':
  Revert "Remove the warning if the caller gets the insecure variant and add hostname verification (SNI)"
 2014-08-18 19:28:14 +00:00
Dianne Hackborn
80086cd4b4 am a0a64624: am 728f5d08: Merge "Work on issue #16629489: Google (Play?) Services eating through battery" into lmp-dev 
* commit 'a0a646245c6aefa9d8303b641256381e639f0d47':
  Work on issue #16629489: Google (Play?) Services eating through battery
 2014-08-18 19:17:51 +00:00
Dianne Hackborn
84ba83bb3d am af6eb301: am e882cea6: Merge "Fix issue #17082301: replacePreferredActivity is ignoring userId" into lmp-dev 
* commit 'af6eb301c54d90e534ed058c88f6ca7e907eb340':
  Fix issue #17082301: replacePreferredActivity is ignoring userId
 2014-08-18 19:17:47 +00:00
Adrian Roos
48986869c3 am 2ff048ff: am a31e2348: Play "device trusted" sound when onTrustInitiatedByUser fires 
* commit '2ff048ff5587e029e83e17fdfdecaa3fa0fd70c2':
  Play "device trusted" sound when onTrustInitiatedByUser fires
 2014-08-18 17:14:52 +00:00
Adrian Roos
49e057d7ee Play "device trusted" sound when onTrustInitiatedByUser fires 
Bug: 16840500
Change-Id: I73fbe5c2cff665ccb637abb9039d57f377d9df53
 2014-08-18 16:53:27 +00:00
John Reck
30bb86629a am 98270e20: am 976189a1: Merge "Don\'t mangle layer paint\'s alpha" into lmp-dev 
* commit '98270e20063bd6446c088335c957bb5062ba5cf1':
  Don't mangle layer paint's alpha
 2014-08-18 16:21:34 +00:00
Jason Monk
d6ea61cd15 am 75391416: am 71793e71: Merge "Fixes to lock task API from API review" into lmp-dev 
* commit '75391416fe284946f41cfa39799f7e580975fbbf':
  Fixes to lock task API from API review
 2014-08-18 13:51:09 +00:00