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

2106 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
4c0f9664de am 61d3dea6: am 8c8bb83e: am 8e11659a: Change font family name. [DO NOT MERGE] 
* commit '61d3dea672ed8f2f4f90860580c37766b0197a58':
  Change font family name. [DO NOT MERGE]
 2014-07-08 23:33:00 +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
8c8bb83e62 am 8e11659a: Change font family name. [DO NOT MERGE] 
* commit '8e11659a43b34d465deb631575425b1706547dcc':
  Change font family name. [DO NOT MERGE]
 2014-07-08 23:24:05 +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
Brian Carlstrom
80f1fe5f7c am f8077cf2: am 8e21e215: Merge "Switch from core to core-libart" 
* commit 'f8077cf2d7ee55dbf02ec0c65a05db7e5c2fabfc':
  Switch from core to core-libart
 2014-06-19 02:08:10 +00:00
Brian Carlstrom
f8077cf2d7 am 8e21e215: Merge "Switch from core to core-libart" 
* commit '8e21e21550eddce01ad06fdf05b342993bf44c6a':
  Switch from core to core-libart
 2014-06-19 02:03:35 +00:00
Brian Carlstrom
dbcae5ceb7 Switch from core to core-libart 
Bug: 14298175
Change-Id: I89db18bf3d88f9511cb2ad943c64ecdbaf09d96f
 2014-06-18 17:43:27 -07:00
Deepanshu Gupta
5ba5ab3111 am 1595c61d: am 5a49fc33: am c57b410c: Add a script to rename fonts for SDK. [DO NOT MERGE] 
* commit '1595c61d2f1f081111958b4a22e8fec25402f3cd':
  Add a script to rename fonts for SDK. [DO NOT MERGE]
 2014-06-18 00:20:35 +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
5a49fc331e am c57b410c: Add a script to rename fonts for SDK. [DO NOT MERGE] 
* commit 'c57b410c8ef41e269f82f3b42a8d22a15c08755b':
  Add a script to rename fonts for SDK. [DO NOT MERGE]
 2014-06-18 00:10:34 +00: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
1434ea749f am 92b7c67e: Merge "LayoutLib fixes for API 20 [DO NOT MERGE]" into klp-modular-dev 
* commit '92b7c67e719fa125a5af368eb9e00f724c88601d':
  LayoutLib fixes for API 20 [DO NOT MERGE]
 2014-06-12 20:04:12 +00: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
b78cc30920 Add missing dependency in layoutlib build file [DO NOT MERGE] 
Add missing dependency on built_ext_data

Change-Id: I4e7cca7f6cbc7f5b7416ac9b85a9aec01e61ecd4
(cherry picked from commit e345507ca4b7b83c6e0446788f4404eb697f945b)
 2014-06-05 18:32:14 -07:00
Deepanshu Gupta
e478c5624d am 905e113f: 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 '905e113f97560dbcf71cab517ab4c1ee4faaa4d3':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:52:36 +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
03df93bcb8 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 '5cde33a6ffd6a3be87f6622e67c3d83fb61519cb':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:45:02 +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
dcfba78fbb 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 'ed5ab0f01eac6686165f67fe0e9dec3bb48bbb4b':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:38:25 +00:00
Deepanshu Gupta
3c15d8d688 am 14104896: am e4aa3138: am a9e82914: Merge branch \'klp-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-dev 
* commit '14104896770dd26195cd9ccfac8c1604cb95dbc6':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:32:46 +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
Deepanshu Gupta
e4aa313821 am a9e82914: Merge branch \'klp-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-dev 
* commit 'a9e8291409a916186cd96b8bc557a6ac83d6b1ae':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:25:57 +00:00
Deepanshu Gupta
c8235b8e74 am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev 
* commit 'ffcad247d0401fb529441ecc65437226c2845461':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:21:00 +00:00
Deepanshu Gupta
2983ee55a6 am 12b657d7: am dade24b4: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev 
* commit '12b657d74961ba5a6175162b7548cce4e77c9bbc':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:15:33 +00:00
Deepanshu Gupta
904b89c584 am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev 
* commit '295184bc71a32a4e9418d34b2adeb0cef4b39781':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:14:52 +00:00
Deepanshu Gupta
295184bc71 am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev 
* commit '8782a12005e90bbd49be579fb8ede3a42a007380':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:10:55 +00:00
Deepanshu Gupta
e87c63e0e4 am d2dff39b: am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev 
* commit 'd2dff39b587bd073fcf5c97753c8a29e16f4ef57':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 19:43:09 +00:00
Deepanshu Gupta
8782a12005 resolved conflicts for merge of 61fb5784 to jb-mr1-dev 
Change-Id: I079d5db0d69fd1972e6754cdd1829dfd1645202d
 2014-06-04 12:43:01 -07:00
Deepanshu Gupta
d2dff39b58 am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev 
* commit 'b1ca2a0c7fda713f5f2ebe928706dd813d87cabb':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 19:38:01 +00:00
Deepanshu Gupta
61fb578432 am 3ff08eb6: Distinguish between menus in ActionBar and popup. [DO NOT MERGE] 
* commit '3ff08eb6bf68868d4f4e872fbbf1ecaf521934a9':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 19:32:05 +00:00
Craig Mautner
22af5b8428 am 81dfc082: Merge "Force all windows to redraw before unblanking screen" into klp-modular-dev 
* commit '81dfc082d2add8463469e3eac9db94d6d93005ce':
  Force all windows to redraw before unblanking screen
 2014-06-03 22:44:52 +00:00
Craig Mautner
81dfc082d2 Merge "Force all windows to redraw before unblanking screen" into klp-modular-dev 2014-06-03 22:41:38 +00:00
Adam Lesinski
522c5ce280 am 7e547e0d: Merge "Add --pseudo-localize option to generate resources for pseudolocales." 
* commit '7e547e0d72817032737909952f00acc2e777a35a':
  Add --pseudo-localize option to generate resources for pseudolocales.
 2014-06-03 20:35:11 +00:00
Deepanshu Gupta
4f69d5b8e9 am 8af310c0: am 8f6a9a65: am 8974a5e6: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit '8af310c0c6a0922d2a84600f9abf7877009d12ba':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:32:57 +00:00