2386 Commits

Author SHA1 Message Date
Deepanshu Gupta
fe6f30491f Remove @NonNull attribute [DO NOT MERGE]
The tools prebuilt in this branch doesn't have the annotation.

Change-Id: I852f91c5202ed5f4c393d1226a4fa0b6fa4d63c1
2014-05-30 14:49:51 -07:00
Florin Malita
5c3d927e17 Add a native Canvas wrapper.
Instead of storing a direct SkCanvas reference, Canvas now tracks
an opaque native wrapper class. The native wrapper can be used to
store additional info for emulating deprecated Skia features
(at this point it only stores a canvas).

Some notes:

* all native handle -> SkCanvas conversions are routed through a
  handful of native utility methods.
* safeCanvasSwap() refactored as a lower level setNativeBitmp() - which
  is what clients need.
* removed unused get_thread_msec() (Canvas.cpp)

Change-Id: I715a5a6f1e1621c1cfc1e510ae4f2ea15cf11114
2014-05-30 16:11:04 -04:00
Deepanshu Gupta
866d40fc39 Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Mark the menus in the ActionBar and the ones in the Overflow popup
separately. This enables the IDE to differentiate between the two and
enable gestures such as double-click to open the menu xml for menus in
the ActionBar and single click for the menus in the Overflow popup.

Change-Id: I7a23f87d34d618a134ffbe3a665be695915d4bae
(cherry picked from commit 79f45b43db4dfd605d1e7ddd2c71be4ef8285269)
2014-05-30 12:13:42 -07:00
Deepanshu Gupta
a0fc1f4626 LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
?attr/foo in platform files wasn't resolved properly. The IDE checked
the app namespace for the attribute even though it is being referenced
from a platform file.

Change-Id: I7db6dfef5b540d99804c298120578da9d060b886
(cherry picked from commit 8974a5e6d8408b4cd93f1befb05cc9b654b71e4a)
2014-05-30 12:13:32 -07:00
Deepanshu Gupta
79f45b43db Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Mark the menus in the ActionBar and the ones in the Overflow popup
separately. This enables the IDE to differentiate between the two and
enable gestures such as double-click to open the menu xml for menus in
the ActionBar and single click for the menus in the Overflow popup.

Change-Id: I7a23f87d34d618a134ffbe3a665be695915d4bae
(cherry picked from commit f542f28a31b38a4e454535a1fea63968811b418c)
2014-05-30 12:00:54 -07:00
Deepanshu Gupta
8974a5e6d8 LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
?attr/foo in platform files wasn't resolved properly. The IDE checked
the app namespace for the attribute even though it is being referenced
from a platform file.

Change-Id: I7db6dfef5b540d99804c298120578da9d060b886
(cherry picked from commit e21c7ec8a02922a6bec19436897f9ee02be3d6c2)
2014-05-30 11:59:59 -07:00
Deepanshu Gupta
3885220ed5 Distinguish between menus in ActionBar and popup.
Mark the menus in the ActionBar and the ones in the Overflow popup
separately. This enables the IDE to differentiate between the two and
enable gestures such as double-click to open the menu xml for menus in
the ActionBar and single click for the menus in the Overflow popup.

Change-Id: I7a23f87d34d618a134ffbe3a665be695915d4bae
2014-05-29 18:22:04 -07:00
Craig Mautner
8bd94d502d implement keyguardGoingAway() fixes build.
Fix bug 15326529.

Change-Id: I9095fe70721bfb031dd1080da1d61ff4e1a8c8ab
2014-05-29 10:53:46 -07:00
Deepanshu Gupta
85c69944bd Merge "Recurse into directories to find fonts. [DO NOT MERGE]" into lmp-preview-dev 2014-05-29 15:38:17 +00:00
Deepanshu Gupta
f251b06089 Merge "Parallel processing of the fonts. [DO NOT MERGE]" into lmp-preview-dev 2014-05-29 15:37:55 +00:00
Deepanshu Gupta
28b13b2332 Merge "Add multiple dir support to build_font.py [DO NOT MERGE]" into lmp-preview-dev 2014-05-29 15:37:45 +00:00
Deepanshu Gupta
2cb50d45a8 Merge "Layoutlib: Fix FontFamily_Delegate use after unref" into lmp-preview-dev 2014-05-29 15:37:24 +00:00
Deepanshu Gupta
1a5b0de877 Merge "Update delegates" into lmp-preview-dev 2014-05-29 15:37:07 +00:00
Xavier Ducrohet
de5637b9ec am ec9aa23e: Merge "Stopgap fix for layoutlib." into lmp-preview-dev
* commit 'ec9aa23e1e214c9359e38205495db225560c2753':
  Stopgap fix for layoutlib.
2014-05-29 09:43:33 +00:00
Brian Carlstrom
30c624c49c am 1240221a: Tracking ActionBarView change 1181f77bdfaa7bf8a8250cdd13c7b7a1d6ee0c44
* commit '1240221ac9cdc70ce2c79fcc48628d277e00354d':
  Tracking ActionBarView change 1181f77bdfaa7bf8a8250cdd13c7b7a1d6ee0c44
2014-05-29 09:43:28 +00:00
Brian Carlstrom
4f9c216448 am da1d4828: Tracking IWindowManager change 2ea3814083f27567ae07a1b449da3d596dd4d9d5
* commit 'da1d48285f2fc992de691a5abaf7c651a86201a2':
  Tracking IWindowManager change 2ea3814083f27567ae07a1b449da3d596dd4d9d5
2014-05-29 09:43:23 +00:00
Xavier Ducrohet
7ee26070ea Merge "Stopgap fix for layoutlib." into lmp-preview-dev 2014-05-29 05:27:32 +00:00
Brian Carlstrom
312da405eb Tracking ActionBarView change 1181f77bdfaa7bf8a8250cdd13c7b7a1d6ee0c44
Change-Id: I29a486557428806f26f900974e74f42f3afa4ad4
2014-05-28 21:43:35 -07:00
Brian Carlstrom
8c9360f3aa Tracking IWindowManager change 2ea3814083f27567ae07a1b449da3d596dd4d9d5
Change-Id: I6945cc9b4be174b55173ac2081edc5ee1bee6e67
2014-05-28 21:37:52 -07:00
Deepanshu Gupta
dc62340f18 Stopgap fix for layoutlib.
This is a temporary fix for changes made to TypedArray regrading theme
attributes.

Change-Id: I173fde6d8d3259479b0654ff331bc27bf2814fb0
2014-05-28 16:52:01 -07:00
Deepanshu Gupta
5a73454845 Add basic support for simulating older versions.
This adds rudimentary support for older versions of layoutlib by
changing the color of the status bar to white for froyo and earlier and
omitting the navigation bar for pre-ICS devices.

The color of the icons in the status bar is not changed yet.

Change-Id: I56a16b206ad357b6f3bc5c3d10701d03551847bc
2014-05-28 16:37:39 -07:00
Deepanshu Gupta
9113968f95 Layoutlib: Fix FontFamily_Delegate use after unref
FontFamily_Delegate was being reused after the nUnref call. The issue is
fixed by storing the reference to the FontFamily_Delegate directly in
the Typeface_Delegate rather than storing the native pointer.

Change-Id: I0db724a83c4be3d7b64ccba0989cd64129f2a785
2014-05-28 16:15:32 -07:00
Deepanshu Gupta
79ee46172b Update delegates
Update layoutlib delegates in response to commit
a631a36de986acea2ef6fdfbaf3441a28b914b15

Change-Id: I897a7e3a61286bfae9054415d555febe16410106
2014-05-28 15:04:50 -07:00
Deepanshu Gupta
baef8c1ffe Layoutlib fixes for L [DO NOT MERGE]
This adds the new delegates that were missing. This starts the work on
changes related to Minikin Fonts.

There are some changes related to TypedArray that still need to be
fixed.

Change-Id: Ic2397b64aa3f1f48926e849b14689c47d9ee7f8c
(cherry picked from commit 7ca3612094270183243938e79337c84effea7ad0)
2014-05-27 18:01:34 -07:00
Deepanshu Gupta
46eff27c32 Recurse into directories to find fonts. [DO NOT MERGE]
We now recurse into directories to find all fonts. This change is needed
to prevent having to list all fonts in external/google-fonts
individually.

As a side effect, we now only copy xml files over.

Change-Id: Ifdea3b8451878c2449ac7c5e17ef3d1b00d1b955
(cherry picked from commit c6364fd90de1600526d3431ce0740b6b856e48f0)
2014-05-27 17:57:05 -07:00
Deepanshu Gupta
d23417ab5d Parallel processing of the fonts. [DO NOT MERGE]
Font renaming for the SDK is now done in parallel.

This now reduces the running time for this script from about 30 mins to
about 5 to 10 mins. More speedup is expected when fonttools is updated.

Change-Id: I2c405f6d3e637e3067c8a1653e3cae206c32c0c3
(cherry picked from commit c6364fd90de1600526d3431ce0740b6b856e48f0)
2014-05-27 17:56:29 -07:00
Deepanshu Gupta
49a60d4d6d Add multiple dir support to build_font.py [DO NOT MERGE]
Change-Id: I705d3fbad688a0db309d3062463bf206442b2709
(cherry picked from commit 7e149f02c4e4403101e7e0e88af36cd4ab6f3554)
2014-05-27 17:55:40 -07:00
Deepanshu Gupta
b00cb8b8c7 Merge "Layoutlib fixes for L" 2014-05-27 21:18:04 +00:00
Deepanshu Gupta
b6f583aa70 Recurse into directories to find fonts.
We now recurse into directories to find all fonts. This change is needed
to prevent having to list all fonts in external/google-fonts
individually.

As a side effect, we now only copy xml files over.

Change-Id: Ifdea3b8451878c2449ac7c5e17ef3d1b00d1b955
2014-05-27 13:57:15 -07:00
Deepanshu Gupta
c7919924c6 Parallel processing of the fonts.
Font renaming for the SDK is now done in parallel.

This now reduces the running time for this script from about 30 mins to
about 5 to 10 mins. More speedup is expected when fonttools is updated.

Change-Id: I2c405f6d3e637e3067c8a1653e3cae206c32c0c3
2014-05-27 12:31:13 -07:00
Deepanshu Gupta
cba9fb915f Add multiple dir support to build_font.py
Change-Id: I705d3fbad688a0db309d3062463bf206442b2709
2014-05-23 14:09:29 -07:00
Deepanshu Gupta
130d2353ed Layoutlib fixes for L
This adds the new delegates that were missing. This starts the work on
changes related to Minikin Fonts.

There are some changes related to TypedArray that still need to be
fixed.

Change-Id: Ic2397b64aa3f1f48926e849b14689c47d9ee7f8c
2014-05-22 16:24:10 -07:00
Adam Lesinski
e34b8abf3a Merge "Don't dump data from a bad ResTable" 2014-05-21 21:59:33 +00:00
Jeff Brown
e665221764 am c2871696: am 6099fd21: Merge "Fix build." into klp-modular-dev
* commit 'c28716964c4525bf9a291404d7f14e74de23f36f':
  Fix build.
2014-05-21 11:16:58 +00:00
Jeff Brown
c28716964c am 6099fd21: Merge "Fix build." into klp-modular-dev
* commit '6099fd21e190ffdf8e03ba6d96cce0d53c2765fd':
  Fix build.
2014-05-21 08:40:39 +00:00
Jeff Brown
61116acdc6 Fix build.
Change-Id: I00f040ab16cf8a3b7a995b4626d49e70b97fb294
2014-05-20 22:16:25 -07:00
Adam Lesinski
25e9d55e96 Don't dump data from a bad ResTable
AAPT dumps data from a bad ResTable, which
causes crashes. Prevent this by checking if
there were errors when creating the ResTable.

Bug:14902008
Change-Id: I5e04ebf967c60b78c511dd175785a13bca52f09a
2014-05-19 15:01:43 -07:00
Deepanshu Gupta
779b59ced2 Merge "Add a script to rename fonts for SDK." 2014-05-16 20:27:11 +00:00
Amith Yamasani
891e65c5ce Merge "Variant of sendBroadcast with appOp flag for cross-user." 2014-05-16 19:40:20 +00:00
Amith Yamasani
3cf75729d5 Variant of sendBroadcast with appOp flag for cross-user.
Needed for delivering SMS notifications to multiple users.

Change-Id: Ib772292699aba37144621742e6f0ee5c68aadd78
2014-05-16 12:37:29 -07:00
Deepanshu Gupta
ad3f288311 Add a script to rename fonts for SDK.
Create a script that will rename the PS name encoded in the font that is
to be shipped with the SDK.

Change-Id: I675a98db39fea4525e3673656af1764eb7e5bb96
2014-05-16 12:31:24 -07:00
Deepanshu Gupta
528d876821 Merge "LayoutLib: Correctly resolve ?attr/foo" 2014-05-16 18:04:15 +00:00
Deepanshu Gupta
fba1dd24bf LayoutLib: Correctly resolve ?attr/foo
?attr/foo in platform files wasn't resolved properly. The IDE checked
the app namespace for the attribute even though it is being referenced
from a platform file.

Change-Id: I7db6dfef5b540d99804c298120578da9d060b886
2014-05-15 17:37:34 -07:00
Deepanshu Gupta
14c9b688fc Merge "Layoutlib: Update delegates for L" 2014-05-15 22:36:41 +00:00
Adam Lesinski
9e1e95f6e3 Merge "AAPT dump badging should allow refs in meta-data" 2014-05-15 21:17:33 +00:00
Adam Lesinski
b71adb6571 AAPT dump badging should allow refs in meta-data
The framework allows references in the <meta-data>
element in an AndroidManifest.xml, so badging should
do the same.

Bug:14088271
Change-Id: Ia8157655e21adaf11b7ace90a98a9cca3c8a476c
2014-05-15 14:14:41 -07:00
Adam Lesinski
4c1227e448 Merge "Fix crash in AAPT dump badging with bad StringPool" 2014-05-15 20:07:29 +00:00
Adam Lesinski
9cb2c68faf Fix crash in AAPT dump badging with bad StringPool
With a malformed StringPool, AAPT dump badging would
crash trying to retrieve the name of an XML tag.

Bug:14658555
Change-Id: I6aa6c53c60b20725a461da2d3a39685c174b4d35
2014-05-15 13:06:40 -07:00
Deepanshu Gupta
6376c407d4 Layoutlib: Update delegates for L
Update delegate method signatures for L.

Change-Id: Ie607293bcae60b2d3a61d1cad3ac5f04bda2a238
2014-05-15 09:30:11 -07:00
Deepanshu Gupta
14edfa8f65 am c1a74400: am 7dfe1fda: am c289ec6b: am 3a559d56: am b5b47565: am 98822f0e: am 6e923e1b: am 90d57721: am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build
* commit 'c1a7440094c94f4369f04f062485c9ea1162a78b':
  Fix build
2014-05-14 00:40:57 +00:00