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

128734 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
b279f5272e Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-04-17 15:48:38 +00:00
Baligh Uddin
715ec84d4c Merge "Import translations. DO NOT MERGE" 2014-04-17 15:48:37 +00:00
Baligh Uddin
b1a19c5134 Merge "Import translations. DO NOT MERGE" 2014-04-17 15:48:37 +00:00
Baligh Uddin
48bd1b195f Merge "Import translations. DO NOT MERGE" 2014-04-17 15:48:29 +00:00
Baligh Uddin
72f8056db1 Merge "Import translations. DO NOT MERGE" 2014-04-17 15:48:22 +00:00
Robin Lee
66e5d96cf9 Allow ProfileOwner apps to manage app restrictions 
Simple wrapper around the UserManager.{get|set}ApplicationRestrictions
APIs. Also added a new Intent to signal to running apps that the set
of restrictions has changed since startup.

Change-Id: Ifd108108a73f87325b499d9de2e1b2aacc59b264
 2014-04-17 15:58:03 +01:00
John Spurlock
9b5d028c69 Merge "Interim quick settings update." 2014-04-17 14:38:05 +00:00
John Spurlock
73203ebf97 Interim quick settings update. 
Make existing QS panel available via pulldown from header
(or keyguard status view on keyguard), update the affordances
as a hint.

Don't allow QS to scroll, cap to max rows.

Add scrim over panel to indicate that this is purely temporary.

Bug:14081801
Bug:14059974
Change-Id: I166033975cbc44b91f45ee70ea5c7540390670dd
 2014-04-17 10:26:45 -04:00
Skia_Android Canary Bot
5932b0d8fc Call SkShader::isOpaque() to determine opaqueness. 
It is invalid to call SkShader::getFlags() before calling
SkShader::setContext() - it will always return 0. Instead, call
SkShader::isOpaque().

Change-Id: If35108dc7f0eca55d2ec8466b8a50fd54dfb13a2
 2014-04-17 09:55:59 -04:00
Adrian Roos
379ac2d8b6 Merge "Fix broken status bar when activity is showing above keyguard" 2014-04-17 13:54:57 +00:00
Adrian Roos
25ab3d9438 Fix broken status bar when activity is showing above keyguard 
Bug: 14077213
Change-Id: I5d45fd1780498983995a469d0799e024ca25f3c7
 2014-04-17 15:46:41 +02:00
Adrian Roos
c8ba7d3f87 Make camera affordance fly away 
Stop gap measure to differenciate the accepted vs rejected
response of the camera affordance on the lockscreen.

Bug: 14081010
Change-Id: I04d170aa3f07ce5f440fb1d27f7c62ef2a903a03
 2014-04-17 15:09:41 +02:00
Griff Hazen
84f4adc9a5 Merge commit '59dfbb91' into klp-modular-dev-plus-aosp 
Remove all changes from the merge to stop propagation.

Conflicts:
	tools/layoutlib/bridge/src/android/content/res/AssetManager_Delegate.java
 2014-04-17 02:53:18 -07:00
Stephen Hines
414fa2c93a Fix improper use of JNI_ABORT for operations where Java objects are written. 
In these RS API calls, it is possible (and very likely) that some Java objects
are written to via JNI calls into the RS driver. These writes can end up being
discarded if we specify JNI_ABORT, particularly if the Java object has been
moved due to GC. The change introduces a readonly mode for some macro calls
and updates other JNI callers to appropriately skip JNI_ABORT.

Change-Id: I8c5f2ae959b3fbc9008c9d2ac4542f2ebab29b06
 2014-04-17 01:02:42 -07:00
Selim Cinek
19cadc203e ViewGroup now applies clipBounds to its children 
Fixed a bug where a ViewGroup did not clip its children to the
set clipBounds unless willNotDraw was set to true.

Bug: 14104527
Change-Id: I4892639bb860c1767f1ae6892f3e69525691e55e
 2014-04-17 09:55:11 +02:00
Deepanshu Gupta
59dfbb91ca Fix build [DO NOT MERGE] 
The branch is missing some CLs for 64-bit support. So, until they are
added, this change will fix the build.

Change-Id: Ia838caf60ca49b406101a3fb48a96afdcfb30c66
 2014-04-17 00:14:28 -07:00
Ji-Hwan Lee
886113dfca Minor fix to remove verbose logcat output in SyncStorageEngine 
Change-Id: I93b936202a99338329e73a41d4c1651369ecb70f
 2014-04-17 14:16:38 +09:00
Sungsoo Lim
33ac0dfc9f Merge "Replace sessionStateMap with sessionTokens." 2014-04-17 04:53:43 +00:00
Sungsoo Lim
7de5e23471 Replace sessionStateMap with sessionTokens. 
Change-Id: I6ec3390ca31cd17da35f0b0b83b1b09600d7d6d1
 2014-04-17 13:47:14 +09:00
John Reck
c731435649 Merge "Add missing resume() call" 2014-04-17 04:36:52 +00:00
John Reck
3b3d66ef68 Merge "Clear mIgnoreDirtyState after draw" 2014-04-17 04:33:15 +00:00
John Reck
6f07a0dc87 Add missing resume() call 
Bug: 14087850

Change-Id: Ic555ca6027e617c7ed6e7e66b5cf713c36ed1c6c
 2014-04-16 21:32:25 -07:00
John Reck
6313b9259d Clear mIgnoreDirtyState after draw 
Change-Id: I6dfb39e0ebc9a5732678d735d9bc5e8813926096
 2014-04-16 21:32:24 -07:00
Chris Craik
cd23df6a08 Deprecate color array drawBitmap methods 
Change-Id: I3339214ddaa7a32e9ddbbb1a074fa98e393eaadf
 2014-04-16 18:56:35 -07:00
Jeff Brown
92207df753 Add support for dynamically setting the virtual display surface. 
Previously, the surface that backs a virtual display had to be set
at the time when the display was created.  This change now makes
it possible to set or remove the surface later.  The virtual display
is treated as if it were "off" while no surface is attached to it.

Change-Id: Ib4fdbbb8b4ee79f0fb9ceb648f9bda4a8fa6a2ca
 2014-04-16 18:45:05 -07:00
Jason Sams
112d1b94ee Merge "Add BiCubic resize instrinsic" 2014-04-17 01:22:19 +00:00
Chris Craik
39b7353aca Add convenience methods, to encourage usage of ALL_SAVE_FLAG 
Change-Id: I29aefd70071ff49a259db5c06dded3cd531f6ef1
 2014-04-16 18:05:52 -07:00
Alan Viverette
dccbe8b02a Fix alert dialog alignment and touch feedback masking 
BUG: 13905057
Change-Id: Ia2bf4d170370c83f4ea863ecae24fffecc6fc020
 2014-04-16 17:56:29 -07:00
Scott Main
2b7345e4e3 am b04f3f74: am cb38ee51: am a106923e: Merge "add image itemprop to specify image for search result snippet" into klp-docs 
* commit 'b04f3f749b565ca075066bbc1fe89153941eaa65':
  add image itemprop to specify image for search result snippet
 2014-04-17 00:28:17 +00:00
Scott Main
b04f3f749b am cb38ee51: am a106923e: Merge "add image itemprop to specify image for search result snippet" into klp-docs 
* commit 'cb38ee510abed0112aa47cb2da6bfe182400f321':
  add image itemprop to specify image for search result snippet
 2014-04-17 00:22:02 +00:00
Scott Main
cb38ee510a am a106923e: Merge "add image itemprop to specify image for search result snippet" into klp-docs 
* commit 'a106923e9add041f73ccf5f46e8584ea4302c54c':
  add image itemprop to specify image for search result snippet
 2014-04-17 00:16:54 +00:00
Scott Main
a106923e9a Merge "add image itemprop to specify image for search result snippet" into klp-docs 2014-04-17 00:14:48 +00:00
Jason Sams
464af41b28 Add BiCubic resize instrinsic 
Change-Id: Iafec3f4260bb5d3a3133b034e42dfb0a94ae9f81
 2014-04-16 17:13:09 -07:00
Ricardo Cervera
f162266cc4 am f64feec2: am 4aa68e97: am dc9ca02c: docs: Watermark images with easter eggs 
* commit 'f64feec253d0c8a124f8ab16954bf71b1f3c3e92':
  docs: Watermark images with easter eggs
 2014-04-17 00:08:41 +00:00
Ricardo Cervera
f64feec253 am 4aa68e97: am dc9ca02c: docs: Watermark images with easter eggs 
* commit '4aa68e9799bf56bd5a35a1a49b512bbafce8f5df':
  docs: Watermark images with easter eggs
 2014-04-17 00:03:33 +00:00
Jason Sams
a2c8a1b887 am a09695f5: (-s ours) am 38f407cb: Merge "RenderScript bicubic resize intrinsic [DO NOT MERGE]" into klp-modular-dev 
* commit 'a09695f59c06256663f3a46546fbcdd6da10f180':
  RenderScript bicubic resize intrinsic [DO NOT MERGE]
 2014-04-17 00:00:06 +00:00
Alan Viverette
70802d2501 Fix VectorDrawable states 
BUG: 14083130
Change-Id: I8242523d9a4acd499154d2e7b9b9b52a3f1f742d
 2014-04-16 16:58:58 -07:00
Ricardo Cervera
4aa68e9799 am dc9ca02c: docs: Watermark images with easter eggs 
* commit 'dc9ca02c51ecc4468e60c391f8357b5025d6eef1':
  docs: Watermark images with easter eggs
 2014-04-16 23:58:36 +00:00
Scott Main
e26817d07e add image itemprop to specify image for search result snippet 
Change-Id: I8c0ed12268318124bdb944db9048fc73284823f9
 2014-04-16 16:57:21 -07:00
Aaron Whyte
8aa68921a5 am ee5d512d: am 4980996b: Merge "Allowed custom secure-adb confirmation via Activity or Service. It used to only be available via an Activity." into klp-modular-dev 
* commit 'ee5d512d624c15fa0c7e179ace24c7055a9f539d':
  Allowed custom secure-adb confirmation via Activity or Service. It used to only be available via an Activity.
 2014-04-16 23:56:07 +00:00
Jason Sams
a09695f59c am 38f407cb: Merge "RenderScript bicubic resize intrinsic [DO NOT MERGE]" into klp-modular-dev 
* commit '38f407cb1daca91af82943c931593d11a6c84b1c':
  RenderScript bicubic resize intrinsic [DO NOT MERGE]
 2014-04-16 23:54:22 +00:00
Jason Sams
38f407cb1d Merge "RenderScript bicubic resize intrinsic [DO NOT MERGE]" into klp-modular-dev 2014-04-16 23:49:30 +00:00
Aaron Whyte
ee5d512d62 am 4980996b: Merge "Allowed custom secure-adb confirmation via Activity or Service. It used to only be available via an Activity." into klp-modular-dev 
* commit '4980996bcc4e8065cf5dff1cf989d73face38281':
  Allowed custom secure-adb confirmation via Activity or Service. It used to only be available via an Activity.
 2014-04-16 23:49:20 +00:00
Alan Viverette
3d295988f2 Merge "Clean up VectorDrawable formatting" 2014-04-16 23:48:32 +00:00
Aaron Whyte
4980996bcc Merge "Allowed custom secure-adb confirmation via Activity or Service. It used to only be available via an Activity." into klp-modular-dev 2014-04-16 23:45:22 +00:00
Jason Sams
d666d92b80 RenderScript bicubic resize intrinsic [DO NOT MERGE] 
Change-Id: Icebfb3137aacddce0705834c6d4d2547c709cb0a
 2014-04-16 16:41:01 -07:00
Ruben Brunk
a2e86e427d Merge "Update DNG tags." 2014-04-16 23:36:21 +00:00
Adam Powell
c44762eb5b am 3d678ad4: (-s ours) am 973ddaac: DO NOT MERGE Add isRound to WindowInsets 
* commit '3d678ad462ee237d86efd9d985eb518817761e05':
  DO NOT MERGE Add isRound to WindowInsets
 2014-04-16 23:27:00 +00:00
Alan Viverette
d20974bd51 Clean up VectorDrawable formatting 
Change-Id: I9110f6ddeda9a811e466e58e451fa95eca08e72e
 2014-04-16 16:24:00 -07:00
Adam Powell
3d678ad462 am 973ddaac: DO NOT MERGE Add isRound to WindowInsets 
* commit '973ddaacaef255b8659d35cfe4151dd5b7436138':
  DO NOT MERGE Add isRound to WindowInsets
 2014-04-16 23:23:02 +00:00