Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
155,005 Commits 3 Branches 0 Tags
cba01b2310e78fc2114ceed285f4e134469ae62b
Commit Graph

155005 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
George Mount
cba01b2310 Fix transition being canceled improperly. 
Bug 18092208

When a transition is determining whether or not it should be
canceled, the old values and new values are compared. Previously,
the if a value was in the old values, but not in the new values
then the value was considered changed. This discounts that
transitions sometimes don't target views and it may be that
no value was populated.

Change-Id: I8210ba1e44921fadedf9ead571d380ad34e73d3f
 2014-10-22 14:39:43 -07:00
Dianne Hackborn
f23b29ad5a am a861a9d7: am 35de0e28: Merge "Fix issue #10034864: Define YouTube application as the preferred..." into lmp-dev 
* commit 'a861a9d713c99b576c0e7284a65d50838c4f953a':
  Fix issue #10034864: Define YouTube application as the preferred...
 2014-10-14 19:58:39 +00:00
Filip Gruszczynski
31278350b9 am 72f6e8ce: Merge "Log wallpaper crashes." into lmp-sprout-dev 
* commit '72f6e8ce81e847eb0d2eeac02ef7c4ce48ed5002':
  Log wallpaper crashes.
 2014-10-14 19:58:15 +00:00
Rich Slogar
b42cd3831b am 389e4ccd: am a89ac60e: am 858cfad9: am a3287768: Merge "docs:SDK tools 23.0.5 Release Note" into klp-modular-docs 
* commit '389e4ccd3674215ede6cf329eac9ca6b70915be5':
  docs:SDK tools 23.0.5 Release Note
 2014-10-14 19:57:54 +00:00
Nick Kralevich
01edf5791c am fce896fe: am 0ae82b05: resolved conflicts for merge of a4eb81b6 to lmp-dev 
* commit 'fce896feaf9c26bdc3806a48ec01e6e077c5c975':
  Docs: adding closing bracket to un-break javadoc tokens.
 2014-10-14 19:57:50 +00:00
Yorke Lee
8c63f98be5 Merge "Allow home to be pressed while in incoming call screen" into lmp-mr1-dev 2014-10-14 19:35:23 +00:00
Dianne Hackborn
a861a9d713 am 35de0e28: Merge "Fix issue #10034864: Define YouTube application as the preferred..." into lmp-dev 
* commit '35de0e2872b64f78b596a850d6da2c483ba65bb5':
  Fix issue #10034864: Define YouTube application as the preferred...
 2014-10-14 19:21:18 +00:00
Dianne Hackborn
35de0e2872 Merge "Fix issue #10034864: Define YouTube application as the preferred..." into lmp-dev 2014-10-14 19:16:22 +00:00
Filip Gruszczynski
72f6e8ce81 Merge "Log wallpaper crashes." into lmp-sprout-dev 2014-10-14 18:08:34 +00:00
Rich Slogar
389e4ccd36 am a89ac60e: am 858cfad9: am a3287768: Merge "docs:SDK tools 23.0.5 Release Note" into klp-modular-docs 
* commit 'a89ac60e25eb77b4c605fc1a40c96416b199bea5':
  docs:SDK tools 23.0.5 Release Note
 2014-10-14 17:52:54 +00:00
Nick Kralevich
fce896feaf am 0ae82b05: resolved conflicts for merge of a4eb81b6 to lmp-dev 
* commit '0ae82b05be47df85551a1c759a93e84c8009947c':
  Docs: adding closing bracket to un-break javadoc tokens.
 2014-10-14 17:52:04 +00:00
Dianne Hackborn
f85e7af4d0 Fix issue #10034864: Define YouTube application as the preferred... 
...handler for its Intents

Fix bug when a third party app is installed as an additional but
worse match for the intent.

Also raise up the limit for when we start printing logs about
overly large strict mode data.

And turn off the logs about services being created and destroyed,
since with the way things are using services these days these have
become way too spammy.

Change-Id: I8fe301dfd80fb4b70213cb7783b7c5426245278d
 2014-10-14 10:46:52 -07:00
Jeff Hao
63360780f2 Merge "Stop boot dexopt when low on memory." into lmp-mr1-dev 2014-10-14 16:55:40 +00:00
John Spurlock
bec0c53a40 Merge "Make SeekBarVolumizer restartable." into lmp-mr1-dev 2014-10-14 16:40:31 +00:00
John Reck
94c40fe921 CARD LAND! 
Bug: 16712006

Initial work towards benchmarking HWUI systems
Currently this will just create a screen full of
"cards" to simulate a high load scenario for
shadows and clipping

Change-Id: Ie9f9a9570844e136db8053e8fc62fe06cb922a5f
 2014-10-14 09:02:04 -07:00
Rich Slogar
a89ac60e25 am 858cfad9: am a3287768: Merge "docs:SDK tools 23.0.5 Release Note" into klp-modular-docs 
* commit '858cfad9482817305cc5b846102c3f8e5d12782a':
  docs:SDK tools 23.0.5 Release Note
 2014-10-14 15:55:37 +00:00
Nick Kralevich
0ae82b05be resolved conflicts for merge of a4eb81b6 to lmp-dev 
Change-Id: I73b225141e09826b40e4941140b59d1c163bd9c7
 2014-10-14 08:38:05 -07:00
Nicolas Prevot
d8a21bbedb Merge "Not using resource ids for EXTRA_INITIAL_INTENTS inside a managed profile." into lmp-mr1-dev 2014-10-14 09:07:43 +00:00
Jinsuk Kim
93eed0c03a CEC: Use hotplug event for MHL device registry 
Substitute hotplug on event for registering MHL device as TV input.
Initializes a corresponding MHL DeviceInfo as well as MHL local device
instance.

Bug: 17349017

Change-Id: I7e55afda9390aa5fa8b7687cfa6fac132f342fe6
 2014-10-14 11:53:10 +09:00
Alan Viverette
42e96769ae Merge "Add support for tint and tintMode to GradientDrawable" into lmp-mr1-dev 2014-10-14 01:00:36 +00:00
Alan Viverette
788e30bd34 Merge "Revert "Always project ripples"" into lmp-mr1-dev 2014-10-14 00:37:03 +00:00
Fabrice Di Meglio
5dac2a225e Merge "Fix bug #17900580 Top bar drop shadow no longer transparent" into lmp-mr1-dev 2014-10-14 00:14:37 +00:00
Geoff Mendal
d112c2a365 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-10-14 00:13:31 +00:00
Alan Viverette
43027b7bca Add support for tint and tintMode to GradientDrawable 
BUG: 17975498
Change-Id: I8aeec48b8499abaf055e75018759f99801efdecc
 2014-10-13 16:55:59 -07:00
Alan Viverette
2627206e1b Revert "Always project ripples" 
Projecting ripples places them under shadows, which is not
ideal. Punting this workaround and waiting until we have
proper support for rounded corner clipping on windows.

This reverts commit f90b6bd54f.

Change-Id: I61946649bbb1bf74a969d74e5353608afc8e4463
 2014-10-13 23:18:04 +00:00
Wei Wang
3f0aa505f4 am 34020eb6: Merge "Add support of advertising through standard instance.(1/4)" into lmp-sprout-dev 
* commit '34020eb6ebc619c90b9107003331a91e4d5a350e':
  Add support of advertising through standard instance.(1/4)
 2014-10-13 23:05:37 +00:00
Wei Wang
34020eb6eb Merge "Add support of advertising through standard instance.(1/4)" into lmp-sprout-dev 2014-10-13 23:02:30 +00:00
Filip Gruszczynski
5dcc3aca42 Log wallpaper crashes. 
Change-Id: I40d9876dad2a8ec98135e3df127950dc3797040b
 2014-10-13 15:51:39 -07:00
Evan Charlton
4f89e3b215 am 1354a1ff: am f715da3d: Merge "Update the SDK AIDL list" into lmp-dev 
* commit '1354a1fffec1ece56011f4259fbcecafbf758c74':
  Update the SDK AIDL list
 2014-10-13 22:32:55 +00:00
Evan Charlton
1354a1fffe am f715da3d: Merge "Update the SDK AIDL list" into lmp-dev 
* commit 'f715da3d6b2c2d5037de69262eba513e863a98d8':
  Update the SDK AIDL list
 2014-10-13 22:28:29 +00:00
Aravind Akella
1f9b32f006 Sensor documentation fixes. 
Change-Id: I664e5e2d5103b87ed02f082551e46513f64b95a1
 2014-10-13 22:25:46 +00:00
Evan Charlton
f715da3d6b Merge "Update the SDK AIDL list" into lmp-dev 2014-10-13 22:19:41 +00:00
Evan Charlton
b298a5a594 Update the SDK AIDL list 
Populate the framework.aidl list with .aidl files which are:
  - In the android.* namespace
  - Not marked @hide
  - Do not have their corresponding .java files marked @hide

Bug: 17952409
Change-Id: I1f4abf7abbc298a51605571cd168362dcc5603b2
 2014-10-13 15:12:57 -07:00
Sarah Maddox
60c5fbc3a9 am 64aec659: am 8601b1b1: Merge "Fixed a typo in Perf Tips." into lmp-dev 
* commit '64aec659b7b222c8663e36852f75f685c0ab8de4':
  Fixed a typo in Perf Tips.
 2014-10-13 22:08:47 +00:00
Alan Viverette
5bcc5b287b am 21ad8732: am b927dfc7: Merge "Increase contrast for money permission" into lmp-dev 
* commit '21ad8732314872cc62ba2d311343c23b1e9078b8':
  Increase contrast for money permission
 2014-10-13 22:08:43 +00:00
Elliott Hughes
b8175ad3bf am c02ddd6a: am c130b428: Merge "Ensure that the SIM language doesn\'t override the user language on the encryption UI." into lmp-dev 
* commit 'c02ddd6a0a4643ce49150231a104d77d90c13f27':
  Ensure that the SIM language doesn't override the user language on the encryption UI.
 2014-10-13 22:08:39 +00:00
Jeff Sharkey
1229d266f6 am c4d774d5: am 461b3896: Merge "DocumentsUI: Add content description for nav." into lmp-dev 
* commit 'c4d774d5d87439180eed0be45eb2242f8bf7cfaa':
  DocumentsUI: Add content description for nav.
 2014-10-13 22:08:35 +00:00
Jesse Hall
8d3cf106aa am d4b38fe5: am 647e0df0: Merge "Surface: Leave object in unlocked state when unlockCanvasAndPost fails" into lmp-dev 
* commit 'd4b38fe5c06f622b984e7f84f299269efce92e42':
  Surface: Leave object in unlocked state when unlockCanvasAndPost fails
 2014-10-13 22:08:31 +00:00
Amit Mahajan
3547c13e0d am 097c8d60: am 1901e175: Merge "Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to signatureOrSystem." into lmp-dev 
* commit '097c8d60115a9207ba4140ef99766741a2256361':
  Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to signatureOrSystem.
 2014-10-13 22:08:28 +00:00
Sarah Maddox
64aec659b7 am 8601b1b1: Merge "Fixed a typo in Perf Tips." into lmp-dev 
* commit '8601b1b1ca75512177aa3539d33292250b5c9a2d':
  Fixed a typo in Perf Tips.
 2014-10-13 22:04:22 +00:00
Alan Viverette
21ad873231 am b927dfc7: Merge "Increase contrast for money permission" into lmp-dev 
* commit 'b927dfc774bd9d2c52cf6fbf50fe2eca16994c27':
  Increase contrast for money permission
 2014-10-13 22:04:15 +00:00
Elliott Hughes
c02ddd6a0a am c130b428: Merge "Ensure that the SIM language doesn\'t override the user language on the encryption UI." into lmp-dev 
* commit 'c130b428c5d7eb25dc7651c5cea82182f2241ddf':
  Ensure that the SIM language doesn't override the user language on the encryption UI.
 2014-10-13 22:04:11 +00:00
Jeff Sharkey
c4d774d5d8 am 461b3896: Merge "DocumentsUI: Add content description for nav." into lmp-dev 
* commit '461b3896babdbfb365282378df89cde2dddb5a3a':
  DocumentsUI: Add content description for nav.
 2014-10-13 22:04:06 +00:00
Jesse Hall
d4b38fe5c0 am 647e0df0: Merge "Surface: Leave object in unlocked state when unlockCanvasAndPost fails" into lmp-dev 
* commit '647e0df0c711cd53763367c86b15f10470eaeb6f':
  Surface: Leave object in unlocked state when unlockCanvasAndPost fails
 2014-10-13 22:03:59 +00:00
Amit Mahajan
097c8d6011 am 1901e175: Merge "Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to signatureOrSystem." into lmp-dev 
* commit '1901e175079e3b7242ace7d4b3ec38af3723f91b':
  Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to signatureOrSystem.
 2014-10-13 22:03:52 +00:00
Sarah Maddox
8601b1b1ca Merge "Fixed a typo in Perf Tips." into lmp-dev 2014-10-13 21:50:30 +00:00
Alan Viverette
b927dfc774 Merge "Increase contrast for money permission" into lmp-dev 2014-10-13 21:31:40 +00:00
Alan Viverette
2f82e48abb Merge "Always project ripples" into lmp-mr1-dev 2014-10-13 20:58:48 +00:00
Elliott Hughes
c130b428c5 Merge "Ensure that the SIM language doesn't override the user language on the encryption UI." into lmp-dev 2014-10-13 20:55:30 +00:00
John Spurlock
0e588ea8e1 Make SeekBarVolumizer restartable. 
Decouple start from constructor, making it possible to restart
once stopped.

Bug:17898190
Change-Id: I2f860864161f818d5a62a28331ef1c47051fb39f
 2014-10-13 20:46:36 +00:00