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

2615 Commits

Author SHA1 Message Date
Sander Alewijnse
a87863a8bd Fix deadlock window manager and device policy manager. 
Removed all communication from wm to device policy manager.
Added initialization of cache in wm by dpms.

Change-Id: Ifa0b8bfcd625464b156d5cc0fb66d342deda1c27
 2014-07-31 09:16:46 +00:00
Deepanshu Gupta
72c60ab7d4 Fix classpath for AndroidLocale 
Change-Id: I9af9ac05ec26f12529d51e566bf38789a2579390
 2014-07-31 05:10:03 +00:00
Adam Lesinski
63e646eed5 Add shared library support to aapt dump 
AAPT dump should be able to handle dynamic references
that often come with shared library resources.

Bug:16678251
Change-Id: I6c8cd943145aab20ca9db9694c8c433b3c64279b
 2014-07-30 21:53:48 +00:00
Adam Lesinski
57079519f4 Fix large memory corruption in AAPT 
When assigning a new string pool to a package, don't release the
reference to the old memory immediately, as the cleanup code that
is called after references the old memory.

Bug: 16155257
Change-Id: I3eaeb81191b71a282a0ef82856023f09707f1b17
 2014-07-30 18:46:51 +00:00
Adam Lesinski
ae9e68a349 Merge "Have AEP GL feature depend on GLES 3.1 in badging" into lmp-dev 2014-07-28 22:45:16 +00:00
Adam Lesinski
d7a94da476 Have AEP GL feature depend on GLES 3.1 in badging 
AAPT dump badging should output the uses-gl-es tag with
a version of 3.1 when android.hardware.opengles.aep is
declared as a feature.

Change-Id: I8affc6dad574c8303c6ba9810ad8e6e205ea9506
 2014-07-25 22:45:33 +00:00
Adam Lesinski
d4bd75be4f Merge "Add <feature-group> tag and change aapt badging" into lmp-dev 2014-07-24 15:36:09 +00:00
Adam Lesinski
ec1fb4184e am eebc0d09: am 1038bf1d: am 94499248: Merge "Add <feature-group> tag and change aapt badging" into lmp-dev 
* commit 'eebc0d090d36f8d00b841faea1bb75444963272a':
  Add <feature-group> tag and change aapt badging
 2014-07-24 23:49:51 +00:00
Adam Lesinski
3d4be18bfb am 1038bf1d: am 94499248: Merge "Add <feature-group> tag and change aapt badging" into lmp-dev 
* commit '1038bf1d7a592c74bcc48d729ccea1f56d8fce1d':
  Add <feature-group> tag and change aapt badging
 2014-07-24 23:34:49 +00:00
Tim Murray
4ebfe4c127 am 884f5e14: am 638a2b2d: am 8224edb9: Merge "Update makefile for clang host build." 
* commit '884f5e1411655f096f6d1f4c16399d15c6ce24ab':
  Update makefile for clang host build.
 2014-07-24 21:12:47 +00:00
Tim Murray
7d8be89420 am 638a2b2d: am 8224edb9: Merge "Update makefile for clang host build." 
* commit '638a2b2dac2e5a020693836d910789aee3c14795':
  Update makefile for clang host build.
 2014-07-24 21:08:21 +00:00
Tim Murray
638a2b2dac am 8224edb9: Merge "Update makefile for clang host build." 
* commit '8224edb94f6421a2d910362c56940dcf991847e6':
  Update makefile for clang host build.
 2014-07-24 21:04:20 +00:00
Adam Lesinski
2c72b6822d Add <feature-group> tag and change aapt badging 
A <feature-group> represents a set of features required
for an app to be compatible with a device. Multiple
<feature-group> elements represent a logical 'or'
of required features.

Features defined in the old way with <uses-feature> tags
under the <manifest> tag are automatically added to each
feature-group defined.

Defining a <feature-group> means that any default
features are not included (such as android.hardware.touchscreen)
and declared permissions do not imply any features.

Change-Id: I45626f0fdc546e47bcf2aead7ef05ebcca12b023
 2014-07-23 14:11:46 -07:00
Sander Alewijnse
549d39e549 am f3c523e0: am ce1088a6: am fcb490a2: Merge "Add Device Policy API to disable screen capture." into lmp-dev 
* commit 'f3c523e06217b19ae8389f9ca8be71ed2cd9fe7b':
  Add Device Policy API to disable screen capture.
 2014-07-23 17:18:27 +00:00
Sander Alewijnse
d2a1eec400 Add Device Policy API to disable screen capture. 
WindowManager will set secure flag on SurfaceControl for
all windows of a flagged user to prevent screen capture.
API is consistent with the camera disable API.

Change-Id: Ib180f67f1ad827b6f4aca2af615274256cce58f4
 2014-07-23 13:44:28 +00:00
Deepanshu Gupta
aa474ff0f3 am 9a61270d: Merge "LayoutLib: Fix EditText rendering [DO NOT MERGE]" into klp-modular-dev 
* commit '9a61270d67f654f3558b29f6b3e78c0b2fbe0178':
  LayoutLib: Fix EditText rendering [DO NOT MERGE]
 2014-07-22 01:04:00 +00:00
Deepanshu Gupta
b51750fda6 am 0ca0853c: Merge "Update layoutlib create README [DO NOT MERGE]" into klp-modular-dev 
* commit '0ca0853c52a81b317996b2997373f5882b369c80':
  Update layoutlib create README [DO NOT MERGE]
 2014-07-22 01:03:55 +00:00
Deepanshu Gupta
c54100d449 Update layoutlib create README [DO NOT MERGE] 
Update the doc to reflect the current state of the tool and use a
consistent 100 char column limit.

Change-Id: I64fb58cc46abbc2f3759cb1f99d42b5090c1409f
(cherry picked from commit 88585f404cb493129847e4487b628062674a4ede)
 2014-07-21 17:37:20 -07:00
Deepanshu Gupta
f5fbff9b1a LayoutLib: Fix EditText rendering [DO NOT MERGE] 
Framework has overloaded java.lang.System.arraycopy() for char[]. The
method is not present on the Desktop VMs. This change replaces the calls
to this method by its more general alternative - the one using Objects.

TODO: Make it more configurable and flexible to allow rewrite of any
such methods in the future.

Change-Id: I6823b13e52b1c555eb257d02b79707d84e73236f
(cherry picked from commit fc3e93300733b4a161adb9cceebea6cda353d085)
 2014-07-21 17:38:00 -07:00
Deepanshu Gupta
0804e0aded am a9e488a6: am d8d3e87c: am 4627c98d: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into klp-dev 
* commit 'a9e488a6d2b20ecc91412072a5f39022d7fe6926':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 21:53:37 +00:00
Deepanshu Gupta
87234e8544 am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE] 
* commit '9c48ab82084828087c47086f2379b4927ec057e2':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 21:50:15 +00:00
Deepanshu Gupta
a9e488a6d2 am d8d3e87c: am 4627c98d: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into klp-dev 
* commit 'd8d3e87cf339deaf890e4b083d09b074065cd35f':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 21:48:05 +00:00
Deepanshu Gupta
d7f2bf067f am f75489f2: am c425c438: am 710a55b4: Fix default level flags for bidi. [DO NOT MERGE] 
* commit 'f75489f2f1f2dc4f75205f4b242800777bf7d5ec':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 21:45:47 +00:00
Deepanshu Gupta
9c48ab8208 am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE] 
* commit 'ccf7b2aac600b6069f03f7f420872b64cc5e6726':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 21:45:28 +00:00
Deepanshu Gupta
a3d2c7e72b am 85c7b209: am 5efee91e: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr2-dev 
* commit '85c7b209c3babea164f5bec13352e7f5f262ea58':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 21:45:20 +00:00
Deepanshu Gupta
610341b3eb am 95bbeb96: am b8e4e8e1: am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev 
* commit '95bbeb967243d453bf793cd06dd2dd914667fee9':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 21:45:19 +00:00
Deepanshu Gupta
d8d3e87cf3 am 4627c98d: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into klp-dev 
* commit '4627c98da4ecb66e32a3273ea3713df528cda6b2':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 21:42:10 +00:00
Deepanshu Gupta
95bbeb9672 am b8e4e8e1: am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev 
* commit 'b8e4e8e1f4fb1139368dc3f36e2d7bcf59dc32e9':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 21:41:18 +00:00
Deepanshu Gupta
f75489f2f1 am c425c438: am 710a55b4: Fix default level flags for bidi. [DO NOT MERGE] 
* commit 'c425c438a38f9065c4fbae76602bce66563950c0':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 21:39:42 +00:00
Deepanshu Gupta
ccf7b2aac6 am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE] 
* commit '5af7324ace4f318d7395b680beabec7a0f0e39b3':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 21:39:35 +00:00
Deepanshu Gupta
696eb4da44 am c39916f7: am 37f54f4c: am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE] 
* commit 'c39916f7dadb2f8be2e7523c5ceade9f04a94e1e':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 21:39:33 +00:00
Deepanshu Gupta
c3a7763b84 am 918ca12f: am 10395cbb: Fix default level flags for bidi. [DO NOT MERGE] 
* commit '918ca12ffc09a96194112edf3540d94c32918a07':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 21:36:29 +00:00
Deepanshu Gupta
c39916f7da am 37f54f4c: am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE] 
* commit '37f54f4c1e2d97b33bdd8abe5f196debecc5437d':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 21:35:21 +00:00
Deepanshu Gupta
c425c438a3 am 710a55b4: Fix default level flags for bidi. [DO NOT MERGE] 
* commit '710a55b419908068529a8e95c4eba88297f67e3f':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 21:32:52 +00:00
Tim Murray
132ed0f2b4 Update makefile for clang host build. 
bug 16172793

Change-Id: If7484c5dbcccce7d925bec97bff0a3e4c30e9434
 2014-07-17 16:37:42 -07:00
Deepanshu Gupta
4627c98da4 Merge "Fix style resolution for styles with '.' [DO NOT MERGE]" into klp-dev 2014-07-17 21:09:48 +00:00
Deepanshu Gupta
5efee91e12 Merge "Fix style resolution for styles with '.' [DO NOT MERGE]" into jb-mr2-dev 2014-07-17 21:09:48 +00:00
Deepanshu Gupta
d3ac01ff76 Merge "Fix style resolution for styles with '.' [DO NOT MERGE]" into jb-mr1.1-dev 2014-07-17 21:04:20 +00:00
Ying Wang
871296d976 am 044a4fc9: am 7c5fe1db: am 1e976fd5: Build framework.jar with multidex support. 
* commit '044a4fc9d4b4e13c509be5a0929fd785dd98e178':
  Build framework.jar with multidex support.
 2014-07-21 22:42:04 +00:00
Ying Wang
88e199045b Build framework.jar with multidex support. 
We don't need the framework/framework2 split now with the multidex
support.

Change-Id: I30ee5c7e24df87b2c54e854f17fbf0b5adef4c60
 2014-07-21 15:23:14 -07:00
Deepanshu Gupta
e32bac5ef0 am 37423bbb: am db2a5ff1: am 78d85419: Fix missing initial moveto in path definition. 
* commit '37423bbbeab2822b39d859412aa80117a4b85282':
  Fix missing initial moveto in path definition.
 2014-07-21 19:23:58 +00:00
Deepanshu Gupta
3b37956010 Fix missing initial moveto in path definition. 
The Path_Delegate was missing a moveTo call which resulted in
IllegalPathStateException when rendering the ProgressBar.

Change-Id: Ibdae5f90ffd0a71a3de4ba945238239faa0b18b2
 2014-07-21 17:36:45 +00:00
Deepanshu Gupta
43aab0f419 am cdcebcef: Merge "Fix style resolution for styles with \'.\'" into lmp-preview-dev 
* commit 'cdcebcefed9a9bbf6835025d722ae31da1a93c85':
  Fix style resolution for styles with '.'
 2014-07-18 21:41:59 +00:00
Deepanshu Gupta
4f8500594f Merge "Fix style resolution for styles with '.'" into lmp-preview-dev 2014-07-17 21:04:20 +00:00
Ying Wang
4b8aa28ef2 Fix sdk build. 
Change-Id: I9073747f7a12f826fabf99c34dce813edf6462c1
 2014-07-17 14:30:54 -07:00
Deepanshu Gupta
6c57fc3019 DO NOT MERGE - Fix LayoutLib. 
This fixes a bad merge and contains partial cherrypicks of the following
commits to make LayoutLib working again:
103d40960daa0420995aa12881bef33892a0a2ab
803d77d8904a8fd66f0370cca6ed7f8b7cf68907
6a08225cee197e5baf80dd06dae46988db284122

Bug: 15987446
Change-Id: I41563305206d30ecdbc7f609c4b90d53edb42689
 2014-07-16 10:23:28 -07:00
Deepanshu Gupta
76dd54b64f Merge "Use BlendComposite for advanced PorterDuff Modes." into lmp-preview-dev 2014-07-15 20:35:01 +00:00
Deepanshu Gupta
85d43f01ed Use BlendComposite for advanced PorterDuff Modes. 
Not all PorterDuff modes are supported by Java's AlphaComposite. Use
BlendComposite for such modes.

Change-Id: I51486a40f09186cf8a87ce1e6a3d1cfcf39fb2d3
 2014-07-15 18:14:00 -07:00
Deepanshu Gupta
303b908d61 Optimize Blend composites. 
Removed redundant array allocations to improve performance for various
blending modes.

Change-Id: Iaba1d6ff3ad03eebdc859c599b610cc593370438
(cherry picked from commit 9ce074610413ce3a5dd0cef9295f0ae9061402b7)
 2014-07-15 18:13:53 -07:00
Deepanshu Gupta
e6bf903db9 Add BlendComposite.java 
The class is adapted from a demo tool for Blending Modes written by
Romain Guy (romainguy@android.com). The tool is available at
http://www.curious-creature.org/2006/09/20/new-blendings-modes-for-java2d/

Change-Id: I8f7c7ca08d3078106056764a4e2f1ce95d990137
(cherry picked from commit 882e08759137a77090c3c7dff8cba425a3393474)
 2014-07-15 18:13:46 -07:00