950 Commits

Author SHA1 Message Date
Deepanshu Gupta
803a59cae7 Fix error when using list as actionBarNavMode. [DO NOT MERGE]
A bug in the framework leads to the wrong argument being passed to
defStyleRes when obtaining styled attributes. The framework however just
ignores the attribute in such a case. LayoutLib logs an error to help
developers find bugs in their code.

The bug was seen when using list as the actionBarNavMode.

This change ignores the attribute if it detects that it's the framework
bug. Also, we change the error to a warning.

Change-Id: I58e1fe4469de0329a27b577d75c0a59c48d0381b
2014-09-25 23:01:38 +00:00
Deepanshu Gupta
a780eee462 Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into klp-modular-dev 2014-09-04 01:53:38 +00:00
Deepanshu Gupta
ffee9b2740 Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Bug: http://b.android.com/74072
Change-Id: Ib84906d86772ac3df2407e71ad2167797bec4542
(cherry picked from commit c9cd725f1013bed27e6f6594b176c10a6a4c0f16)
2014-08-26 00:48:18 +00:00
Deepanshu Gupta
cc7ccc3fc1 Resolve color xml attributes properly. [DO NOT MERGE]
Color attributes were not being converted to int properly. The
conversion to int was a simple string to int using base 16. This change
resolves the colors as per #RGB, #ARGB, #RRGGBB or #AARRGGBB format
depending on the length of the attribute. All values that begin with '#'
are treated as colors.

Bug: http://b.android.com/73845
Change-Id: I8ad089b821af1e290b9b95771b50213fe2fdd784
(cherry picked from commit 81564dfe60020fa977d39d168f682e9d61825660)
2014-08-26 00:26:56 +00:00
Deepanshu Gupta
32faabbe14 Layoutlib: Update wifi and battery icon for KK
Change-Id: Ic5c80e83366bb7672049a6bf726d11cf6717f400
(cherry picked from commit 59eedf528ca29a32b6d7f358f5076929f8fbb164)
2014-08-16 01:11:26 +00:00
Deepanshu Gupta
6ebeefa04c am 904d7711: am 7b561be3: am 09c3c2ed: am ba31d628: am db94ea9e: am f970d2c2: am 79c3f678: am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs
* commit '904d77118bab63139174470ef728ca9a53e75a15':
  Fix SystemProperties in LayoutLib.
2014-08-06 22:51:47 +00:00
Deepanshu Gupta
7b561be3a6 am 09c3c2ed: am ba31d628: am db94ea9e: am f970d2c2: am 79c3f678: am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs
* commit '09c3c2edb2391d3ffed9a07ec360b9f75b9f7637':
  Fix SystemProperties in LayoutLib.
2014-08-06 22:37:10 +00:00
Deepanshu Gupta
db94ea9ed0 am f970d2c2: am 79c3f678: am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs
* commit 'f970d2c201649843b8d51d094b865f16b15bc0bc':
  Fix SystemProperties in LayoutLib.
2014-08-06 22:21:54 +00:00
Deepanshu Gupta
f970d2c201 am 79c3f678: am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs
* commit '79c3f678d21f6b3c058623217cbe5dd57a553fe8':
  Fix SystemProperties in LayoutLib.
2014-08-06 22:18:04 +00:00
Deepanshu Gupta
72cf03a27a am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs
* commit '3a544a81b3d2d529b2995f4b5db2077760d440b5':
  Fix SystemProperties in LayoutLib.
2014-08-06 22:05:38 +00:00
Deepanshu Gupta
3a544a81b3 resolved conflicts for merge of a232a68d to jb-mr1.1-docs
Change-Id: I1ea220e3e0a81880db68abab87beab56dc4a336c
2014-08-06 15:00:14 -07:00
Deepanshu Gupta
a232a68d4c resolved conflicts for merge of 5476cfee to jb-mr1-dev
Change-Id: I5197271e6fdd36fed9ca9f9b7221d9a99141a4b4
2014-08-06 14:41:02 -07:00
Deepanshu Gupta
5476cfee6b am 505c675c: Fix SystemProperties in LayoutLib.
* commit '505c675c3a536ac7c6ad264eb62542537532119c':
  Fix SystemProperties in LayoutLib.
2014-08-06 21:28:24 +00:00
Deepanshu Gupta
505c675c3a Fix SystemProperties in LayoutLib.
Not all System Properties were used via Build class. Also, properties
like SDK_INT which called SystemProperties directly were not initialized
properly.

This change is essentially cherry picking of the relevant parts from the
following commits:
984749bf75c9ce9d3401b8410ea7d6276544b6ee
167bc25bceea9280bbe4858db4cb8233f86ce325

Bug: http://b.android.com/73046
Change-Id: Ia0fb467ee6d5fdedda500d57d02be20006f115df
2014-08-05 17:47:30 -07: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
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
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
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
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
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
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
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
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
Deepanshu Gupta
357ebfc5e4 Fix default level flags for bidi. [DO NOT MERGE]
Bug: b.android.com/69432
Change-Id: I26ff34a6d1f85c928a9a1cb3dfd739fc7d3a8fb6
(cherry picked from commit 95e636130dfc2c0203f16f5315a7fe14b03eb689)
2014-07-12 02:10:50 +00:00
Deepanshu Gupta
10395cbb5c Fix default level flags for bidi. [DO NOT MERGE]
Bug: b.android.com/69432
Change-Id: I26ff34a6d1f85c928a9a1cb3dfd739fc7d3a8fb6
(cherry picked from commit 95e636130dfc2c0203f16f5315a7fe14b03eb689)
2014-07-12 02:10:33 +00:00
Deepanshu Gupta
710a55b419 Fix default level flags for bidi. [DO NOT MERGE]
Bug: b.android.com/69432
Change-Id: I26ff34a6d1f85c928a9a1cb3dfd739fc7d3a8fb6
(cherry picked from commit 95e636130dfc2c0203f16f5315a7fe14b03eb689)
2014-07-12 02:10:02 +00:00
Deepanshu Gupta
5af7324ace Fix style resolution for styles with '.' [DO NOT MERGE]
Bug: b.android.com/72698
Change-Id: I96fb549cf5787d9e8cde2245524a8173471a60ca
(cherry picked from commit f2fa79e9b56b71f8aa30e6675255df69f88a173d)
2014-07-10 00:30:03 +00:00
Deepanshu Gupta
da28101757 Fix style resolution for styles with '.' [DO NOT MERGE]
Bug: b.android.com/72698
Change-Id: I96fb549cf5787d9e8cde2245524a8173471a60ca
(cherry picked from commit f2fa79e9b56b71f8aa30e6675255df69f88a173d)
2014-07-10 00:29:41 +00:00
Deepanshu Gupta
0f49025998 Fix style resolution for styles with '.' [DO NOT MERGE]
Bug: b.android.com/72698
Change-Id: I96fb549cf5787d9e8cde2245524a8173471a60ca
(cherry picked from commit f2fa79e9b56b71f8aa30e6675255df69f88a173d)
2014-07-10 00:29:15 +00:00
Deepanshu Gupta
f2fa79e9b5 Fix style resolution for styles with '.' [DO NOT MERGE]
Bug: b.android.com/72698
Change-Id: I96fb549cf5787d9e8cde2245524a8173471a60ca
2014-07-09 17:27:07 -07:00
Deepanshu Gupta
0b4876043b am d53a9fcb: am 979f9c68: am e30d3fdd: Change font family name. [DO NOT MERGE]
* commit 'd53a9fcb7c56d6495e88cc3e39e2892e449a9171':
  Change font family name. [DO NOT MERGE]
2014-07-08 23:30:20 +00:00
Deepanshu Gupta
10e5407334 am ca82da92: am 5d0db7f2: am 5455ddc4: Merge "Add a script to rename fonts for SDK. [DO NOT MERGE]" into jb-mr1.1-dev
* commit 'ca82da92db2949f134af01f577167639cbfc79bc':
  Add a script to rename fonts for SDK. [DO NOT MERGE]
2014-07-08 23:26:15 +00:00
Deepanshu Gupta
e30d3fdd04 Change font family name. [DO NOT MERGE]
During the SDK build, rename the Font's Family name and not just the
PS Name. Updating the PS name doesn't work.

Change-Id: I997b5eec9f493ce97b95c33101ee426e773890c1
(cherry picked from commit 24f58dbce27f8fa56de992d0c03168a88ae80bad)
2014-07-08 23:14:57 +00:00
Deepanshu Gupta
432d16f97a Change font family name. [DO NOT MERGE]
During the SDK build, rename the Font's Family name and not just the
PS Name. Updating the PS name doesn't work.

Change-Id: I997b5eec9f493ce97b95c33101ee426e773890c1
(cherry picked from commit 24f58dbce27f8fa56de992d0c03168a88ae80bad)
2014-07-08 23:14:36 +00:00
Deepanshu Gupta
5455ddc48f Merge "Add a script to rename fonts for SDK. [DO NOT MERGE]" into jb-mr1.1-dev 2014-07-08 22:56:18 +00:00
Deepanshu Gupta
8e11659a43 Change font family name. [DO NOT MERGE]
During the SDK build, rename the Font's Family name and not just the
PS Name. Updating the PS name doesn't work.

Change-Id: I997b5eec9f493ce97b95c33101ee426e773890c1
(cherry picked from commit 24f58dbce27f8fa56de992d0c03168a88ae80bad)
2014-07-07 22:52:06 +00:00
Deepanshu Gupta
61d3dea672 am 8c8bb83e: am 8e11659a: Change font family name. [DO NOT MERGE]
* commit '8c8bb83e623e1932853230cb25a3330fcedb73ff':
  Change font family name. [DO NOT MERGE]
2014-07-08 23:29:03 +00:00
Deepanshu Gupta
1595c61d2f am 5a49fc33: am c57b410c: Add a script to rename fonts for SDK. [DO NOT MERGE]
* commit '5a49fc331ec7d5aa2532d650c32ea68733cbd5c0':
  Add a script to rename fonts for SDK. [DO NOT MERGE]
2014-06-18 00:15:35 +00:00
Deepanshu Gupta
21b0aab838 Add a script to rename fonts for SDK. [DO NOT MERGE]
Create a script that will rename the PS name encoded in the font that is
to be shipped with the SDK.

Change-Id: I675a98db39fea4525e3673656af1764eb7e5bb96
(cherry picked from commit b49e21e153c59b31503a376d62257e4fc6e7ce4f)
2014-06-12 16:16:51 -07:00
Deepanshu Gupta
b49e21e153 Add a script to rename fonts for SDK. [DO NOT MERGE]
Create a script that will rename the PS name encoded in the font that is
to be shipped with the SDK.

Change-Id: I675a98db39fea4525e3673656af1764eb7e5bb96
(cherry picked from commit c57b410c8ef41e269f82f3b42a8d22a15c08755b)
2014-06-12 16:13:18 -07:00
Deepanshu Gupta
c57b410c8e Add a script to rename fonts for SDK. [DO NOT MERGE]
Create a script that will rename the PS name encoded in the font that is
to be shipped with the SDK.

This commit is a combination of 5 commits:
e0660d31c256e02e5f5e2967508a7205d1f62f86
7e149f02c4e4403101e7e0e88af36cd4ab6f3554
66d3314301a8983c7070a15ea68daacc7300b7f2
c6364fd90de1600526d3431ce0740b6b856e48f0
2d8c52dc4502b8407705d5b6efe628cb657b20b4

Change-Id: I675a98db39fea4525e3673656af1764eb7e5bb96
2014-06-12 15:08:46 -07:00
Deepanshu Gupta
9c80488e11 LayoutLib fixes for API 20 [DO NOT MERGE]
Fixes a bunch of issues with delegate method signatures.

Also cherrypicked commit 664d6f1fe4d6dfa742b3e98051f924dbc190f8ca
which is needed in this branch also.

Bug: 15492736
Change-Id: If99ff279b0d0cabe22942da27388ecb4b800c330
2014-06-12 19:48:38 +00:00
Deepanshu Gupta
905e113f97 am 03df93bc: am 5cde33a6: am dcfba78f: am ed5ab0f0: am 022d8a9f: am bad112f2: am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev
* commit '03df93bcb854eedc600ef0120fd238ec974c44a1':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
2014-06-04 20:48:19 +00:00
Deepanshu Gupta
5cde33a6ff am dcfba78f: am ed5ab0f0: am 022d8a9f: am bad112f2: am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev
* commit 'dcfba78fbb4dad6792113383b2d32eff7f2c1f88':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
2014-06-04 20:41:47 +00:00
Deepanshu Gupta
022d8a9f44 am bad112f2: am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev
* commit 'bad112f23f09f8839b4b7294439b0fe725cc2034':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
2014-06-04 20:30:05 +00:00
Deepanshu Gupta
1410489677 am e4aa3138: am a9e82914: Merge branch \'klp-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-dev
* commit 'e4aa31382139ee2e319110fbfff402e0c6315952':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
2014-06-04 20:29:06 +00:00
Deepanshu Gupta
bad112f23f am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev
* commit 'c8235b8e7446c849df10ff2f897d2a3743b4934d':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
2014-06-04 20:27:49 +00:00