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

3582 Commits

Author SHA1 Message Date
Diego Perez
9af506fb5b am 143eaa81: am 2ea82244: am 263e6dfa: Merge "Make status and navigation bars widgets and usable from layouts" into lmp-mr1-dev 
* commit '143eaa81934e47c8acb8338d1a2383eb79b690ef':
  Make status and navigation bars widgets and usable from layouts
 2015-05-07 00:21:35 +00:00
Diego Perez
ae4619dd7f am df4c977d: am 24e10c0b: am 19dbe50b: Merge "Move StatusBar to use statusBarColor theme attribute" into lmp-mr1-dev 
* commit 'df4c977d760ccfcf929c77b100faa5f8f38df158':
  Move StatusBar to use statusBarColor theme attribute
 2015-05-07 00:21:29 +00:00
Diego Perez
52ef7fce16 am ffeb8117: am 9c13c8de: am bc47abe4: Merge "Make sure shaders use a color model compatible with the destination." into lmp-mr1-dev 
* commit 'ffeb8117b139f61dd7c92bda6a7d47b83871cb66':
  Make sure shaders use a color model compatible with the destination.
 2015-05-07 00:21:24 +00:00
Deepanshu Gupta
a131bfe094 am 3dbd18cd: am 872e9950: am 1f8e3de4: Merge "More layoutlib tests." into lmp-mr1-dev 
* commit '3dbd18cdfe6af1a9c36261551ef98d39e849d389':
  More layoutlib tests.
 2015-05-07 00:21:19 +00:00
Deepanshu Gupta
a663e01204 am 9abe4232: am 7e4c1a92: am b4ca896f: Merge "RecyclerView in LayoutLib: better XML attrs." into lmp-mr1-dev 
* commit '9abe42324f2252460b003e6fcdb097910e16178a':
  RecyclerView in LayoutLib: better XML attrs.
 2015-05-07 00:21:14 +00:00
Diego Perez
9efcb30861 am 21246bd9: am 8e75e307: am 1bc7fb2d: Merge "Fix isThemeAppCompat NPE when using an invalid theme" into lmp-mr1-dev 
* commit '21246bd92f54be468496848b659bf47f2522430a':
  Fix isThemeAppCompat NPE when using an invalid theme
 2015-05-07 00:21:09 +00:00
Deepanshu Gupta
9c9bcd3486 am cae76a70: am 46241071: am 4f8a9996: Merge "Nullity annotations to some tests." into lmp-mr1-dev 
* commit 'cae76a70bfca9f37a10f34582cddbe0792625f26':
  Nullity annotations to some tests.
 2015-05-07 00:21:03 +00:00
Deepanshu Gupta
b2951490ea am b19325be: am 2e3c41a4: am 92e79868: Merge "Fix title bar showing when not required." into lmp-mr1-dev 
* commit 'b19325be074e466c39e86fd4418726a7c305546c':
  Fix title bar showing when not required.
 2015-05-07 00:20:59 +00:00
Deepanshu Gupta
88b193d717 am 047a28ec: am 96437fb4: am 9aa600e7: Merge "LayoutLib: fix crash when shadow size <=0." into lmp-mr1-dev 
* commit '047a28ec506bb40081eef6eaf8434884157709ce':
  LayoutLib: fix crash when shadow size <=0.
 2015-05-07 00:20:53 +00:00
Diego Perez
0e20bd8e50 Merge changes I60c09f33,Ie0134c2b into lmp-mr1-dev 
* changes:
  Add new parameter to the render method to allow forcing a measure pass.
  Avoid caching mImage on the main render loop and use clipping.
 2015-05-07 00:14:26 +00:00
Diego Perez
143eaa8193 am 2ea82244: am 263e6dfa: Merge "Make status and navigation bars widgets and usable from layouts" into lmp-mr1-dev 
* commit '2ea82244f0b4396444ec891ab664f9ac40c0b55b':
  Make status and navigation bars widgets and usable from layouts
 2015-05-07 00:09:11 +00:00
Diego Perez
df4c977d76 am 24e10c0b: am 19dbe50b: Merge "Move StatusBar to use statusBarColor theme attribute" into lmp-mr1-dev 
* commit '24e10c0bad54bdd3b37f6f7effea8f76b687ce3f':
  Move StatusBar to use statusBarColor theme attribute
 2015-05-07 00:09:00 +00:00
Diego Perez
ffeb8117b1 am 9c13c8de: am bc47abe4: Merge "Make sure shaders use a color model compatible with the destination." into lmp-mr1-dev 
* commit '9c13c8de8291aac69958a106248d3229ff90609f':
  Make sure shaders use a color model compatible with the destination.
 2015-05-07 00:08:53 +00:00
Deepanshu Gupta
3dbd18cdfe am 872e9950: am 1f8e3de4: Merge "More layoutlib tests." into lmp-mr1-dev 
* commit '872e9950a227128d323c24eb369863e16964493a':
  More layoutlib tests.
 2015-05-07 00:08:45 +00:00
Deepanshu Gupta
9abe42324f am 7e4c1a92: am b4ca896f: Merge "RecyclerView in LayoutLib: better XML attrs." into lmp-mr1-dev 
* commit '7e4c1a92b8f3ce02df0a1502be45c450308d81b7':
  RecyclerView in LayoutLib: better XML attrs.
 2015-05-07 00:08:36 +00:00
Diego Perez
21246bd92f am 8e75e307: am 1bc7fb2d: Merge "Fix isThemeAppCompat NPE when using an invalid theme" into lmp-mr1-dev 
* commit '8e75e307373a03dcbc55ce71be5b50f80e0474db':
  Fix isThemeAppCompat NPE when using an invalid theme
 2015-05-07 00:08:29 +00:00
Deepanshu Gupta
cae76a70bf am 46241071: am 4f8a9996: Merge "Nullity annotations to some tests." into lmp-mr1-dev 
* commit '4624107185135db9db6bfbfb3d0c3a0951c19ee1':
  Nullity annotations to some tests.
 2015-05-07 00:08:22 +00:00
Deepanshu Gupta
b19325be07 am 2e3c41a4: am 92e79868: Merge "Fix title bar showing when not required." into lmp-mr1-dev 
* commit '2e3c41a4e4fbb811cdafc754708d62cba7c6c1b6':
  Fix title bar showing when not required.
 2015-05-07 00:08:01 +00:00
Deepanshu Gupta
047a28ec50 am 96437fb4: am 9aa600e7: Merge "LayoutLib: fix crash when shadow size <=0." into lmp-mr1-dev 
* commit '96437fb4b05be2602bb0fa215988be646aec28fc':
  LayoutLib: fix crash when shadow size <=0.
 2015-05-07 00:07:54 +00:00
Diego Perez
263e6dfa6a Merge "Make status and navigation bars widgets and usable from layouts" into lmp-mr1-dev 2015-05-06 23:52:06 +00:00
Diego Perez
19dbe50bb5 Merge "Move StatusBar to use statusBarColor theme attribute" into lmp-mr1-dev 2015-05-06 23:45:41 +00:00
Diego Perez
bc47abe4b4 Merge "Make sure shaders use a color model compatible with the destination." into lmp-mr1-dev 2015-05-06 23:43:50 +00:00
Deepanshu Gupta
1f8e3de40c Merge "More layoutlib tests." into lmp-mr1-dev 2015-05-06 23:43:15 +00:00
Deepanshu Gupta
b4ca896f05 Merge "RecyclerView in LayoutLib: better XML attrs." into lmp-mr1-dev 2015-05-06 23:42:56 +00:00
Diego Perez
1bc7fb2dcc Merge "Fix isThemeAppCompat NPE when using an invalid theme" into lmp-mr1-dev 2015-05-06 23:42:35 +00:00
Deepanshu Gupta
4f8a999682 Merge "Nullity annotations to some tests." into lmp-mr1-dev 2015-05-06 23:42:20 +00:00
Deepanshu Gupta
92e798682b Merge "Fix title bar showing when not required." into lmp-mr1-dev 2015-05-06 23:42:01 +00:00
Chih-Hung Hsieh
9a59a991dd Remove unused aapt target. 
BUG: 20765163
Change-Id: I13f36f76541216c5c1c20ae8866e09038e08e6f8
(cherry picked from AOSP commit 97627314a4d3e114afe3dbd764a51523e9f0b787)
 2015-05-06 00:13:37 +00:00
Prerepa Viswanadham
d1808401ca Merge changes from topic 'mwd-merge-050415' into mnc-dev 
* changes:
  Merge commit 'b6f59f4' into master_merge
  Merge commit 'f6db0ce' into master_merge
  Merge commit '17455a3' into master_merge
  Merge commit 'b4d5b32' into master_merge
  Merge commit 'a1a2fa7' into master_merge
  Merge commit '8dfdb98' into master_merge
  Merge commit 'eba66c3' into master_merge
 2015-05-05 01:06:38 +00:00
Adam Lesinski
6d8e4c48f9 AAPT2: Add option to generate static library 
Difference between normal app and static library is that
the R file uses non-final fields, and the extra chunks added
by AAPT2 remain in the final APK.

Change-Id: I61416387ca9bb3c21857ff7cfab5847ac3edf57a
 2015-05-04 16:43:24 -07:00
Adam Lesinski
838a68705b AAPT2: Include package name of attributes in styleable from another package 
Change-Id: I44f902e297238e7ee4ae27c02aaaf9e148652d2a
 2015-05-04 16:43:24 -07:00
Adam Lesinski
6ff19664f9 AAPT2: Record public status in a more robust way 
This allows us to store the source and comments of a resource's
public declaration and avoids issues where there is no default
configuration for a publicly declared resource (like with drawables
of various densities) and AAPT2 mistakenly took this as an error.

Change-Id: I07a2fe9f551daefcce842f205fb219d2fa453ebc
 2015-05-04 16:43:24 -07:00
Adam Lesinski
24aad163bc Add namespace handling in attribute values 
Previously, you could only reference namespace prefixes in attribute names:

<View xmlns:appcompat="http://schemas.android.com/apk/res/android.support.v7.appcompat"
      appcompat:name="hey"
      ...

Now you can also reference them in resource names within an attribute value:

      ...
      android:text="@appcompat:string/confirm"
      ...

Which will be treated as "@android.support.v7.appcompat:string/confirm".

Change-Id: Ib076e867a990c80cf877a704eb77cd1ef0b23b52
 2015-05-04 16:43:24 -07:00
Chih-Hung Hsieh
97627314a4 Remove unused aapt target. 
BUG: 20765163
Change-Id: I13f36f76541216c5c1c20ae8866e09038e08e6f8
 2015-05-04 15:49:46 -07:00
Deepanshu Gupta
0aa004c3cf LayoutLib: fix crash when shadow size <=0. 
Drawing empty rects results in IllegalArgumentException on Mac JRE 1.6.
Prevent that by checking the bounds before attempting to draw the rect.

Bug: 20687353
Change-Id: I45f48ee125196480bb6510cc49b24d2122bc3e48
 2015-05-01 21:38:02 +00:00
Alan Viverette
022fd57acb am 343affaf: am aba035d2: Merge "Fix layoutlib build breakage" into mnc-dev 
* commit '343affaf7dab7f251915aaac41472d5028e87d65':
  Fix layoutlib build breakage
 2015-04-30 23:20:02 +00:00
Alan Viverette
5181f279c8 Fix layoutlib build breakage 
Change-Id: Id3a9b79ac47ef27b04a96ff3ee50688bbb58f9c0
 2015-04-30 15:57:42 -07:00
Diego Perez
d0546353a8 Move StatusBar to use statusBarColor theme attribute 
Change-Id: Ic0d8f4520a6dcb7225a2947cc56dc06a7340d3ba
 2015-04-30 16:28:06 +00:00
Narayan Kamath
75a219c523 Add a libbase static depedency for aapt2. 
Required by libziparchive.

(cherry picked from commit 231e054dfd9dfc2e51ecd41dca5e8d93ae648954)
Change-Id: Ifa33c9e44ebd583cf58b8a1239061c613fde92bc
 2015-04-29 16:20:07 +00:00
Narayan Kamath
bb4ed9aa3a am 815d9bb1: Merge "Add a static dependency on libbase." 
* commit '815d9bb178a0488ed1579cd230d447630ad0891b':
  Add a static dependency on libbase.
 2015-04-29 14:38:15 +00:00
Narayan Kamath
9c8ba9666d Add a static dependency on libbase. 
Used by libziparchive.

Change-Id: I120494b620c72b36a725b01f1f274f5dc862a9a3
 2015-04-29 14:07:41 +00:00
Diego Perez
8ff8de2cf2 Add new parameter to the render method to allow forcing a measure pass. 
Change-Id: I60c09f3375fc85c257a449f4372220741e01db54
(cherry picked from commit c13aa0c035cd226d27323bc0e533632ba32f6a84)
 2015-04-28 08:52:08 +00:00
Deepanshu Gupta
8381e2cdcc Merge "Fix view outline for shadows in LayoutLib." into mnc-dev 2015-04-27 23:20:35 +00:00
Raph Levien
c6abf5bff6 Expose drawTextRun publicly 
For correct low-level drawing of low level text, a method that
includes context for shaping is necessary, and it's similarly useful
to provide the direction explicitly rather than running the BiDi
algorithm on the text. The drawTextRun method (in both char[] and
CharSequence variants) has provided this functionality for several
major releases but has been internal. This patch exposes the
methods publicly, and also improves the doc strings for both
the new method and some related ones.

Bug: 20193553
Change-Id: I9be33ca5ae3e7db2b69a56298400671d5ef8ad05
 2015-04-27 15:33:03 -07:00
Chris Craik
1b60cc0529 Anti-alias by default 
Change-Id: I19434717dd3af4fdcffbfcca2ffbb485dfebe644
 2015-04-27 18:11:57 +00:00
Deepanshu Gupta
dbc7ca0bac Fix view outline for shadows in LayoutLib. 
Set the bounds on the drawable before getting the view outline for
shadow. Also, reuse the temp outline object in AttachInfo rather than
allocating a new one each time.

Change-Id: I69793d38d60c5b9f9050569f2b22fbc7b90620bf
 2015-04-27 17:19:35 +00:00
Adam Lesinski
58ffaf9061 Merge "Properly mangle file names" 2015-04-25 01:21:00 +00:00
Kenny Root
22335a9730 am 6c1af7ea: am 8652bce1: am c71f2648: Merge "frameworks/base: switch to using NativeConstants." 
* commit '6c1af7ea497b1a2f04bdf45a19d2147f5b9665b9':
  frameworks/base: switch to using NativeConstants.
 2015-04-24 22:13:26 +00:00
Kenny Root
8652bce137 am c71f2648: Merge "frameworks/base: switch to using NativeConstants." 
* commit 'c71f264847eb75d53c0f99e6e1c42a8a1527d3b4':
  frameworks/base: switch to using NativeConstants.
 2015-04-24 21:49:47 +00:00
Adam Langley
6bf52c4271 frameworks/base: switch to using NativeConstants. 
NativeCrypto is a conscrypt class that contained several OpenSSL
constants. NativeConstants is the new class that contains the same
thing, but the latter is automatically generated and thus won't drift
from the C headers.

Bug: 20521989

Change-Id: I45c7b9a6844a06e3ffd09be692ebf733e1ebbbcc
 2015-04-24 10:00:45 -07:00