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

766 Commits

Author SHA1 Message Date
Deepanshu Gupta
7a2333631e am 733217e6: Merge "Update layoutlib create README" 
* commit '733217e6768757c50e1ac38644c2ecdbe522e8f5':
  Update layoutlib create README
 2014-04-09 00:45:33 +00:00
Deepanshu Gupta
a4ce30fd86 am 6e5e160f: Merge "Make layoutlib load on Java 7 VM" 
* commit '6e5e160f19c404c272e70f7f0ade5b27850ebd05':
  Make layoutlib load on Java 7 VM
 2014-04-09 00:45:27 +00:00
Deepanshu Gupta
733217e676 Merge "Update layoutlib create README" 2014-04-08 23:37:34 +00:00
Deepanshu Gupta
88585f404c Update layoutlib create README 
Update the doc to reflect the current state of the tool and use a
consistent 100 char column limit.

Change-Id: I64fb58cc46abbc2f3759cb1f99d42b5090c1409f
 2014-04-08 16:30:45 -07:00
Deepanshu Gupta
6e5e160f19 Merge "Make layoutlib load on Java 7 VM" 2014-04-08 22:47:45 +00:00
Deepanshu Gupta
6a08225cee Make layoutlib load on Java 7 VM 
Prevent Java 7 VM from verifying the StackMapTable for methods by lying
about the class version.

The changeset also fixes the eclipse project by using the right asm
library in the checkout.

Change-Id: Idabf165380fb75fcc2d5c8fbd72388f52887a5df
 2014-04-08 15:07:49 -07:00
Ying Wang
1c9d93dcb0 am 30f05c29: Merge "Fix sdk build." 
* commit '30f05c29c56a04f8d8ab2851d0c20a2b66406cfa':
  Fix sdk build.
 2014-04-08 19:20:26 +00:00
Ying Wang
ff0bb30752 Fix sdk build. 
Change-Id: I3e620315e082b46ba5fcd4511b9c258bf610ddf5
 2014-04-08 12:14:50 -07:00
Svetoslav
1376d600d8 Adding render stats APIs to UiAutomation (framework). 
bug:12927198

Change-Id: Iae21481c75ae58dcdab3731bf5f1e2844e29d434
 2014-04-07 17:01:42 -07:00
Deepanshu Gupta
d94d1fbecd am e9abc279: Merge "Fix theme/style resolution in Layoutlib" 
* commit 'e9abc279fd0e1cd3a7c0bfb878c9b5ae22840b9b':
  Fix theme/style resolution in Layoutlib
 2014-04-07 22:29:57 +00:00
Deepanshu Gupta
e9abc279fd Merge "Fix theme/style resolution in Layoutlib" 2014-04-07 22:27:01 +00:00
Deepanshu Gupta
ce00b81c41 am 1cb3e814: Merge "Fix sdk build" 
* commit '1cb3e81421ada146b35515942299fb867b82048d':
  Fix sdk build
 2014-04-05 01:09:22 +00:00
Deepanshu Gupta
ddf286282d Fix sdk build 
Change-Id: Ic08b57fdf2a653071a403bcc2c6b239a19363f72
 2014-04-04 18:02:57 -07:00
Deepanshu Gupta
bfec73c2db Fix theme/style resolution in Layoutlib 
Change-Id: Icfb91e566666408802dadc0e2070991151b16b9d
 2014-04-04 13:44:22 -07:00
Xavier Ducrohet
72b2f53690 am 76c484de: am d93b0b67: am e448bcf7: Merge "Add missing dependency in layoutlib build file [DO NOT MERGE]" into klp-dev 
* commit '76c484de88317fbadc8a070fc333d4fb14355335':
  Add missing dependency in layoutlib build file [DO NOT MERGE]
 2014-04-03 22:24:47 +00:00
Xavier Ducrohet
76c484de88 am d93b0b67: am e448bcf7: Merge "Add missing dependency in layoutlib build file [DO NOT MERGE]" into klp-dev 
* commit 'd93b0b67754f6d06407086278298f44156458216':
  Add missing dependency in layoutlib build file [DO NOT MERGE]
 2014-04-03 22:17:10 +00:00
Jorim Jaggi
ae6ffcc3c7 Merge "Wait for Keyguard to be drawn after boot." into master-lockscreen-dev 2014-04-02 21:22:59 +00:00
Jorim Jaggi
cff0acb6b1 Wait for Keyguard to be drawn after boot. 
The old logic with waiting for the Keyguard to be drawn assumed that
it is in an own window, and just checked for the visibility. This is
no longer possible as the Keyguard is in the status bar, and the status
bar might have been drawn without the Keyguard. So we have to wait
explicitely until Keyguard told PhoneWindowManager that it has now been
drawn and we can turn on the screen.

In addition, the starting logic of SystemUI is moved into
SystemUIApplication such the we can make sure that the status bar
already exists when the callbacks from PhoneWindowManager reach
KeyguardService. This simplifies the logic a lot.

Bug: 13635952
Change-Id: Ifd6ba795647edcf3501641e39052e4d04bc826fb
 2014-04-02 22:11:19 +02:00
Deepanshu Gupta
831f3ce9b5 Add stub getThemeAttributeId() to BridgeTypedArray 
The method is used to obtain theme attribute IDs for drawables for
caching.

The changeset also fixes some minor style issues found by code
inspection.

Change-Id: Ib5fe05511397b5ec7cb8e64f6b2769ec2c355f41
 2014-04-01 10:17:31 -07:00
Deepanshu Gupta
779b0eea30 Merge "Fix visitFieldInsn in layoutlib_create." 2014-04-01 05:37:23 +00:00
Deepanshu Gupta
4a0f93bd32 Fix visitFieldInsn in layoutlib_create. 
The bug caused some classes to be missed when computing the dependencies
of the existing classes.

Change-Id: I7285ff67e016ce5d73a8550501f49acc73cfadfa
 2014-03-31 19:06:53 -07:00
Deepanshu Gupta
e345507ca4 Add missing dependency in layoutlib build file [DO NOT MERGE] 
Add missing dependency on built_ext_data

Change-Id: I4e7cca7f6cbc7f5b7416ac9b85a9aec01e61ecd4
(cherry picked from commit 411b9691e39c0bdd0dafdda7db2737b99b45769e)
 2014-03-31 23:15:52 +00:00
Deepanshu Gupta
411b9691e3 Add missing dependency in layoutlib build file 
Add missing dependency on built_ext_data

Change-Id: I4e7cca7f6cbc7f5b7416ac9b85a9aec01e61ecd4
 2014-03-31 16:11:13 -07:00
Adam Lesinski
776abc24cd Uses VMRuntime.newUnpaddedArray for ideal array sizes 
Bug:13028925

Change-Id: I0a9301248b10a339afbdc5e4ffe3310ac4fa1fb7
 2014-03-27 11:42:10 -07:00
Dianne Hackborn
852472d9aa Fix build. 
Change-Id: I1dd79e932a551bd537d2c71e8fca29a299c9312f
 2014-03-24 14:53:39 -07:00
Svetoslav
1a5255d547 Fixing yet another build breackage 
Change-Id: I83597d5433fc6cc380d5ec1dd6f78e115e76db5b
 2014-03-20 14:54:08 -07:00
Deepanshu Gupta
a72da3aec6 Merge "Add native method delegates to layoutlib" 2014-03-14 21:16:22 +00:00
Deepanshu Gupta
103d40960d Add native method delegates to layoutlib 
Add delegates for Path.native_isConvex and ICU.getCurrencyNumericCode.
The original methods were added in
5be83edd15e11420287cc0af93a95d5a6dfae68f and
d627bd4525e41b0503f94c2887c3e01618c73105 respectively.

TODO: Implement Path_Delegate.native_isConvex

Change-Id: If1046467d3950ab6955c6b81383a60fd6bd03fd2
 2014-03-14 13:31:12 -07:00
Narayan Kamath
ceb2e0a605 am 1abb7e0f: am 63938750: am c0232642: am 629daddd: Merge "Fix layoutlib build." 
* commit '1abb7e0f3920b31cf216b99fc83231d80dfa7ca4':
  Fix layoutlib build.
 2014-03-14 17:53:05 +00:00
Narayan Kamath
6393875024 am c0232642: am 629daddd: Merge "Fix layoutlib build." 
* commit 'c0232642b74517aa2717673f0811ba65c620f491':
  Fix layoutlib build.
 2014-03-14 14:22:30 +00:00
Narayan Kamath
c73991bda0 Fix layoutlib build. 
Was using private data structures from libcore.

Change-Id: I5bd43190081891659e18b5c871686e6078efcc81
 2014-03-14 14:10:30 +00:00
Deepanshu Gupta
f978f16e50 resolved conflicts for merge of c76345a3 to klp-modular-dev-plus-aosp 
Change-Id: Id0aae224e17651bc07aa3f5b1a06923603d025b8
 2014-03-11 16:39:13 -07:00
Deepanshu Gupta
0d7ebc51ff Fix the delegate method signatures in LayoutLib 
Change-Id: I262c285c1047958afdb024724959d5afb3552802
 2014-03-05 19:23:48 -08:00
Xavier Ducrohet
5ea4be5214 am b2334254: am ec84ada6: am 5e5602da: am 0c72b769: Merge "Update layoutlib method for SystemClock" 
* commit 'b2334254ef497e0dcda68d257c096516c77679a4':
  Update layoutlib method for SystemClock
 2014-02-27 23:41:38 +00:00
Xavier Ducrohet
ec84ada6e8 am 5e5602da: am 0c72b769: Merge "Update layoutlib method for SystemClock" 
* commit '5e5602da5fa9cd2e1d135b2310af2a8352f65e8d':
  Update layoutlib method for SystemClock
 2014-02-27 23:34:34 +00:00
Deepanshu Gupta
36acf8baeb Add tests to the layoutlib eclipse project. 
Specify the test folder in the layoutlib/bridge eclipse project.

Also add the sourcepath for layoutlib-api-prebuilt.jar

Change-Id: I194ed182618e564388d6df645e2de7f59897fa1e
 2014-02-27 11:59:50 -08:00
Jeff Davidson
84cd55e8bc Fix SDK build broken by ag/423985 
Change-Id: I85480683531468b7a8a83749d9366f5cc334bd24
 2014-02-26 10:19:04 -08:00
Deepanshu Gupta
c2016d4073 Add DatePickerDialog to layoutlib 
Includes android.app.DatePickerDialog in the layoutlib.jar

Bug: http://b.android.com/28318
Change-Id: I583dde4a8b88204bf98bfca8d91470e1aa4719ce
 2014-02-25 15:31:49 -08:00
Deepanshu Gupta
5ac6a9e9b7 Update layoutlib method for SystemClock 
Update layoutlib to reflect changes from
http://android-review.googlesource.com/83061/

Change-Id: If7326f3af2a97271ad1465382944e1f078b965d8
 2014-02-24 14:22:29 -08:00
Deepanshu Gupta
9be03c4e98 Update layoutlib tests to check methods return value. 
The test in layoutlib bridge has been updated to check the return
value of the delegate method match the value of the overriden method.

This changeset also fixes the problems found due to this change.

Change-Id: I87cef323c4eaee4e9f60475f01156b276593fa50
 2014-02-21 16:22:10 -08:00
Deepanshu Gupta
09fcce52b4 Merge "Add ability to obtain themed Drawable from Context" 2014-02-20 18:37:50 +00:00
Xavier Ducrohet
21c5c8e600 am 9edf7a11: am 2cb9147f: am 55542ee6: am 3e637042: Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into klp-dev 
* commit '9edf7a1159b528afa056e0d61ee4487ed310fe4c':
  Set default text style in layoutlib as NORMAL [DO NOT MERGE]
 2014-02-20 17:53:20 +00:00
Deepanshu Gupta
c139177b13 am 65521c3c: am ca4b9a77: am e92c8542: am 01825b7a: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE] 
* commit '65521c3cf169808cd02ce09a7344bc633d51c1fc':
  Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
 2014-02-20 17:53:17 +00:00
Xavier Ducrohet
2cb9147fc4 am 55542ee6: am 3e637042: Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into klp-dev 
* commit '55542ee6449bd580f61bc005726b5c87773fbe25':
  Set default text style in layoutlib as NORMAL [DO NOT MERGE]
 2014-02-20 17:46:05 +00:00
Deepanshu Gupta
ca4b9a77e7 am e92c8542: am 01825b7a: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE] 
* commit 'e92c8542a5cf1160a1b701b9f176af64ba46d68d':
  Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
 2014-02-20 17:46:02 +00:00
Xavier Ducrohet
3e6370425e Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into klp-dev 2014-02-20 17:41:08 +00:00
Deepanshu Gupta
01825b7aa3 Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE] 
For these font families, text was always rendered as italic. This
changeset fixes the issue.

Bug: http://b.android.com/57221
Change-Id: Ic8a299bd1e555f5bb914cd3d2fe72917ec7f471a
(cherry picked from commit e327212adde1136807bbdf052e8cc3861f8a6aba)
 2014-02-19 20:17:47 +00:00
Deepanshu Gupta
13aea18b34 Set default text style in layoutlib as NORMAL [DO NOT MERGE] 
If a style doesn't specify text style (normal/bold/italic/bold-italic)
then default to normal instead of throwing an error.

Bug: http://b.android.com/61358
Change-Id: I0138c73807a5ff6e4d938a99ece3044333110aa1
(cherry picked from commit 0acfb16dcd95468fe032204f54618e86becfd1eb)
 2014-02-19 20:17:00 +00:00
Deepanshu Gupta
be727079a5 Merge "Set default text style in layoutlib as NORMAL" 2014-02-19 20:16:09 +00:00
Deepanshu Gupta
0acfb16dcd Set default text style in layoutlib as NORMAL 
If a style doesn't specify text style (normal/bold/italic/bold-italic)
then default to normal instead of throwing an error.

Bug: http://b.android.com/61358
Change-Id: I0138c73807a5ff6e4d938a99ece3044333110aa1
 2014-02-19 11:05:02 -08:00