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

1829 Commits

Author SHA1 Message Date
Deepanshu Gupta
7d3ae4f17d Bug fix in layoutlib 
Renaming a method wasn't completed properly.
The bug was introduced in the following change:
Idcfc263a8ebe0a4f25afa3a1eb085fa628fd03ca
(1001961f904bac5294aaf73a47c2497aa764bf7f)

Change-Id: I698437b428d696c656e2268ded654a612a3e0c80
 2014-04-23 18:07:07 -07:00
Deepanshu Gupta
fbfeb1a90b Fix style warnings in RenderSessionImpl 
Change-Id: I9d3cb23e4ea692f737a3e3d6c18cc8de18b66a3c
 2014-04-23 13:07:44 -07:00
Deepanshu Gupta
1001961f90 Add view cookies for action bar menus. 
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.

Change-Id: Idcfc263a8ebe0a4f25afa3a1eb085fa628fd03ca
 2014-04-23 12:27:30 -07:00
Deepanshu Gupta
76bc2bb4c7 Merge "Update Matrix_Delegate native methods." 2014-04-22 23:47:58 +00:00
Deepanshu Gupta
6416152f7e am be06a418: am cf5c3fc7: am 53b7df19: Merge "Add missing ICU_Delegate methods." 
* commit 'be06a4182b9ff44a276f56d04b907672ee9e149a':
  Add missing ICU_Delegate methods.
 2014-04-22 23:19:13 +00:00
Deepanshu Gupta
be06a4182b am cf5c3fc7: am 53b7df19: Merge "Add missing ICU_Delegate methods." 
* commit 'cf5c3fc70d4dcd5dc3c6054d0f7415ded0070e4f':
  Add missing ICU_Delegate methods.
 2014-04-22 23:15:05 +00:00
Deepanshu Gupta
e2b67777ad Add missing ICU_Delegate methods. 
Update the ICU_Delegate to add methods originally added in
I5de58be7e8a701f2c40182ea54bceff85ec1aad2

Change-Id: I536834fe76cbc7dae05580182fee1bea956e3e77
 2014-04-21 14:33:33 -07:00
Deepanshu Gupta
385c6b3b6c Update Matrix_Delegate native methods. 
Update the Matrix_Delegate native methods in layoutlib. The original
change is I5cdcea827ebff587df0bbddc0965e3e0fbf48002.

Change-Id: I2c94741fdaeb0c2279caefee0188f432267bb37d
 2014-04-21 14:28:56 -07:00
Elliott Hughes
5a63d11902 am 36e64ab9: am cf4d85e4: am 90840ec2: Merge "Fix warning introduced by recent psuedolocalizer change." 
* commit '36e64ab902a6932f2711d1dff6ee273610d68e7d':
  Fix warning introduced by recent psuedolocalizer change.
 2014-04-18 23:30:27 +00:00
Elliott Hughes
36e64ab902 am cf4d85e4: am 90840ec2: Merge "Fix warning introduced by recent psuedolocalizer change." 
* commit 'cf4d85e4786beb98743eac68b71d67e36f76c058':
  Fix warning introduced by recent psuedolocalizer change.
 2014-04-18 23:26:16 +00:00
Elliott Hughes
0a1eed394f Fix warning introduced by recent psuedolocalizer change. 
Change-Id: I577caf6ca4261b3d044b18bc8c5915012168031d
 2014-04-18 16:15:27 -07:00
Deepanshu Gupta
311efc146c Merge "Add DisplayManager service to BridgeContext" 2014-04-18 23:11:57 +00:00
Deepanshu Gupta
991872bd43 Merge "Add isElegantHeight to Layoutlib" 2014-04-18 23:11:27 +00:00
Elliott Hughes
4b0ee78bfa resolved conflicts for merge of 56ca8219 to master 
Change-Id: I62f5804a5c4404eedce09188cda2e3b1bb990b36
 2014-04-18 16:07:41 -07:00
Deepanshu Gupta
664d6f1fe4 Add DisplayManager service to BridgeContext 
ViewRoot now holds a reference to the DisplayManager. The change updates
the BridgeContext to provide the DisplayManager instance.

Change-Id: I4a5f00eda337939c72bad47b0ca6a7403454228d
 2014-04-18 16:03:11 -07:00
Elliott Hughes
56ca821912 resolved conflicts for merge of ec42199a to klp-modular-dev-plus-aosp 
Change-Id: I9ecd5d51be4d073ab93dbb0bd60097735e76bf94
 2014-04-18 15:56:46 -07:00
Deepanshu Gupta
08ea918c86 Add isElegantHeight to Layoutlib 
Add the native stub methods for isElegantHeight in Paint.

Change-Id: Iaddde36528fb452e5a150ab35687da781091d14c
 2014-04-18 15:43:06 -07:00
Deepanshu Gupta
492090a55e am 16191f8c: resolved conflicts for merge of 0e2049cd to klp-modular-dev 
* commit '16191f8c4fe92036c8ff2eecd4e57b4642068b99':
  Layoutlib tests now check methods return value [DO NOT MERGE]
 2014-04-16 19:20:01 +00:00
Deepanshu Gupta
35d46778f4 resolved conflicts for merge of ec6676dd to klp-modular-dev-plus-aosp 
Change-Id: I2fec735ba65f56da7d17022074f8924a259b4bbf
 2014-04-16 12:14:34 -07:00
Deepanshu Gupta
16191f8c4f resolved conflicts for merge of 0e2049cd to klp-modular-dev 
Change-Id: I518e18d0c769a4cb5d325fc22165a8ead36e11de
 2014-04-16 11:58:32 -07:00
Deepanshu Gupta
82d5f137ed am e5d0fce7: am 685b7d41: am 1b87390c: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE] 
* commit 'e5d0fce7aeb60c44849cd09815ccecda702422ef':
  Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
 2014-04-16 18:43:23 +00:00
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
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