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

150307 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Sharkey
3f1b71f0a2 am 90870a5b: Merge "Progress towards staging ASECs." into lmp-dev 
* commit '90870a5bba8cbe540e257c30a8692fc38ed72753':
  Progress towards staging ASECs.
 2014-08-18 23:08:16 +00:00
Alan Viverette
ee9e1a3cc3 am 417f92da: Merge "Update fast scroller preview for Material" into lmp-dev 
* commit '417f92da9ee79296207279cd04fe889e7ebb5cca':
  Update fast scroller preview for Material
 2014-08-18 23:08:11 +00:00
Adam Lesinski
814a6751cf am f611c1b5: Merge "Revert "Include build number in aapt version"" into lmp-dev 
* commit 'f611c1b5d4fd6d6d1e46954a95760c2a0df3d264':
  Revert "Include build number in aapt version"
 2014-08-18 23:08:07 +00:00
Dianne Hackborn
7515b942a8 am a160d4c6: am 3a77663b: Merge "Fix path for handling system window with app token." into lmp-dev 
* commit 'a160d4c612a8d0046b357e77828d2a3e7b4bf8f0':
  Fix path for handling system window with app token.
 2014-08-18 23:04:32 +00:00
Dianne Hackborn
26ac5367c1 am 3a77663b: Merge "Fix path for handling system window with app token." into lmp-dev 
* commit '3a77663bd6a4dd3f06552ed49db03e8c09181ca2':
  Fix path for handling system window with app token.
 2014-08-18 22:56:27 +00:00
Alan Viverette
995ceaa665 am 7152f0fe: am a01596de: Merge "Throw exception when inset drawable is missing drawable attribute" into lmp-dev 
* commit '7152f0fe27b3083ddbc5beb4e109e4215784ba7d':
  Throw exception when inset drawable is missing drawable attribute
 2014-08-18 22:40:33 +00:00
Alan Viverette
b69d55da77 am a01596de: Merge "Throw exception when inset drawable is missing drawable attribute" into lmp-dev 
* commit 'a01596de0264c260aa9b77783bd30e76d43ce6af':
  Throw exception when inset drawable is missing drawable attribute
 2014-08-18 22:32:17 +00:00
Chet Haase
82b074f514 am 9f32e1fb: am 37a522aa: Merge "Fix crash in AnimationDrawable" into lmp-dev 
* commit '9f32e1fbcfa79db47319b5aac6efa7cd8dfd4be4':
  Fix crash in AnimationDrawable
 2014-08-18 22:20:43 +00:00
Chet Haase
6b491ddb14 am 37a522aa: Merge "Fix crash in AnimationDrawable" into lmp-dev 
* commit '37a522aac43cabab58f0653e4bf29897719e9389':
  Fix crash in AnimationDrawable
 2014-08-18 22:12:11 +00:00
Adam Lesinski
98eacc9f0a am fdbcc8e5: am a7ce555e: Include build number in aapt version 
* commit 'fdbcc8e52c90c09a65494c148243bd1e7109b71b':
  Include build number in aapt version
 2014-08-18 22:02:38 +00:00
Adam Lesinski
8e8ef3b151 am a7ce555e: Include build number in aapt version 
* commit 'a7ce555ee82ed91345a54ee171dc9a415b65e134':
  Include build number in aapt version
 2014-08-18 21:53:46 +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
Alan Viverette
04019ee91b Merge "Throw exception when inset drawable is missing drawable attribute" into lmp-dev 2014-08-18 21:31:41 +00:00
Chet Haase
32e966ccb3 Merge "Fix crash in AnimationDrawable" into lmp-dev 2014-08-18 21:31:41 +00:00
Andrew Solovay
eb60d0f193 am 94174ff7: am 8319455a: Merge "docs: Documented new fields returned by getSkuDetails()." into klp-modular-docs 
* commit '94174ff788cc6a4f79e2026d7d0995f75246a2de':
  docs: Documented new fields returned by getSkuDetails().
 2014-08-18 21:19:37 +00:00
Andy Hung
8699b1c552 am c089fd1a: am 5c73ba37: Merge "Fix 48kHz limitation on AudioTrack" into lmp-dev 
* commit 'c089fd1a1c33a4390e2c5ed3793b455c231646d1':
  Fix 48kHz limitation on AudioTrack
 2014-08-18 21:12:55 +00:00
Andrew Solovay
94174ff788 am 8319455a: Merge "docs: Documented new fields returned by getSkuDetails()." into klp-modular-docs 
* commit '8319455afca3dc4c8f799d7752dfa44780cf8855':
  docs: Documented new fields returned by getSkuDetails().
 2014-08-18 21:08:17 +00:00
Adam Lesinski
71809ee7f6 Include build number in aapt version 
Teams are constantly confused over which version of aapt
they are running. Include the build number from the
Android build system in the binary. Can be retrieved by executing
'aapt version'.

Change-Id: Ie4692fb160c7cbe720a8e76b73e435170214fe0e
 2014-08-18 21:08:15 +00:00
Andy Hung
4ad041cb99 am 5c73ba37: Merge "Fix 48kHz limitation on AudioTrack" into lmp-dev 
* commit '5c73ba37afb1a891466551c107633e2a632f7775':
  Fix 48kHz limitation on AudioTrack
 2014-08-18 21:06:20 +00:00
Amith Yamasani
e5b274ac61 Rephrase the Exit guest action and dialog text 
Exiting guest session -> Removing guest?
Buttons = Cancel / Remove

Bug: 16495144

Change-Id: I3952e0818fa03edff6f9131a32e6469cbaa27b85
 2014-08-18 21:01:22 +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
Adam Lesinski
27a217453f Merge "Revert "Include build number in aapt version"" into lmp-dev 2014-08-18 21:00:53 +00:00
Adam Lesinski
9a9a17eb07 Revert "Include build number in aapt version" 
This reverts commit a7ce555ee82ed91345a54ee171dc9a415b65e134.

Change-Id: I1018747766963e75bec11ddb01ba6d138f133959
 2014-08-18 22:39:38 +00:00
Chris Craik
5ff8debd7d am f14072f8: am c20aa4a2: Merge "Fix BitmapDrawable outline crash" into lmp-dev 
* commit 'f14072f87f578f8a015406b421e24d70eb18d23b':
  Fix BitmapDrawable outline crash
 2014-08-18 20:43:49 +00:00
Chris Craik
6e3c32bb5c am c20aa4a2: Merge "Fix BitmapDrawable outline crash" into lmp-dev 
* commit 'c20aa4a2d80d6f6d71b1e1c8b9af54103294c635':
  Fix BitmapDrawable outline crash
 2014-08-18 20:36:43 +00:00
arete
ff31addb9b Expose system apis for backup transport migration 
Bug: 16542048
Change-Id: I45e710028316e7b2dc4195700a1e7344afb54691
 2014-08-18 20:34:43 +00:00
Ricardo Cervera
09599cdcbe am c52041d3: am dcb8d7e8: am cce5036c: am 88a1f40c: am fb1f5bde: docs: Removing radio from music intents 
* commit 'c52041d3584eb87d848ba225267a26135c795dab':
  docs: Removing radio from music intents
 2014-08-18 20:07:56 +00:00
Ricardo Cervera
f3848b8230 am dcb8d7e8: am cce5036c: am 88a1f40c: am fb1f5bde: docs: Removing radio from music intents 
* commit 'dcb8d7e86b30b0ddd675069d93a0baf7d0605577':
  docs: Removing radio from music intents
 2014-08-18 20:01:07 +00:00
Stephen Hines
93697c5f8e am 4ae9a6d5: am 42895561: Merge "Collapse code paths for single- and multi-input kernels." 
* commit '4ae9a6d5c517f67d9929cc43568c6b7e3b4dfe23':
  Collapse code paths for single- and multi-input kernels.
 2014-08-18 20:00:34 +00:00
Stephen Hines
4ae9a6d5c5 am 42895561: Merge "Collapse code paths for single- and multi-input kernels." 
* commit '428955614836c4a51737e8ff9d4b653c5a80eecd':
  Collapse code paths for single- and multi-input kernels.
 2014-08-18 19:50:55 +00:00
Ricardo Cervera
20ae7b7cb6 am cce5036c: am 88a1f40c: am fb1f5bde: docs: Removing radio from music intents 
* commit 'cce5036cb00c7e25f1d226c6405e6231f5913444':
  docs: Removing radio from music intents
 2014-08-18 19:49:12 +00:00
Elliott Hughes
c97de79ad2 am 400ec1b9: am 085889e3: Merge "WifiP2pWfdInfo set device type bugfix" 
* commit '400ec1b938ddc8da367c594105bfaa7485c80564':
  WifiP2pWfdInfo set device type bugfix
 2014-08-18 19:48:26 +00:00
John Spurlock
162b40e4f9 am e4cbd7b3: am 7ef696b6: Merge "Temporary workaround for NetworkOverLimitActivity dialog." into lmp-dev 
* commit 'e4cbd7b3e096d2aa03a01d38e92090999489ae1f':
  Temporary workaround for NetworkOverLimitActivity dialog.
 2014-08-18 19:39:48 +00:00
Elliott Hughes
400ec1b938 am 085889e3: Merge "WifiP2pWfdInfo set device type bugfix" 
* commit '085889e37f5798dd50ec8c66cd0e2cd2ec37c6bd':
  WifiP2pWfdInfo set device type bugfix
 2014-08-18 19:38:36 +00:00
Ricardo Cervera
cce5036cb0 am 88a1f40c: am fb1f5bde: docs: Removing radio from music intents 
* commit '88a1f40c5d6111c74feb8e3022ffdccbf489a2e4':
  docs: Removing radio from music intents
 2014-08-18 19:38:16 +00:00
Elliott Hughes
7380d866e5 am 72d3cef8: am 708da446: Merge "Use gettid directly in frameworks JNI." 
* commit '72d3cef8675b4a8eced300adeb148a835b7fdd57':
  Use gettid directly in frameworks JNI.
 2014-08-18 19:34:27 +00:00
John Spurlock
2cda14b909 am 7ef696b6: Merge "Temporary workaround for NetworkOverLimitActivity dialog." into lmp-dev 
* commit '7ef696b6ed662abf1066f33d293ccad6f0808126':
  Temporary workaround for NetworkOverLimitActivity dialog.
 2014-08-18 19:30:17 +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
Ricardo Cervera
86b9efee71 am 34300eb9: am b3615747: am f960409f: am 72ca94ee: am d0842384: docs: Updated links for Android Studio 0.8.6 
* commit '34300eb9a49161fa0d573b1562e38d1e85b53c33':
  docs: Updated links for Android Studio 0.8.6
 2014-08-18 19:28:43 +00:00