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

157162 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Craik
075b2b4ff9 Merge "Add details and performance warnings to save flag docs" into lmp-mr1-dev 2014-11-13 00:05:59 +00:00
Dianne Hackborn
377d80ba53 Merge "Put native apps above browser in resolver activity." into lmp-mr1-dev 2014-11-13 00:03:53 +00:00
Renato Mangini
19865ccd44 am 5d7f91c7: am 40ac90e9: am 1b657d92: Fix the order of sample categories left nav. 
* commit '5d7f91c77605a5c444eaaae2b812280c57ca244c':
  Fix the order of sample categories left nav.
 2014-11-12 23:47:14 +00:00
Geoff Mendal
57f06e94eb am 2d28d697: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '2d28d697f6235c497237a11abb973b9109999e38':
  Import translations. DO NOT MERGE
 2014-11-12 23:41:57 +00:00
Renato Mangini
5d7f91c776 am 40ac90e9: am 1b657d92: Fix the order of sample categories left nav. 
* commit '40ac90e99da90956f26cf7f7bb4c205e28bbbc66':
  Fix the order of sample categories left nav.
 2014-11-12 23:39:11 +00:00
Geoff Mendal
2d28d697f6 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-11-12 23:37:57 +00:00
Renato Mangini
40ac90e99d am 1b657d92: Fix the order of sample categories left nav. 
* commit '1b657d924301d1caa132797f2ab397ba48429e6b':
  Fix the order of sample categories left nav.
 2014-11-12 23:33:47 +00:00
Etan Cohen
00ead12087 Fix VoLTE configuration on secondary TMO MCC/MNC. 
Added in ag/573693. But underlying mechanism changed in ag/573692 and
not adjusted.

Change-Id: I2e4784df38ba35aec477d657753974b7918b08b0
 2014-11-12 23:23:08 +00:00
George Mount
fa781f8c2c Merge "Update GhostView properly when underlying view changes." into lmp-mr1-dev 2014-11-12 23:10:35 +00:00
Geoff Mendal
978f85c3da Import translations. DO NOT MERGE 
Change-Id: I3395ff410dc14afb14c0626368fd66da77996963
Auto-generated-cl: translation import
 2014-11-12 15:01:37 -08:00
Jeff Sharkey
521ca5f8fb am 2e700004: am d68b87cd: Recover apps with malformed certificates. 
* commit '2e7000040e3d836bb591e29515974817afc49488':
  Recover apps with malformed certificates.
 2014-11-12 22:24:24 +00:00
Jeff Sharkey
2e7000040e am d68b87cd: Recover apps with malformed certificates. 
* commit 'd68b87cdd402d46013170d9316a31c82be4e4816':
  Recover apps with malformed certificates.
 2014-11-12 22:20:46 +00:00
Alan Viverette
667ec63c9e Merge "Don't propagate AnimatedStateListDrawable state change to super()" into lmp-mr1-dev 2014-11-12 22:19:06 +00:00
George Mount
70cb4f3e71 Merge "Fix getChildVisibleRect to clip correctly." into lmp-mr1-dev 2014-11-12 22:11:45 +00:00
Renato Mangini
1b657d9243 Fix the order of sample categories left nav. 
Bug: 18323953
Change-Id: Iea882fed74428d092c02e3cfcf2171c4c596b8a8
 2014-11-12 14:07:48 -08:00
Ignacio Solla
c3631b985f Merge "Fix docs build breakage" into lmp-mr1-dev 2014-11-12 21:58:46 +00:00
Dianne Hackborn
fabb70b2ef Add reporting of Parcel memory/count. 
Also fix issue #18340771: Dumpsys Procstats missing a newline

Change-Id: I0c612187a3fb4d7eeafbf97d373efdef732c477e
 2014-11-12 21:56:30 +00:00
Ignacio Solla
53f2569487 Fix docs build breakage 
Change-Id: Id20a54d8da2b80f277e31c342fffbb3b7d0dc854
 2014-11-12 21:55:47 +00:00
Rob Tsuk
41a8043b30 Merge "Add a way to override Xfermode DO NOT MERGE" into lmp-mr1-dev 2014-11-12 21:42:00 +00:00
Ignacio Solla
10ece9c9d5 Merge "[WebView] Interface to access hidden APIs." into lmp-mr1-dev 2014-11-12 21:17:07 +00:00
ztenghui
4e50ee4f42 Merge "Shadow: Fix the crash in spot shadow" into lmp-mr1-dev 2014-11-12 21:16:31 +00:00
Jeff Sharkey
d68b87cdd4 Recover apps with malformed certificates. 
There was a window of time in Lollipop where we persisted certificates
after they had passed through a decode/encode cycle.  The well-written
OpenSSL library was liberal when decoding (allowing slightly malformed
certs to be parsed), but then strict when encoding, giving us
different bytes for effectively the same certificate.

A related libcore change (0c990ab4a90b8a5492a67b2b728ac9a4a1ccfa1b)
now returns the original bytes verbatim, fixing both pre-Lollipop
installs and installs after that change.

This change recovers any apps that had been installed during the
window of time described above by doing a one-time check to see if
the certs are effectively equal.

Bug: 18228011
Change-Id: Ib82bd6db718d0490d7a26c9c1014b7c8457a7f2d
 2014-11-12 13:16:06 -08:00
ztenghui
3932063bc7 Shadow: Fix the crash in spot shadow 
Fix the crash from searching for closest umbra vertex by initialized the
starting index correctly.

Fix another potential crash related to ray intersection by introducing epsilon.

b/18315089

Change-Id: I9ac9a781a885701a8388714d44f79a1d905e5d33
 2014-11-12 12:58:08 -08:00
ztenghui
ffcb5e210a Merge "AVD: Requires all animator has stopped before start again." into lmp-mr1-dev 2014-11-12 20:47:45 +00:00
Alan Viverette
26478bad42 Merge "Fix default attributes in ScaleDrawable" into lmp-mr1-dev 2014-11-12 20:33:31 +00:00
Rob Tsuk
4678dcc552 Add a way to override Xfermode DO NOT MERGE 
Add a non-public API to Canvas/GLES20Canvas to provide a way to draw
the touch ripple animation without using a save layer.

Change-Id: I6e2095adffe515194f669fb75bb67abf813bd518
 2014-11-12 12:25:24 -08:00
Eric Laurent
edd4a227e5 Merge "audiosystem JNI: check env pointer before use." into lmp-mr1-dev 2014-11-12 20:19:52 +00:00
Sandeep Siddhartha
850ec91e88 Merge "Don't unload the sound model on stopRecognition" into lmp-mr1-dev 2014-11-12 20:12:39 +00:00
Eric Laurent
449c588710 audiosystem JNI: check env pointer before use. 
Bug: 18332935.
Change-Id: I1ec820f0282833e13444ec05d50da3ce70d19d8d
 2014-11-12 11:07:48 -08:00
Ruben Brunk
68ced89949 Merge "Frameworks/base: Right transform in DngCreator" into lmp-mr1-dev 2014-11-12 18:46:47 +00:00
Alan Viverette
f9afb46bf7 Fix default attributes in ScaleDrawable 
Reverts default scales to correct value of -1, uses existing state
values when updating from typed array.

BUG: 18351309
Change-Id: I45d21fe017a7bea10e3cbda50f6db65d053aa2ec
 2014-11-12 10:24:40 -08:00
Wale Ogunwale
2755644d32 Merge "Fix build breakage from missing close brace." into lmp-mr1-dev 2014-11-12 18:22:12 +00:00
Sandeep Siddhartha
45c00b5877 Don't unload the sound model on stopRecognition 
This helps us in majority of the scenarios where the sound model doesn't
change across start/stop calls.

Bug: 17954633
Change-Id: Ibff817bb69bc69d2bb3a2603460fed596688b892
 2014-11-12 09:57:27 -08:00
smain@google.com
7d0d2f6c95 am c6bd0155: am 8d88f19b: am f9c4f6b5: Merge "fix code type and mention api level 21 exception for bindService()" into lmp-docs 
* commit 'c6bd0155a76842e39ea0bb75eca33e6e3804437c':
  fix code type and mention api level 21 exception for bindService()
 2014-11-12 17:56:26 +00:00
Renato Mangini
2a3ce1853c am ca011519: am a53b8bad: am 4b7b68d8: Add "notification" category for samples. 
* commit 'ca011519b61e2ae57dfe760547d7d073f7ec42f3':
  Add "notification" category for samples.
 2014-11-12 17:56:20 +00:00
smain@google.com
c6bd0155a7 am 8d88f19b: am f9c4f6b5: Merge "fix code type and mention api level 21 exception for bindService()" into lmp-docs 
* commit '8d88f19bfe8ec0afb27593c0dea9b547d8c80b48':
  fix code type and mention api level 21 exception for bindService()
 2014-11-12 17:52:06 +00:00
Renato Mangini
ca011519b6 am a53b8bad: am 4b7b68d8: Add "notification" category for samples. 
* commit 'a53b8badb994c3825140f68eba94888b3274c0b5':
  Add "notification" category for samples.
 2014-11-12 17:52:02 +00:00
Wale Ogunwale
1dfab89aff Fix build breakage from missing close brace. 
Change-Id: Ib0e58844b8b208d255ff8d9409d0e7c53f27378f
 2014-11-12 09:46:10 -08:00
smain@google.com
8d88f19bfe am f9c4f6b5: Merge "fix code type and mention api level 21 exception for bindService()" into lmp-docs 
* commit 'f9c4f6b56e1392a411e2996a2bf372873ebf14da':
  fix code type and mention api level 21 exception for bindService()
 2014-11-12 17:44:52 +00:00
Renato Mangini
a53b8badb9 am 4b7b68d8: Add "notification" category for samples. 
* commit '4b7b68d824ee8bf184f6bfb05f75c74c129a9f8e':
  Add "notification" category for samples.
 2014-11-12 17:44:48 +00:00
smain@google.com
f9c4f6b56e Merge "fix code type and mention api level 21 exception for bindService()" into lmp-docs 2014-11-12 17:41:36 +00:00
smain@google.com
9adc33a658 fix code type and mention api level 21 exception for bindService() 
Change-Id: I45460a1559960a32818e9cc88b1241b26f2f1f7d
 2014-11-12 09:38:00 -08:00
Alan Viverette
4fc2ea8402 Merge "Ensure time picker dialog fits on small screens" into lmp-mr1-dev 2014-11-12 17:32:31 +00:00
Alan Viverette
d9f3fdf45b Ensure time picker dialog fits on small screens 
Also fixes dialog padding in landscape mode and a bug in the
ColorStateList method used to apply a selected color.

BUG: 18251582
Change-Id: Id5b8c7893ec42fd4d5f4a7520e6ac170839d3143
 2014-11-12 09:31:22 -08:00
Geoff Mendal
cfefab71b1 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-11-12 17:07:10 +00:00
Geoff Mendal
3830c60b9c Import translations. DO NOT MERGE 
Change-Id: I629a49e626a3121f8df33574952162672c943341
Auto-generated-cl: translation import
 2014-11-12 08:55:50 -08:00
Wale Ogunwale
3ae0d3157d Fixed constant window switching on lock screen with Swype KB. 
We allow TYPE_INPUT_METHOD windows to show on the lock screen.
These windows can attached other types of windows (For this
case the Swype KB was attaching a PopupWinow which will be
of TYPE_APPLICATION). This causes the popup window app token
to be added to the list of apps to be hidden on the lock
screen, thereby preventing the lock screen from been hidden,
which then causes a layout cycle(s). Now, we remove app
tokens for non-app windows from the hidden list in case it
was added by any attached widow they migth have.

Also, when we are updating window animations, set the
hideWhenLocked flag for windows that are IME tragets so
they don't go through unneeded cycles of having their
visibility policy set to hide/show/hide/show/...

Bug: 18021493
Change-Id: I3680256d41793f62def42fda00e26db1dcc990cc
 2014-11-12 08:42:09 -08:00
Selim Cinek
89444a380d Merge "Solved notification overlay issue once and for all" into lmp-mr1-dev 2014-11-12 16:27:28 +00:00
Selim Cinek
046757300c Merge "Improved the dismiss all animation" into lmp-mr1-dev 2014-11-12 16:26:22 +00:00
Selim Cinek
9852ecd637 Merge "Fixed a bug where the clearable flag was set inconsistently" into lmp-mr1-dev 2014-11-12 16:13:07 +00:00