Commit Graph

80900 Commits

Author SHA1 Message Date
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
5af7324ace Fix style resolution for styles with '.' [DO NOT MERGE]
Bug: b.android.com/72698
Change-Id: I96fb549cf5787d9e8cde2245524a8173471a60ca
(cherry picked from commit f2fa79e9b5)
2014-07-10 00:30:03 +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
Deepanshu Gupta
f48ab8feec am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
* commit '3b7c09b4336f421c489523c10278ecfbfb0708a7':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
2014-06-03 20:21:10 +00:00
Deepanshu Gupta
3ff08eb6bf Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Mark the menus in the ActionBar and the ones in the Overflow popup
separately. This enables the IDE to differentiate between the two and
enable gestures such as double-click to open the menu xml for menus in
the ActionBar and single click for the menus in the Overflow popup.

Change-Id: I7a23f87d34d618a134ffbe3a665be695915d4bae
(cherry picked from commit 03c0735017)
2014-05-30 14:50:55 -07:00
Deepanshu Gupta
3b7c09b433 LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
?attr/foo in platform files wasn't resolved properly. The IDE checked
the app namespace for the attribute even though it is being referenced
from a platform file.

Change-Id: I7db6dfef5b540d99804c298120578da9d060b886
(cherry picked from commit 08d2007b33)
2014-05-30 14:50:39 -07:00
Deepanshu Gupta
1677a9bdeb Merge "resolve conflicts for merge 5a7b3b65 correctly" into jb-dev-plus-aosp 2014-05-13 02:32:31 +00:00
Deepanshu Gupta
51cce0ec42 resolve conflicts for merge 5a7b3b65 correctly
Change-Id: I832b7ee50002bcd1429bf431cc91f12e60d19f84
2014-05-12 19:31:25 -07:00
Deepanshu Gupta
7377c7be6a am 3a115628: Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
* commit '3a115628236ee9051518d4f96840cbb76070cf92':
  Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
2014-05-13 02:20:58 +00:00
Deepanshu Gupta
9359dc2e7d am 2d3fa7ba: Support actionProviderClass attribute for menus [DO NOT MERGE]
* commit '2d3fa7ba782238afb891db38e29ef7ec755bfdf6':
  Support actionProviderClass attribute for menus [DO NOT MERGE]
2014-05-13 02:20:54 +00:00
Deepanshu Gupta
df2da3d7c9 am 7bc363ba: Add special system view cookie to OverflowButton. [DO NOT MERGE]
* commit '7bc363ba72d4cdd9a0b3b1601e432acfc09c0dc0':
  Add special system view cookie to OverflowButton. [DO NOT MERGE]
2014-05-13 02:20:51 +00:00
Deepanshu Gupta
4eab4e14c8 am 5268248e: Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
* commit '5268248e0708951966e4f6514736a4030d5052da':
  Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
2014-05-13 02:20:47 +00:00
Deepanshu Gupta
00d0964901 am 85f53c33: Fix style warnings in RenderSessionImpl [DO NOT MERGE]
* commit '85f53c3335daf0e55cec757fd66fe560e0b020ef':
  Fix style warnings in RenderSessionImpl [DO NOT MERGE]
2014-05-13 02:20:44 +00:00
Deepanshu Gupta
0df5ae65a9 am 0f209967: Add view cookies for action bar menus. [DO NOT MERGE]
* commit '0f209967bfc4a6f1eec46cc34a39cfe8af9f8af9':
  Add view cookies for action bar menus. [DO NOT MERGE]
2014-05-13 02:20:42 +00:00
Deepanshu Gupta
175851600c am 26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE]
* commit '26c373213592ce7fb5a09f23a3d9d3ca0727e346':
  Add missing layout params to xlarge action bar. [DO NOT MERGE]
2014-05-13 02:20:38 +00:00
Deepanshu Gupta
3027b69e15 am f7e57949: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
* commit 'f7e5794990831df87d4097126f6d24455da50efe':
  Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
2014-05-13 02:20:35 +00:00
Deepanshu Gupta
6d3c4ab245 am 43b15371: Action bar rendering in layoutlib [DO NOT MERGE]
* commit '43b15371f9f1da7d97fe0500eb1536d981097e31':
  Action bar rendering in layoutlib [DO NOT MERGE]
2014-05-13 02:20:23 +00:00
Deepanshu Gupta
052e0c589e am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE]
* commit '770e40f839f059e1e3a15a2b14157c7cbb3b0553':
  Fix theme/style resolution in Layoutlib [DO NOT MERGE]
2014-05-13 02:20:20 +00:00
Deepanshu Gupta
9602fc1c00 am 87665388: Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
* commit '87665388466812897e888680c0b2a1d7db1b9cbd':
  Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
2014-05-13 02:20:16 +00:00
Deepanshu Gupta
c9a4badb54 am d915dcac: Layoutlib tests now check methods return value [DO NOT MERGE]
* commit 'd915dcac365b6d3ad88afab52e74ccca7dfbefec':
  Layoutlib tests now check methods return value [DO NOT MERGE]
2014-05-13 02:20:13 +00:00
Deepanshu Gupta
bdd8fbf6ea am 877ae535: Set default text style in layoutlib as NORMAL [DO NOT MERGE]
* commit '877ae53586c3f7f5b788a40dfb0a58bef54a7446':
  Set default text style in layoutlib as NORMAL [DO NOT MERGE]
2014-05-13 02:20:10 +00:00
Deepanshu Gupta
01cdd3123f am 669792b3: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
* commit '669792b303b99a003bbcbf8d962f5be1debf9b63':
  Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
2014-05-13 02:20:07 +00:00
Deepanshu Gupta
d094742d2e am cda89ca0: Fix a bug in Nine Patch library. [DO NOT MERGE]
* commit 'cda89ca02548c19250ae55671c055536b64b74f8':
  Fix a bug in Nine Patch library. [DO NOT MERGE]
2014-05-13 02:19:59 +00:00
Deepanshu Gupta
7bb8de580a am a2b34c96: Optimize layout rendering in layoutlib [DO NOT MERGE]
* commit 'a2b34c96f1ef24d96854d1e23426dec7774510e8':
  Optimize layout rendering in layoutlib [DO NOT MERGE]
2014-05-13 02:19:56 +00:00
Deepanshu Gupta
69b3115e1c am e183855c: Add methods for Time_Delegate [DO NOT MERGE]
* commit 'e183855c1eb7baf750c67bb20e70fb887eba7af6':
  Add methods for Time_Delegate [DO NOT MERGE]
2014-05-13 02:19:52 +00:00
Deepanshu Gupta
82d5bd98b7 am e5a2347b: Fix NPE in layoutlib. [DO NOT MERGE]
* commit 'e5a2347bc6cf1506799136af4c9724275ca0247e':
  Fix NPE in layoutlib. [DO NOT MERGE]
2014-05-13 02:19:49 +00:00
Deepanshu Gupta
d5de1bd630 am 30505abe: Fix text size in Fake Action Bar. [DO NOT MERGE]
* commit '30505abeb6cda9d042ec41f2563d561714eac46b':
  Fix text size in Fake Action Bar. [DO NOT MERGE]
2014-05-13 02:19:46 +00:00
Deepanshu Gupta
8a70bcef5a resolved conflicts for merge 5a7b3b65 to jb-dev-plus-aosp
Change-Id: I6bafdb9c6a8dfc6f55a4d9adf67f447661137eb8
2014-05-12 18:57:34 -07:00
Deepanshu Gupta
40fea8b1bf am 4b5da86d: Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]
* commit '4b5da86d04200ba278b62ff99da91e212b87e9af':
  Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]
2014-05-13 01:52:32 +00:00
Deepanshu Gupta
065ce2e8b3 am 5c166c9c: Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]
* commit '5c166c9c04b6ea9d4955830e7ba277be71f17a6f':
  Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]
2014-05-13 01:52:28 +00:00
Deepanshu Gupta
9f2f5e776a am 2d82586b: Fix CalendarView to show the right labels. [DO NOT MERGE]
* commit '2d82586b96593b1b3b5280d77d5ae9a09df9d1fd':
  Fix CalendarView to show the right labels. [DO NOT MERGE]
2014-05-13 01:52:25 +00:00
Deepanshu Gupta
06c4f23d73 am 64dc0380: Fix layoutlib [DO NOT MERGE]
* commit '64dc0380127047ffcf135b6848c9150aa8dbed85':
  Fix layoutlib [DO NOT MERGE]
2014-05-13 01:52:21 +00:00
Deepanshu Gupta
cdb87d8d83 am a59c27dd: Fix ClassCastException when rendering ListView [DO NOT MERGE]
* commit 'a59c27dd6674a31c875b0baa86519caec628ca2d':
  Fix ClassCastException when rendering ListView [DO NOT MERGE]
2014-05-13 01:52:18 +00:00
Deepanshu Gupta
edae4e6951 am 8a39c3af: Add orientation to configuration for layoutlib. [DO NOT MERGE]
* commit '8a39c3afb29f2540b05319042e758dd4d5f73a1e':
  Add orientation to configuration for layoutlib. [DO NOT MERGE]
2014-05-13 01:52:15 +00:00
Deepanshu Gupta
3a11562823 Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
Return the right value for presence of software navigation bar in
BridgeWindowManager. This is required to render the overflow menu button
correctly in the Action Bar.

Change-Id: I73de3b299f6a3a113425c436a59e800cd1d6b97f
2014-05-07 18:09:48 -07:00
Deepanshu Gupta
2d3fa7ba78 Support actionProviderClass attribute for menus [DO NOT MERGE]
The change adds support for view cookies for actionProviderClasses (for
example, ShareActionProvider) in the action bar menus.

This also provides a more robust search for the overflowMenuButton.

Change-Id: I316c8b9a69e2e337b41ba0fe4e61af9fe850f750
(cherry picked from commit 099f40a950)
2014-05-07 18:09:48 -07:00
Deepanshu Gupta
7bc363ba72 Add special system view cookie to OverflowButton. [DO NOT MERGE]
Add a special view cookie to enable the IDE to identify the overflow
menu button in the Action Bar.

Change-Id: Ida3ed776afb8c9fa8af23b73d4cf6d47eef0ab87
(cherry picked from commit 7c6f6481f4)
2014-05-07 18:09:47 -07:00
Deepanshu Gupta
5268248e07 Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
When running in edit mode, do not use the application info to get the
icon, since it will be null.

Change-Id: I174e6126ddca341d06c5f04939470ef52f0e771c
(cherry picked from commit 90ce58ecfd)
2014-05-07 18:09:47 -07:00
Deepanshu Gupta
85f53c3335 Fix style warnings in RenderSessionImpl [DO NOT MERGE]
Change-Id: I9d3cb23e4ea692f737a3e3d6c18cc8de18b66a3c
(cherry-picked from commit 22de7c4c3d)
2014-05-07 18:09:46 -07:00
Deepanshu Gupta
0f209967bf Add view cookies for action bar menus. [DO NOT MERGE]
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.

The change also contains a bugfix where a method wasn't renamed
properly.

Change-Id: Idcfc263a8ebe0a4f25afa3a1eb085fa628fd03ca
(cherry-picked from commit 094fd8ecb6)
2014-05-07 18:09:46 -07:00
Deepanshu Gupta
26c3732135 Add missing layout params to xlarge action bar. [DO NOT MERGE]
layout_width and layout_height params were missing from the x-large
version of the action bar layout file.

Change-Id: Icef5575ae3d4ce9db6a966b7fa2be1921b9e860e
2014-05-07 18:09:46 -07:00
Deepanshu Gupta
f7e5794990 Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
In addition to the cherrypicked changes, appropriate changes due to
changes to com.android.internal.widget.ActionBarView are made.

The icon used in the Action Bar may not always be the right one due to
the above resolution.

Change-Id: Ib7cc314079099c010f7d53849e204db36c410357
(cherry-picked from commit 56759be896)
2014-05-07 18:09:39 -07:00
Deepanshu Gupta
43b15371f9 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 fe38489f67)
2014-05-06 14:02:48 -07:00
Deepanshu Gupta
770e40f839 Fix theme/style resolution in Layoutlib [DO NOT MERGE]
Change-Id: Icfb91e566666408802dadc0e2070991151b16b9d
(cherry picked from commit 76dccb7f43)
2014-05-06 14:02:47 -07:00
Deepanshu Gupta
8766538846 Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
The bug caused some classes to be missed when computing the dependencies
of the existing classes.

This change includes the new mock_android.jar compiled from the mock
sources again.

Change-Id: I7285ff67e016ce5d73a8550501f49acc73cfadfa
(cherry-picked from 6136af326e)
2014-05-06 14:02:47 -07:00
Deepanshu Gupta
d915dcac36 Layoutlib tests now check methods return value [DO NOT MERGE]
The change is a cherry-pick from klp-dev.

The change also fixes the errors found by fixing the tests.

Change-Id: I87cef323c4eaee4e9f60475f01156b276593fa50
(cherry-picked from commit 2bd65db15f)
2014-05-06 14:02:47 -07:00
Deepanshu Gupta
877ae53586 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 bcbeaf83ca)
2014-05-06 14:02:46 -07:00
Deepanshu Gupta
669792b303 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 5be65fda15)
2014-05-06 14:02:46 -07:00
Deepanshu Gupta
cda89ca025 Fix a bug in Nine Patch library. [DO NOT MERGE]
The nine patches were not drawn correctly if they were not positioned at
the top left corner of the canvas.

Bug: http://b.android.com/29959
Change-Id: Icfed522ea07322a3ee9f3955067d3da26c4b0b5b
(cherry-picked from 5bb3414d14)
2014-05-06 14:02:46 -07:00
Deepanshu Gupta
a2b34c96f1 Optimize layout rendering in layoutlib [DO NOT MERGE]
The height of a layout should be zero if it is assigned a layout_weight.
This way, the layout is measured only once and prevents spurious errors.

Bug: https://code.google.com/p/android/issues/detail?id=58398
Change-Id: If49a7480e5eb82cb86780e00f2f5b65ee053fc2a
(cherry-picked from 5712b5fc3f)
2014-05-06 14:02:45 -07:00