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

1024 Commits

Author SHA1 Message Date
Deepanshu Gupta
ec6676ddf6 am 86384880: am f1e71876: Fix theme/style resolution in Layoutlib [DO NOT MERGE] 
* commit '863848808d005fe1d2fd84a2982adfc02a3fbb9f':
  Fix theme/style resolution in Layoutlib [DO NOT MERGE]
 2014-04-16 18:40:55 +00:00
Deepanshu Gupta
e5d0fce7ae am 685b7d41: am 1b87390c: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE] 
* commit '685b7d4165c417ce20b1f6c49190eabcfda09940':
  Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
 2014-04-16 18:40:51 +00:00
Deepanshu Gupta
f2d085e867 am d023360a: am 484c88c3: am 4ccc4bd5: Action bar rendering in layoutlib [DO NOT MERGE] 
* commit 'd023360aa03db1a7831a5697d49faa2575e4a9c3':
  Action bar rendering in layoutlib [DO NOT MERGE]
 2014-04-16 18:39:25 +00:00
Deepanshu Gupta
110a05c6bd am 2aee0712: am e75477cb: am acf0bce0: Support custom views using TimePickerDialog [DO NOT MERGE] 
* commit '2aee07124cad720587a8c51de5650b6b93ae9150':
  Support custom views using TimePickerDialog [DO NOT MERGE]
 2014-04-16 18:39:21 +00:00
Deepanshu Gupta
d023360aa0 am 484c88c3: am 4ccc4bd5: Action bar rendering in layoutlib [DO NOT MERGE] 
* commit '484c88c3655991759dc64276404d0cf7e33b455f':
  Action bar rendering in layoutlib [DO NOT MERGE]
 2014-04-16 18:36:46 +00:00
Deepanshu Gupta
2aee07124c am e75477cb: am acf0bce0: Support custom views using TimePickerDialog [DO NOT MERGE] 
* commit 'e75477cb3bf0f2e18c1f0bb743a6189fbc07c2a2':
  Support custom views using TimePickerDialog [DO NOT MERGE]
 2014-04-16 18:36:40 +00:00
Deepanshu Gupta
5a1250532f Merge changes I66792c4d,I203b6783 into jb-mr2-dev 
* changes:
  Improve text rendering and measurement. [DO NOT MERGE]
  Fix the measurement of text bounds. [DO NOT MERGE]
 2014-04-16 18:34:12 +00:00
Deepanshu Gupta
04b4f8d114 Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into jb-mr2-dev 2014-04-16 18:34:04 +00:00
Deepanshu Gupta
fb120acd84 Merge "Add methods for Time_Delegate [DO NOT MERGE]" into jb-mr2-dev 2014-04-16 18:33:47 +00:00
Deepanshu Gupta
b7fd631532 Merge "Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]" into jb-mr2-dev 2014-04-16 18:33:32 +00:00
Deepanshu Gupta
f14cbb26ed Merge "Optimize layout rendering in layoutlib [DO NOT MERGE]" into jb-mr2-dev 2014-04-16 18:33:11 +00:00
Deepanshu Gupta
bdd0ad79b9 Layoutlib tests now check methods return value [DO NOT MERGE] 
The change is a cherry-pick of relevant fixes from the following
commits on master branch:
the followning commits:
9be03c4e980d3058aeb3fd730da5f7d4a4a4f8a8 and
e05bb956ce429618fd4f971a9dc708b9313c59ea

Change-Id: I87cef323c4eaee4e9f60475f01156b276593fa50
 2014-04-15 20:03:20 -07:00
Deepanshu Gupta
f1e7187645 Fix theme/style resolution in Layoutlib [DO NOT MERGE] 
Change-Id: Icfb91e566666408802dadc0e2070991151b16b9d
(cherry picked from commit bfec73c2db5a34ced248213edf5519c80727a65f)

Conflicts:
	core/java/android/content/res/Resources.java
	tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java
 2014-04-15 20:03:19 -07:00
Deepanshu Gupta
1b87390c94 Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE] 
Adds MenuBuilderAccessor in addition to the cherry-picked changes.

Change-Id: Ib7cc314079099c010f7d53849e204db36c410357
(cherry-picked from commit 929eea6bc1824bf98d244550c0984ecf8ea98811)
 2014-04-15 20:02:49 -07:00
Deepanshu Gupta
4ccc4bd54f 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 14bf0cef7eeed572a67c29a328581afac4decc20)
 2014-04-15 20:02:48 -07:00
Deepanshu Gupta
acf0bce09f Support custom views using TimePickerDialog [DO NOT MERGE] 
Bug: http://b.android/com/61515

Change-Id: I0dc3357be0c058adde9d3ea5b6796004b786fd34
(cherry picked from commit 86e5218220a0e01f7eb574a2480bd91f9ebfae35)
 2014-04-15 19:53:54 -07:00
Deepanshu Gupta
135a9ad4a5 Merge "Add overflow menu popup for Action Bar in Layoutlib" 2014-04-14 23:07:59 +00:00
Deepanshu Gupta
8d95b5009c Merge "Action bar rendering in layoutlib" 2014-04-14 23:07:30 +00:00
Deepanshu Gupta
929eea6bc1 Add overflow menu popup for Action Bar in Layoutlib 
Change-Id: Ib7cc314079099c010f7d53849e204db36c410357
 2014-04-14 15:26:56 -07:00
Dan Sandler
352e108259 Merge "Merge remote-tracking branch 'goog/master-lockscreen-dev'" 2014-04-14 17:54:22 +00:00
Jeff Brown
dc800e8513 am eaa8a6b7: am a5c8d586: Fix build break due to layout lib. 
* commit 'eaa8a6b7feb4a520f48654b087223ccaf49b6a2f':
  Fix build break due to layout lib.
 2014-04-12 08:45:06 +00:00
Jeff Brown
eaa8a6b7fe am a5c8d586: Fix build break due to layout lib. 
* commit 'a5c8d586f6ceff252336f72c6e15efbf4785e794':
  Fix build break due to layout lib.
 2014-04-12 08:22:06 +00:00
Jeff Brown
a5c8d586f6 Fix build break due to layout lib. 
Change-Id: I87b40125adad0a799214f6ebf0dc04ec7903efbf
 2014-04-11 22:09:06 -07:00
Deepanshu Gupta
c76faca60e am e2dc6985: am f1334ccc: am 849a8208: Add DatePickerDialog to layoutlib [DO NOT MERGE] 
* commit 'e2dc69856879d41798545b2c113098195bf04fa6':
  Add DatePickerDialog to layoutlib [DO NOT MERGE]
 2014-04-12 02:30:31 +00:00
Deepanshu Gupta
e2dc698568 am f1334ccc: am 849a8208: Add DatePickerDialog to layoutlib [DO NOT MERGE] 
* commit 'f1334ccc1522241c0efc2449ed8bf472a5b01204':
  Add DatePickerDialog to layoutlib [DO NOT MERGE]
 2014-04-12 02:26:09 +00:00
Narayan Kamath
7caa77e3ab am 79d88d13: am 73e78c75: am af42a91c: Fix another build breakage. 
* commit '79d88d138c07835d349f7c74f380eaeb7cac8d0b':
  Fix another build breakage.
 2014-04-11 11:41:42 +00:00
Narayan Kamath
79d88d138c am 73e78c75: am af42a91c: Fix another build breakage. 
* commit '73e78c75b770b3af0d48acac9c8565f7b4d035ff':
  Fix another build breakage.
 2014-04-11 11:37:40 +00:00
Narayan Kamath
73e78c75b7 am af42a91c: Fix another build breakage. 
* commit 'af42a91c118941d463b474574bf34bf05822350d':
  Fix another build breakage.
 2014-04-11 11:35:19 +00:00
Narayan Kamath
af42a91c11 Fix another build breakage. 
Caused by 037c33eae74bee2774897d969d48947f9abe254f, which
was submitted without a checkbuild.

Change-Id: I0d48f6b941cc98a30904cdfbd7bcb56ed509734e
 2014-04-11 11:31:07 +00:00
Colin Cross
d4d4658766 resolved conflicts for merge of 90b39aba to master-lockscreen-dev 
Change-Id: I2871a1e49c3b443cc7479f2352c652be3b0fb85b
 2014-04-10 22:41:05 -07:00
Colin Cross
0b65c56eb0 fix build 
Fix make checkbuild.

Change-Id: Ie9335a9e8afe4dc13ec47b2e84ab433b19ff315f
 2014-04-10 22:05:57 -07:00
Svetoslav
dd137a85d3 resolved conflicts for merge of 6be2f952 to master-lockscreen-dev 
Conflicts:
	core/java/android/view/IWindowManager.aidl
	tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java

Change-Id: Idcbc581294cc52b53eabefd61e5c20cbcea611db
 2014-04-10 12:48:07 -07:00
Svetoslav
6be2f95202 Merge "Adding render stats APIs to UiAutomation (framework)." 2014-04-10 19:32:59 +00:00
Deepanshu Gupta
14bf0cef7e Action bar rendering in layoutlib 
This also makes a couple of changes to the framework:
1. ShareActionProvider - Use edit mode to execute activity chooser code.
2. WindowDecorActionBar - 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
 2014-04-10 10:44:45 -07:00
Deepanshu Gupta
849a8208c8 Add DatePickerDialog to layoutlib [DO NOT MERGE] 
Includes android.app.DatePickerDialog in the layoutlib.jar

Bug: http://b.android.com/28318
Change-Id: I583dde4a8b88204bf98bfca8d91470e1aa4719ce
(cherry picked from commit c2016d4073c61e87439d4fa14837b397a3c1630a)
 2014-04-10 00:21:57 +00:00
Deepanshu Gupta
def26cb43b am 8aa7a967: Merge "Support custom views using TimePickerDialog in layoutlib" 
* commit '8aa7a9677af8f235ade204602014a5e2e9f9188e':
  Support custom views using TimePickerDialog in layoutlib
 2014-04-10 00:02:34 +00:00
Deepanshu Gupta
86e5218220 Support custom views using TimePickerDialog in layoutlib 
Bug: http://b.android/com/61515

Change-Id: I0dc3357be0c058adde9d3ea5b6796004b786fd34
 2014-04-09 15:15:49 -07:00
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