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

149222 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
Ricardo Cervera
88a1f40c5d am fb1f5bde: docs: Removing radio from music intents 
* commit 'fb1f5bdef03844547152f921dcaa044269b5a0cb':
  docs: Removing radio from music intents
 2014-08-18 19:28:02 +00:00
Nicolas Prevot
b883a449d3 am cdc4b08c: Merge "When forwarding intents, ignoring the package set in the intent." into lmp-dev 
* commit 'cdc4b08c5689737d59e9390e61673cca042c6058':
  When forwarding intents, ignoring the package set in the intent.
 2014-08-18 19:19:33 +00:00
Dianne Hackborn
e302815eae am 2dff9254: Merge "Fix issue #14617210: Apps can gain access to any ContentProvider..." into lmp-dev 
* commit '2dff9254409ed91141ce72e9b998557a9f9e77f0':
  Fix issue #14617210: Apps can gain access to any ContentProvider...
 2014-08-18 19:19:28 +00:00
Nicolas Prévot
ad1e09fa64 am 1e8e553b: Merge "Revert "Adding the requiredForProfile flag."" into lmp-dev 
* commit '1e8e553b59f409b5695971c6999907eafffdab3c':
  Revert "Adding the requiredForProfile flag."
 2014-08-18 19:19:23 +00:00
Svetoslav
7fb8214ecf am 1b3e768a: Merge "Fix a crash in RemoteViews." into lmp-dev 
* commit '1b3e768a1c1a2a66e8a53a9e31acdddceb02e4f7':
  Fix a crash in RemoteViews.
 2014-08-18 19:19:19 +00:00
Sunny Goyal
e74d28705b am 860af1e5: Merge "Fixing bounds check." into lmp-dev 
* commit '860af1e50b9042fa4f6ada2349602b7a6fa2cc53':
  Fixing bounds check.
 2014-08-18 19:19:14 +00:00
Craig Stout
4888a76b2c am a245102a: Merge "Fix alert, date picker, time picker dialogs for TV." into lmp-dev 
* commit 'a245102a05cf9435c90adc1fafd071d583a5fdc3':
  Fix alert, date picker, time picker dialogs for TV.
 2014-08-18 19:19:10 +00:00
Ricardo Cervera
78b4edd9c9 am b3615747: am f960409f: am 72ca94ee: am d0842384: docs: Updated links for Android Studio 0.8.6 
* commit 'b361574793f70c8eb0d6f84a3898251c513a827b':
  docs: Updated links for Android Studio 0.8.6
 2014-08-18 19:19:04 +00:00
Lenka Trochtova
0fb23ebe75 am 15a4b306: Merge branch \'lmp-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-dev 
* commit '15a4b30652b797bf8e1997d85627b345de198813':
  Make AudioState constructors public
 2014-08-18 19:18:59 +00:00
Deepanshu Gupta
4acd03f7ca am eab5df3a: am da9baa15: am d519f742: am b6c923a2: am 59eedf52: Layoutlib: Update wifi and battery icon for KK 
* commit 'eab5df3ab95d47e7c856648b11878163589c7b35':
  Layoutlib: Update wifi and battery icon for KK
 2014-08-18 19:18:55 +00:00
Deepanshu Gupta
1d0931a681 am 8f7cc496: am a4ceb9e6: am 32faabbe: Layoutlib: Update wifi and battery icon for KK 
* commit '8f7cc496d2736eaccdbe1409d464e737c9909e3d':
  Layoutlib: Update wifi and battery icon for KK
 2014-08-18 19:18:50 +00:00
Santos Cordon
6989f648e9 am ac0a6e48: Update conference call APIs. 
* commit 'ac0a6e48dd2498a17d2e9d1617d76045bd9ae01a':
  Update conference call APIs.
 2014-08-18 19:18:45 +00:00
Guang Zhu
2e714195a7 am 9afdb3f7: Merge "Disable immersive mode confirmation for test automation" into lmp-dev 
* commit '9afdb3f726b6c484973a6916942c2c9da90099c8':
  Disable immersive mode confirmation for test automation
 2014-08-18 19:18:41 +00:00
Kenny Root
9e22a99e32 am 286a1434: Merge "Revert "Remove the warning if the caller gets the insecure variant and add hostname verification (SNI)"" into lmp-dev 
* commit '286a143456d15dad41f3dad1e34359144b2db489':
  Revert "Remove the warning if the caller gets the insecure variant and add hostname verification (SNI)"
 2014-08-18 19:18:36 +00:00
Ricardo Cervera
fb1f5bdef0 docs: Removing radio from music intents 
Change-Id: Iaf645d692b247994dd8c12835c387ff296b26019
 2014-08-18 12:13:04 -07:00
Ricardo Cervera
bb8f4a6113 am f960409f: am 72ca94ee: am d0842384: docs: Updated links for Android Studio 0.8.6 
* commit 'f960409f3b361df492ea7a9a48aefe89d5992572':
  docs: Updated links for Android Studio 0.8.6
 2014-08-18 18:06:43 +00:00
Lenka Trochtova
8450fd17b1 Merge branch 'lmp-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-dev 2014-08-18 18:06:41 +00:00
Deepanshu Gupta
5cb5059b6c am da9baa15: am d519f742: am b6c923a2: am 59eedf52: Layoutlib: Update wifi and battery icon for KK 
* commit 'da9baa15bf780d4e8924adbed3d8863c75da5e6c':
  Layoutlib: Update wifi and battery icon for KK
 2014-08-18 18:06:26 +00:00
Deepanshu Gupta
6e8a98c8b7 am a4ceb9e6: am 32faabbe: Layoutlib: Update wifi and battery icon for KK 
* commit 'a4ceb9e64cd1ee6302e41c7799ebb6610af96d0e':
  Layoutlib: Update wifi and battery icon for KK
 2014-08-18 18:06:07 +00:00
Chet Haase
030435773d Fix crash in AnimationDrawable 
When a drawable becomes invisible, it unschedule itself, which
sets mCurrentFrame to -1. Later, when it becomes visible, it
calls setFrame() with either 0 (if 'restart' is true) or
mCurrentFrame. Calling setFrame() with a value of -1 causes a crash
later as we dereference an invalid location in the state durations
array.

This fix also checks mCurrentFrame and calls setFrame with 0 when the
current frame is invalid. This takes the code back closer to what it
used to be when setFrame was always called with 0, although now it will
use a valid frame when it is set.

Issue #16489419 Google Translate crashes whenever hitting done button on keyboard to get translation result.

Change-Id: I1f5b8672d209017aa8a4eaa15bd7ddd2f3ae38d1
 2014-08-18 10:33:58 -07:00
Santos Cordon
823fd3c79d Update conference call APIs. 
Clean up conference call APIs to use a distinct type separate from
Connection.  Also allow the addition of Conference calls at any point
using addConference() API method.

Bug:16844332
Bug:16449372
Change-Id: I34e45fde1aa43559f5f4e29b990929c188b16875
 2014-08-18 17:30:58 +00:00
Dianne Hackborn
b8284a8bb8 am 728f5d08: Merge "Work on issue #16629489: Google (Play?) Services eating through battery" into lmp-dev 
* commit '728f5d08c891a4e6f9e437bd2398ce9ea36db8b6':
  Work on issue #16629489: Google (Play?) Services eating through battery
 2014-08-18 17:21:02 +00:00