117010 Commits

Author SHA1 Message Date
Deepanshu Gupta
2d82586b96 Fix CalendarView to show the right labels. [DO NOT MERGE]
Change-Id: I95431f1054678d4192bd1621c1f69b29268f55e9
(cherry picked from commit 44bcd64e5b9fd211dd56b0598693a0559f65dc1a)
2014-05-05 18:32:04 -07:00
Deepanshu Gupta
64dc038012 Fix layoutlib [DO NOT MERGE]
Fix a NPE.

The cherry-pick differs slightly from the original to remove changes not
relevant to the current branch.

Bug: 11140701
Change-Id: Id92fc5359acf6dde1bcdbc781aaf637fdb6eecbf
(cherry-picked from 87be67f91719234cbd381ff0242b5efc8b6aa257)
2014-05-05 18:23:15 -07:00
Deepanshu Gupta
a59c27dd66 Fix ClassCastException when rendering ListView [DO NOT MERGE]
Bug: b.android.com/59300
Change-Id: Ia350adb3308daa8170bff755302760790163c811
(cherry picked from commit 7b5d54f05be61a7ab40021644a91c466e2897627)
2014-05-05 18:21:41 -07:00
Deepanshu Gupta
8a39c3afb2 Add orientation to configuration for layoutlib. [DO NOT MERGE]
Update the configuration with the device orientation before rendering.

Change-Id: Icd40901204fd13f90b18353e53a15e25e5b2176c
(cherry picked from commit d4875e19f5b7c69226783b0a6590831466159f84)
2014-05-05 18:17:13 -07:00
Adam Lesinski
f2d2c87181 AAPT should not process XML that failed to compile
AAPT would attempt to warn if an unprefixed 'id'
attribute was used in an XML resource file even
if that XML file failed to compile. The result
was undefined behaviour, including crashing the
process.

Change-Id: I1a9464ec937760e8d38bbe1af8d1b5d6b2c105a2
2014-05-05 12:01:21 -07:00
David Friedman
fd876194cf am 4146d546: Merge "Clarified recommended use cases for NDK. Added - "game engines" officially supported use case for NDK Removed - "self-contained" ambiguous in general and confusing to someone who is trying to do game development in C++ Removed - "that don\'t allocat
* commit '4146d546a4ab8465970e7c73bf1e9e00767931b6':
  Clarified recommended use cases for NDK. Added - "game engines" officially supported use case for NDK Removed - "self-contained" ambiguous in general and confusing to someone who is trying to do game development in C++ Removed - "that don't allocate a lot of memory" game engines do allocate a lot of memory.
2014-05-05 17:07:55 +00:00
David Friedman
4146d546a4 Merge "Clarified recommended use cases for NDK. Added - "game engines" officially supported use case for NDK Removed - "self-contained" ambiguous in general and confusing to someone who is trying to do game development in C++ Removed - "that don't allocate a lot of memory" game engines do allocate a lot of memory." into klp-docs 2014-05-05 17:05:22 +00:00
Deepanshu Gupta
90ce58ecfd Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
When running in edit mode, do not use the application info to get the
icon, since it will be null.

Change-Id: I174e6126ddca341d06c5f04939470ef52f0e771c
(cherry picked from commit 465cb53ba4b4a5edff9e9a63eb97d396b94d6568)
2014-05-04 13:31:10 -07:00
Deepanshu Gupta
099f40a950 Support actionProviderClass attribute for menus [DO NOT MERGE]
The change adds support for view cookies for actionProviderClasses (for
example, ShareActionProvider) in the action bar menus.

This also provides a more robust search for the overflowMenuButton.

Change-Id: I316c8b9a69e2e337b41ba0fe4e61af9fe850f750
(cherry picked from commit 7f56beb8403b597a676faf12643fef585a31007e)
2014-05-04 13:30:50 -07:00
Deepanshu Gupta
60b52ee929 Fix class name for OverflowMenuButton [DO NOT MERGE]
Change-Id: Ie3e709e7aadb2193397df8befef0c55624d7e4e3
(cherry picked from commit f61bd0020642cf0868486d307f2e68c8c02d6102)
2014-05-04 13:30:33 -07:00
Deepanshu Gupta
7c6f6481f4 Add special system view cookie to OverflowButton. [DO NOT MERGE]
Add a special view cookie to enable the IDE to identify the overflow
menu button in the Action Bar.

Change-Id: Ida3ed776afb8c9fa8af23b73d4cf6d47eef0ab87
(cherry picked from commit d558ebdb433af498a87e25673f7dd828a0e7439a)
2014-05-04 13:30:11 -07:00
Deepanshu Gupta
22de7c4c3d Fix style warnings in RenderSessionImpl [DO NOT MERGE]
Change-Id: I9d3cb23e4ea692f737a3e3d6c18cc8de18b66a3c
(cherry-picked from commit a98121ef5251b5ebdb8c1b0b6780d570844284b2)
2014-05-04 13:29:51 -07:00
Deepanshu Gupta
094fd8ecb6 Add view cookies for action bar menus. [DO NOT MERGE]
The change adds the view cookies for the menus rendered in the action
bar. This enables the IDE to map the menu to the relevant XML Tag in the
menu xml and show the highlighting accordingly.

The change also contains a bugfix where a method wasn't renamed
properly.

Change-Id: Idcfc263a8ebe0a4f25afa3a1eb085fa628fd03ca
(cherry-picked from commit 7704837947455909f295b088a3d15a20e107dbd7)
2014-05-04 13:29:14 -07:00
Deepanshu Gupta
7f56beb840 Support actionProviderClass attribute for menus [DO NOT MERGE]
The change adds support for view cookies for actionProviderClasses (for
example, ShareActionProvider) in the action bar menus.

This also provides a more robust search for the overflowMenuButton.

Change-Id: I316c8b9a69e2e337b41ba0fe4e61af9fe850f750
(cherry picked from commit 28fa661f79e18fc9fc46bf112edded9c0d07696f)
2014-05-02 18:01:11 -07:00
Deepanshu Gupta
f61bd00206 Fix class name for OverflowMenuButton [DO NOT MERGE]
Change-Id: Ie3e709e7aadb2193397df8befef0c55624d7e4e3
(cherry picked from commit 4b5fa4d318e7efaffdc678e0cb8953ffc78c2b1e)
2014-05-02 17:52:04 -07:00
Deepanshu Gupta
d558ebdb43 Add special system view cookie to OverflowButton. [DO NOT MERGE]
Add a special view cookie to enable the IDE to identify the overflow
menu button in the Action Bar.

Change-Id: Ida3ed776afb8c9fa8af23b73d4cf6d47eef0ab87
(cherry picked from commit c967d8dc62c429ecf3e27bf3714a953636e75cbf)
2014-05-02 17:43:25 -07:00
Deepanshu Gupta
a98121ef52 Fix style warnings in RenderSessionImpl [DO NOT MERGE]
Change-Id: I9d3cb23e4ea692f737a3e3d6c18cc8de18b66a3c
(cherry-picked from commit fbfeb1a90b6f8f3966c60a69d50ce8f608d9d861)
2014-05-02 17:34:00 -07:00
Deepanshu Gupta
7704837947 Add view cookies for action bar menus. [DO NOT MERGE]
The change adds the view cookies for the menus rendered in the action
bar. This enables the IDE to map the menu to the relevant XML Tag in the
menu xml and show the highlighting accordingly.

The change also contains a bugfix where a method wasn't renamed
properly.

Change-Id: Idcfc263a8ebe0a4f25afa3a1eb085fa628fd03ca
(cherry-picked from commit 5ba2f230faa355eb9bc1e90f6c48eeeb437f390c)
2014-05-02 17:33:05 -07:00
Deepanshu Gupta
56759be896 Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
In addition to the cherrypicked changes, appropriate changes due to
changes to com.android.internal.widget.ActionBarView are made.

The icon used in the Action Bar may not always be the right one due to
the above resolution.

Change-Id: Ib7cc314079099c010f7d53849e204db36c410357
(cherry-picked from commit 1b87390c9426c4bc9119829e9375d712dfde11c3)
2014-05-02 16:23:14 -07:00
Deepanshu Gupta
fe38489f67 Action bar rendering in layoutlib [DO NOT MERGE]
This also makes a couple of changes to the framework:
1. ShareActionProvider - Use edit mode to execute activity chooser code.
2. ActionBarImpl - add a new constructor for use by layoutlib.

This also relies on some changes to the plugin to pass the correct params.

Change-Id: Ia30fef816afd91ec1e439734d56b59b1323bfee2
(cherry-picked from 20e0695b554e883b095f5223be10b6e1097db49f)
2014-05-02 16:23:14 -07:00
Deepanshu Gupta
cc5340bc63 Add missing dependency in layoutlib build file [DO NOT MERGE]
Add missing dependency on built_ext_data

Change-Id: I4e7cca7f6cbc7f5b7416ac9b85a9aec01e61ecd4
(cherry-picked from commit b85d30a2c88b6a23e251347b14a75456c4daeca9)
2014-05-02 16:23:14 -07:00
Deepanshu Gupta
76dccb7f43 Fix theme/style resolution in Layoutlib [DO NOT MERGE]
Change-Id: Icfb91e566666408802dadc0e2070991151b16b9d
(cherry picked from commit 3c00b28bf60ab01b449e16df045238f4bae4d700)
2014-05-02 16:23:13 -07:00
Deepanshu Gupta
1ed75bde09 Remove references to non-std Java classes. [DO NOT MERGE]
This change adds a substitute for the Charsets class in java namespace.
The original cherry pick of the change had dropped this substitute. But
the substitute is required for bug b.android.com/59732

The original cherry-pick is 6335590aa8997944cc7fb358a315dbb9b789f87f and
the original change is 81f74f4bc96ea4266cebe1b785d095558f540800
The original Change-Id is Iac5b272652e2780c9bb72d19f415d150948ca589

Change-Id: I76c87c74ee088778b37d1a7a7d531e0fde5c758f
2014-05-02 16:22:14 -07:00
Deepanshu Gupta
6136af326e Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
The bug caused some classes to be missed when computing the dependencies
of the existing classes.

Change-Id: I7285ff67e016ce5d73a8550501f49acc73cfadfa
(cherry-picked from 6f9baea47757fef4745de434e09bd552fddc1f03)
2014-05-02 15:38:42 -07:00
Deepanshu Gupta
2bd65db15f Layoutlib tests now check methods return value [DO NOT MERGE]
The change is a cherry-pick from klp-dev.

The change also fixes the errors found by fixing the tests.

Change-Id: I87cef323c4eaee4e9f60475f01156b276593fa50
(cherry-picked from commit 89fdc0c556cf0fe2562fb8f0476e03cd51045164)
2014-05-02 14:19:47 -07:00
Deepanshu Gupta
c7149708e2 am bab277cc: am 13542c7e: (-s ours) am 00e0b992: am 75f435b0: am 495c14d8: (-s ours) am 47ad22ed: am 961e3281: am 6df2860b: Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]
* commit 'bab277cc9f6efd0f026a6fe30592acacf173178e':
  Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]
2014-05-02 19:50:48 +00:00
Deepanshu Gupta
b4367eafbc am 5ac33148: am 29376cea: (-s ours) am a996ff5c: am c529b700: am 8ad4b8b1: (-s ours) am 9932e589: am 9e2dadae: am bcbeaf83: Set default text style in layoutlib as NORMAL [DO NOT MERGE]
* commit '5ac331481a9531a11dfe81d21870d70c362a9a2c':
  Set default text style in layoutlib as NORMAL [DO NOT MERGE]
2014-05-02 19:50:46 +00:00
Deepanshu Gupta
6241a6ce28 am eecb79a8: am 22b47b28: (-s ours) am 16fda528: am b7431172: am 826a215c: (-s ours) am 320f1126: am cf3f108e: am 5be65fda: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
* commit 'eecb79a863583998159cb44d393db03eebbdf7bc':
  Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
2014-05-02 19:50:43 +00:00
Deepanshu Gupta
00251f7782 am d1830eb6: am 57e410d9: (-s ours) am 9f81e73a: am 28ec8b4f: am 0a37981c: (-s ours) am 1b28d8d4: am d642de58: am ec4623d0: Improve text rendering and measurement. [DO NOT MERGE]
* commit 'd1830eb67841601ea259a4c6cbaf754aceac4064':
  Improve text rendering and measurement. [DO NOT MERGE]
2014-05-02 19:50:41 +00:00
Deepanshu Gupta
6214d7aa50 am 5f0fb2a1: am 4da3827f: (-s ours) am acbff099: am d9076a95: am f4b35c6a: (-s ours) am ef822b3f: am 62a4a1f9: am 2a82a48f: Fix the measurement of text bounds. [DO NOT MERGE]
* commit '5f0fb2a1fd5bd98b3ab818ca7e509f638fece783':
  Fix the measurement of text bounds. [DO NOT MERGE]
2014-05-02 19:50:38 +00:00
Deepanshu Gupta
eec3eb8694 am c1ce1c99: am 951c6976: (-s ours) am fcdbc3cb: am 38f954c8: am e0537c1d: (-s ours) am c7f8e64c: am 1830a58f: am 5bb3414d: Fix a bug in Nine Patch library. [DO NOT MERGE]
* commit 'c1ce1c998163af3753f326aa391ff4d7bcee0cc5':
  Fix a bug in Nine Patch library. [DO NOT MERGE]
2014-05-02 19:50:36 +00:00
Deepanshu Gupta
73e7402e60 am 7b6ab8f3: am 031f4beb: (-s ours) am 469b4aea: am 35f9f310: am 5e6a2990: (-s ours) am 4d887ec3: am bcd50a7c: am 5712b5fc: Optimize layout rendering in layoutlib [DO NOT MERGE]
* commit '7b6ab8f32a3404f601d555812487d0d92138be92':
  Optimize layout rendering in layoutlib [DO NOT MERGE]
2014-05-02 19:50:33 +00:00
Deepanshu Gupta
02a07b7383 am 20e540be: am 2d7a9c3e: (-s ours) am c3e89c3f: am 95672929: am 73f9e467: (-s ours) am edd67cb1: am 7c02c6e2: am 02cde9ce: Add methods for Time_Delegate [DO NOT MERGE]
* commit '20e540be098be58f48778db33d8123ebdcfd182d':
  Add methods for Time_Delegate [DO NOT MERGE]
2014-05-02 19:50:31 +00:00
Deepanshu Gupta
d35e28f38b am d88cece4: am d683d56c: (-s ours) am 35a94df7: am ea18b2d6: am 95fd97aa: (-s ours) am 84e7a6b8: am 443372dd: am 9d7b5165: Add libphonenumber to layoutlib.jar. [DO NOT MERGE]
* commit 'd88cece4e2800cedb2e09fe20c09a9704c039019':
  Add libphonenumber to layoutlib.jar. [DO NOT MERGE]
2014-05-02 19:50:28 +00:00
Deepanshu Gupta
b20352f5ba am 33f44937: am e9c20fd4: (-s ours) am 81f1e754: am fd581059: am 88a12f57: (-s ours) am 43034b54: am 62591cff: am 689c0dfe: Fix NPE in layoutlib. [DO NOT MERGE]
* commit '33f44937e0e6a6276dc4c2a566f0cd482773582d':
  Fix NPE in layoutlib. [DO NOT MERGE]
2014-05-02 19:50:25 +00:00
Deepanshu Gupta
ad0060b581 am 1da7b0b5: am 35b16e5d: (-s ours) am 9e8ae205: am f41ce157: am 43ed35da: (-s ours) am ce205d0a: am 600539c7: am 083d1562: Fix text size in Fake Action Bar. [DO NOT MERGE]
* commit '1da7b0b51a185ce086f7c7e4efd6191c6c0c1069':
  Fix text size in Fake Action Bar. [DO NOT MERGE]
2014-05-02 19:50:23 +00:00
Deepanshu Gupta
94f1de7a45 am 27c91491: am 8c54c861: (-s ours) am 2fee69e0: am 071206b4: am aab9d9a7: (-s ours) am 1a434aa8: am 697c511d: am 80c668f2: Remove references to non-std Java classes. [DO NOT MERGE]
* commit '27c91491490004494fb7c2f5125a98cb7b6518e9':
  Remove references to non-std Java classes. [DO NOT MERGE]
2014-05-02 19:50:20 +00:00
Deepanshu Gupta
61c8829ab7 am 67da11c2: am 683e1663: (-s ours) am 79150645: am c37f7c84: am d15bbac6: (-s ours) am a2b530fb: am e39de9ae: am 6335590a: Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]
* commit '67da11c21e92022148025023c16b4a2b926e3ffd':
  Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]
2014-05-02 19:50:18 +00:00
Deepanshu Gupta
e216cfc412 am 1e884cd0: am 543452e8: (-s ours) am e860b24e: am 8cc1d989: am 3e9bc262: (-s ours) am 9d209905: am 6f469e54: am 11ee746d: Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]
* commit '1e884cd00957b8314dd72448ecd808381abe7141':
  Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]
2014-05-02 19:50:15 +00:00
Deepanshu Gupta
bab277cc9f am 13542c7e: (-s ours) am 00e0b992: am 75f435b0: am 495c14d8: (-s ours) am 47ad22ed: am 961e3281: am 6df2860b: Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]
* commit '13542c7e827c4119785a59bfc9599ec3f48667de':
  Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]
2014-05-02 19:48:07 +00:00
Deepanshu Gupta
5ac331481a am 29376cea: (-s ours) am a996ff5c: am c529b700: am 8ad4b8b1: (-s ours) am 9932e589: am 9e2dadae: am bcbeaf83: Set default text style in layoutlib as NORMAL [DO NOT MERGE]
* commit '29376cea1b9c7e17562540e31ca14565361d693b':
  Set default text style in layoutlib as NORMAL [DO NOT MERGE]
2014-05-02 19:48:05 +00:00
Deepanshu Gupta
eecb79a863 am 22b47b28: (-s ours) am 16fda528: am b7431172: am 826a215c: (-s ours) am 320f1126: am cf3f108e: am 5be65fda: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
* commit '22b47b281c0669ec6abe275a7ef4a4c1ad671ad5':
  Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
2014-05-02 19:48:02 +00:00
Deepanshu Gupta
d1830eb678 am 57e410d9: (-s ours) am 9f81e73a: am 28ec8b4f: am 0a37981c: (-s ours) am 1b28d8d4: am d642de58: am ec4623d0: Improve text rendering and measurement. [DO NOT MERGE]
* commit '57e410d9b62c8b50e0ea2a427b83e32cedde1d43':
  Improve text rendering and measurement. [DO NOT MERGE]
2014-05-02 19:47:59 +00:00
Deepanshu Gupta
5f0fb2a1fd am 4da3827f: (-s ours) am acbff099: am d9076a95: am f4b35c6a: (-s ours) am ef822b3f: am 62a4a1f9: am 2a82a48f: Fix the measurement of text bounds. [DO NOT MERGE]
* commit '4da3827fa44b5a579ca65b33f8571ec7e669aa75':
  Fix the measurement of text bounds. [DO NOT MERGE]
2014-05-02 19:47:56 +00:00
Deepanshu Gupta
c1ce1c9981 am 951c6976: (-s ours) am fcdbc3cb: am 38f954c8: am e0537c1d: (-s ours) am c7f8e64c: am 1830a58f: am 5bb3414d: Fix a bug in Nine Patch library. [DO NOT MERGE]
* commit '951c69760ff6daa8ce85b4d8c680ed40943a4295':
  Fix a bug in Nine Patch library. [DO NOT MERGE]
2014-05-02 19:47:53 +00:00
Deepanshu Gupta
7b6ab8f32a am 031f4beb: (-s ours) am 469b4aea: am 35f9f310: am 5e6a2990: (-s ours) am 4d887ec3: am bcd50a7c: am 5712b5fc: Optimize layout rendering in layoutlib [DO NOT MERGE]
* commit '031f4bebb05a4a6e59df9cce995dbfdfe54f8300':
  Optimize layout rendering in layoutlib [DO NOT MERGE]
2014-05-02 19:47:51 +00:00
Deepanshu Gupta
20e540be09 am 2d7a9c3e: (-s ours) am c3e89c3f: am 95672929: am 73f9e467: (-s ours) am edd67cb1: am 7c02c6e2: am 02cde9ce: Add methods for Time_Delegate [DO NOT MERGE]
* commit '2d7a9c3ed93e8187c687cac3af096d4dd017637b':
  Add methods for Time_Delegate [DO NOT MERGE]
2014-05-02 19:47:48 +00:00
Deepanshu Gupta
d88cece4e2 am d683d56c: (-s ours) am 35a94df7: am ea18b2d6: am 95fd97aa: (-s ours) am 84e7a6b8: am 443372dd: am 9d7b5165: Add libphonenumber to layoutlib.jar. [DO NOT MERGE]
* commit 'd683d56c93d2fa5e73fc16535e9121eb90e15794':
  Add libphonenumber to layoutlib.jar. [DO NOT MERGE]
2014-05-02 19:47:45 +00:00
Deepanshu Gupta
33f44937e0 am e9c20fd4: (-s ours) am 81f1e754: am fd581059: am 88a12f57: (-s ours) am 43034b54: am 62591cff: am 689c0dfe: Fix NPE in layoutlib. [DO NOT MERGE]
* commit 'e9c20fd4e32a0c1b586605603ea0419c5c7ab613':
  Fix NPE in layoutlib. [DO NOT MERGE]
2014-05-02 19:47:41 +00:00
Deepanshu Gupta
1da7b0b51a am 35b16e5d: (-s ours) am 9e8ae205: am f41ce157: am 43ed35da: (-s ours) am ce205d0a: am 600539c7: am 083d1562: Fix text size in Fake Action Bar. [DO NOT MERGE]
* commit '35b16e5d8f943400cf22a0ac670f250c8fa83a5d':
  Fix text size in Fake Action Bar. [DO NOT MERGE]
2014-05-02 19:47:38 +00:00