Deepanshu Gupta
321a3fbd5a
am 3dc756a4: am 6c600df6: (-s ours) am e686fbce: am 2c8fea2a: am 56759be8: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
...
* commit '3dc756a47a0f31e7cc24b8f0e49935c3f32a73de':
Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
2014-05-13 02:09:40 +00:00
Deepanshu Gupta
839506fa6d
am 4a6ae03d: am e7c3ed44: (-s ours) am 21404483: am 0bb06b91: am fe38489f: Action bar rendering in layoutlib [DO NOT MERGE]
...
* commit '4a6ae03da19b8363c8b094507d5b6886e5d2f3e2':
Action bar rendering in layoutlib [DO NOT MERGE]
2014-05-13 02:09:38 +00:00
Deepanshu Gupta
c117227346
am 2f7d5d7c: am c88d4c57: (-s ours) am b172b780: am f3264738: am cc5340bc: Add missing dependency in layoutlib build file [DO NOT MERGE]
...
* commit '2f7d5d7c34c879896d1ad0eaaa07a8fc3b9e52e6':
Add missing dependency in layoutlib build file [DO NOT MERGE]
2014-05-13 02:09:35 +00:00
Deepanshu Gupta
c61e53e7e2
am bdb583df: am 57c0cf45: (-s ours) am 71acfa6c: am 49d47a02: am 76dccb7f: Fix theme/style resolution in Layoutlib [DO NOT MERGE]
...
* commit 'bdb583df0404487845029902b14bf14e32976807':
Fix theme/style resolution in Layoutlib [DO NOT MERGE]
2014-05-13 02:09:33 +00:00
Deepanshu Gupta
fd119e4b7c
am ef15cd61: am 3195ff0a: (-s ours) am b90db3e6: am de3b2c06: am 1ed75bde: Remove references to non-std Java classes. [DO NOT MERGE]
...
* commit 'ef15cd61901dfa994f7cb6a1c325b9e80abca6ae':
Remove references to non-std Java classes. [DO NOT MERGE]
2014-05-13 02:09:30 +00:00
Deepanshu Gupta
6c5f755634
am 4d23ae43: am 4654bfc1: (-s ours) am c2a6f3b1: am 2f94c1db: am 6136af32: Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
...
* commit '4d23ae43064416df4d6c6e4e450ab75142a6bd17':
Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
2014-05-13 02:09:27 +00:00
Deepanshu Gupta
14569ecf72
am e20ebd5a: am 863b49cc: (-s ours) am 9b89fcc0: am ef9596a1: am 2bd65db1: Layoutlib tests now check methods return value [DO NOT MERGE]
...
* commit 'e20ebd5ae19fb452b6fe0a00d28e44191c24ea8c':
Layoutlib tests now check methods return value [DO NOT MERGE]
2014-05-13 02:09:25 +00:00
Deepanshu Gupta
3dc756a47a
am 6c600df6: (-s ours) am e686fbce: am 2c8fea2a: am 56759be8: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
...
* commit '6c600df67388706d24486022fa73ed8786119faf':
Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
2014-05-13 02:04:41 +00:00
Deepanshu Gupta
4a6ae03da1
am e7c3ed44: (-s ours) am 21404483: am 0bb06b91: am fe38489f: Action bar rendering in layoutlib [DO NOT MERGE]
...
* commit 'e7c3ed442753c0ada27450868adcf1ff98fe9c39':
Action bar rendering in layoutlib [DO NOT MERGE]
2014-05-13 02:04:38 +00:00
Deepanshu Gupta
2f7d5d7c34
am c88d4c57: (-s ours) am b172b780: am f3264738: am cc5340bc: Add missing dependency in layoutlib build file [DO NOT MERGE]
...
* commit 'c88d4c572f95a6b2397cd2c2931b1a51c673a3c8':
Add missing dependency in layoutlib build file [DO NOT MERGE]
2014-05-13 02:04:35 +00:00
Deepanshu Gupta
bdb583df04
am 57c0cf45: (-s ours) am 71acfa6c: am 49d47a02: am 76dccb7f: Fix theme/style resolution in Layoutlib [DO NOT MERGE]
...
* commit '57c0cf454ab8d8d321f2a10c4914eb4414722392':
Fix theme/style resolution in Layoutlib [DO NOT MERGE]
2014-05-13 02:04:31 +00:00
Deepanshu Gupta
ef15cd6190
am 3195ff0a: (-s ours) am b90db3e6: am de3b2c06: am 1ed75bde: Remove references to non-std Java classes. [DO NOT MERGE]
...
* commit '3195ff0afad61fbb0787b80023bdb22ece4ecb6f':
Remove references to non-std Java classes. [DO NOT MERGE]
2014-05-13 02:04:29 +00:00
Deepanshu Gupta
4d23ae4306
am 4654bfc1: (-s ours) am c2a6f3b1: am 2f94c1db: am 6136af32: Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
...
* commit '4654bfc14ce664e6a6247ffa0fdace17f3eeb964':
Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
2014-05-13 02:04:25 +00:00
Deepanshu Gupta
e20ebd5ae1
am 863b49cc: (-s ours) am 9b89fcc0: am ef9596a1: am 2bd65db1: Layoutlib tests now check methods return value [DO NOT MERGE]
...
* commit '863b49ccaa77c7b0960220fca158099f3a79cb6a':
Layoutlib tests now check methods return value [DO NOT MERGE]
2014-05-13 02:04:22 +00:00
Deepanshu Gupta
6c600df673
am e686fbce: am 2c8fea2a: am 56759be8: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
...
* commit 'e686fbced9271cc7e35f4b17c7cd1b43d118ce0f':
Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
2014-05-13 02:00:14 +00:00
Deepanshu Gupta
e7c3ed4427
am 21404483: am 0bb06b91: am fe38489f: Action bar rendering in layoutlib [DO NOT MERGE]
...
* commit '21404483adbd4f26b5a2c7ebee7c09e83f42607e':
Action bar rendering in layoutlib [DO NOT MERGE]
2014-05-13 02:00:11 +00:00
Deepanshu Gupta
c88d4c572f
am b172b780: am f3264738: am cc5340bc: Add missing dependency in layoutlib build file [DO NOT MERGE]
...
* commit 'b172b7805160d4a6875d694cb218fe05b117beb3':
Add missing dependency in layoutlib build file [DO NOT MERGE]
2014-05-13 02:00:08 +00:00
Deepanshu Gupta
57c0cf454a
am 71acfa6c: am 49d47a02: am 76dccb7f: Fix theme/style resolution in Layoutlib [DO NOT MERGE]
...
* commit '71acfa6c1933806a080fc6efb820833f8de68d54':
Fix theme/style resolution in Layoutlib [DO NOT MERGE]
2014-05-13 02:00:06 +00:00
Deepanshu Gupta
3195ff0afa
am b90db3e6: am de3b2c06: am 1ed75bde: Remove references to non-std Java classes. [DO NOT MERGE]
...
* commit 'b90db3e6ab1bc89752ce8d7bd286268c41843693':
Remove references to non-std Java classes. [DO NOT MERGE]
2014-05-13 02:00:03 +00:00
Deepanshu Gupta
4654bfc14c
am c2a6f3b1: am 2f94c1db: am 6136af32: Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
...
* commit 'c2a6f3b1eda89365eec2508aec4a3a5024c140e5':
Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
2014-05-13 01:59:58 +00:00
Deepanshu Gupta
863b49ccaa
am 9b89fcc0: am ef9596a1: am 2bd65db1: Layoutlib tests now check methods return value [DO NOT MERGE]
...
* commit '9b89fcc09d0e5da7b81f1910d6ed29b152f730f9':
Layoutlib tests now check methods return value [DO NOT MERGE]
2014-05-13 01:59:55 +00:00
Deepanshu Gupta
e686fbced9
am 2c8fea2a: am 56759be8: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
...
* commit '2c8fea2ad425c4ba371bcb678949613dc8db72d0':
Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
2014-05-13 01:54:53 +00:00
Deepanshu Gupta
21404483ad
am 0bb06b91: am fe38489f: Action bar rendering in layoutlib [DO NOT MERGE]
...
* commit '0bb06b91e7be5b7f8c397295094aeaf1df8dbb09':
Action bar rendering in layoutlib [DO NOT MERGE]
2014-05-13 01:54:50 +00:00
Deepanshu Gupta
b172b78051
am f3264738: am cc5340bc: Add missing dependency in layoutlib build file [DO NOT MERGE]
...
* commit 'f326473865d0860badcc39979b8965a6a2f28ae7':
Add missing dependency in layoutlib build file [DO NOT MERGE]
2014-05-13 01:54:48 +00:00
Deepanshu Gupta
71acfa6c19
am 49d47a02: am 76dccb7f: Fix theme/style resolution in Layoutlib [DO NOT MERGE]
...
* commit '49d47a02e8c767d81815827a8170d015db6ea2d4':
Fix theme/style resolution in Layoutlib [DO NOT MERGE]
2014-05-13 01:54:44 +00:00
Deepanshu Gupta
b90db3e6ab
am de3b2c06: am 1ed75bde: Remove references to non-std Java classes. [DO NOT MERGE]
...
* commit 'de3b2c06ab05d1fbbf643b7ec3377d25997697d9':
Remove references to non-std Java classes. [DO NOT MERGE]
2014-05-13 01:54:42 +00:00
Deepanshu Gupta
c2a6f3b1ed
am 2f94c1db: am 6136af32: Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
...
* commit '2f94c1db0d2c7e68891c3d96732fe39b199fac5d':
Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
2014-05-13 01:54:39 +00:00
Deepanshu Gupta
9b89fcc09d
am ef9596a1: am 2bd65db1: Layoutlib tests now check methods return value [DO NOT MERGE]
...
* commit 'ef9596a1ea7c39cd07b81e87dca7f8f1941056b7':
Layoutlib tests now check methods return value [DO NOT MERGE]
2014-05-13 01:54:36 +00:00
Deepanshu Gupta
2c8fea2ad4
am 56759be8: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
...
* commit '56759be8960ea1b5dc8b6de1810a84e2f10e2058':
Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
2014-05-13 01:49:39 +00:00
Deepanshu Gupta
0bb06b91e7
am fe38489f: Action bar rendering in layoutlib [DO NOT MERGE]
...
* commit 'fe38489f6734fefd0a216e9cfe12f8f978ff371f':
Action bar rendering in layoutlib [DO NOT MERGE]
2014-05-13 01:49:37 +00:00
Deepanshu Gupta
f326473865
am cc5340bc: Add missing dependency in layoutlib build file [DO NOT MERGE]
...
* commit 'cc5340bc6301f8d9bf2cdb6ad2036964a3d179f5':
Add missing dependency in layoutlib build file [DO NOT MERGE]
2014-05-13 01:49:34 +00:00
Deepanshu Gupta
49d47a02e8
am 76dccb7f: Fix theme/style resolution in Layoutlib [DO NOT MERGE]
...
* commit '76dccb7f436565136ff5e15b1ca57530940f5642':
Fix theme/style resolution in Layoutlib [DO NOT MERGE]
2014-05-13 01:49:31 +00:00
Deepanshu Gupta
de3b2c06ab
am 1ed75bde: Remove references to non-std Java classes. [DO NOT MERGE]
...
* commit '1ed75bde09275c9f2bd1f81830e381ea864ac7f5':
Remove references to non-std Java classes. [DO NOT MERGE]
2014-05-13 01:49:28 +00:00
Deepanshu Gupta
2f94c1db0d
am 6136af32: Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
...
* commit '6136af326e64037184a7a2a3ae60c399f04d631f':
Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
2014-05-13 01:49:25 +00:00
Deepanshu Gupta
ef9596a1ea
am 2bd65db1: Layoutlib tests now check methods return value [DO NOT MERGE]
...
* commit '2bd65db15fa6a265ccc4023161611088bc791b4e':
Layoutlib tests now check methods return value [DO NOT MERGE]
2014-05-13 01:49:21 +00:00
Deepanshu Gupta
52a86f17ea
am 7f56beb8: Support actionProviderClass attribute for menus [DO NOT MERGE]
...
* commit '7f56beb8403b597a676faf12643fef585a31007e':
Support actionProviderClass attribute for menus [DO NOT MERGE]
2014-05-13 01:44:41 +00:00
Deepanshu Gupta
680219f2e3
am f61bd002: Fix class name for OverflowMenuButton [DO NOT MERGE]
...
* commit 'f61bd0020642cf0868486d307f2e68c8c02d6102':
Fix class name for OverflowMenuButton [DO NOT MERGE]
2014-05-13 01:44:38 +00:00
Deepanshu Gupta
78b176b34c
am d558ebdb: Add special system view cookie to OverflowButton. [DO NOT MERGE]
...
* commit 'd558ebdb433af498a87e25673f7dd828a0e7439a':
Add special system view cookie to OverflowButton. [DO NOT MERGE]
2014-05-13 01:44:36 +00:00
Deepanshu Gupta
a4384d4e8c
am a98121ef: Fix style warnings in RenderSessionImpl [DO NOT MERGE]
...
* commit 'a98121ef5251b5ebdb8c1b0b6780d570844284b2':
Fix style warnings in RenderSessionImpl [DO NOT MERGE]
2014-05-13 01:44:33 +00:00
Deepanshu Gupta
d9a137bd84
am 77048379: Add view cookies for action bar menus. [DO NOT MERGE]
...
* commit '7704837947455909f295b088a3d15a20e107dbd7':
Add view cookies for action bar menus. [DO NOT MERGE]
2014-05-13 01:44:29 +00:00
Deepanshu Gupta
7f56beb840
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 28fa661f79e18fc9fc46bf112edded9c0d07696f)
2014-05-02 18:01:11 -07:00
Deepanshu Gupta
f61bd00206
Fix class name for OverflowMenuButton [DO NOT MERGE]
...
Change-Id: Ie3e709e7aadb2193397df8befef0c55624d7e4e3
(cherry picked from commit 4b5fa4d318e7efaffdc678e0cb8953ffc78c2b1e)
2014-05-02 17:52:04 -07:00
Deepanshu Gupta
d558ebdb43
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 c967d8dc62c429ecf3e27bf3714a953636e75cbf)
2014-05-02 17:43:25 -07:00
Deepanshu Gupta
a98121ef52
Fix style warnings in RenderSessionImpl [DO NOT MERGE]
...
Change-Id: I9d3cb23e4ea692f737a3e3d6c18cc8de18b66a3c
(cherry-picked from commit fbfeb1a90b6f8f3966c60a69d50ce8f608d9d861)
2014-05-02 17:34:00 -07:00
Deepanshu Gupta
7704837947
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 5ba2f230faa355eb9bc1e90f6c48eeeb437f390c)
2014-05-02 17:33:05 -07:00
Deepanshu Gupta
56759be896
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 1b87390c9426c4bc9119829e9375d712dfde11c3)
2014-05-02 16:23:14 -07:00
Deepanshu Gupta
fe38489f67
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 20e0695b554e883b095f5223be10b6e1097db49f)
2014-05-02 16:23:14 -07:00
Deepanshu Gupta
cc5340bc63
Add missing dependency in layoutlib build file [DO NOT MERGE]
...
Add missing dependency on built_ext_data
Change-Id: I4e7cca7f6cbc7f5b7416ac9b85a9aec01e61ecd4
(cherry-picked from commit b85d30a2c88b6a23e251347b14a75456c4daeca9)
2014-05-02 16:23:14 -07:00
Deepanshu Gupta
76dccb7f43
Fix theme/style resolution in Layoutlib [DO NOT MERGE]
...
Change-Id: Icfb91e566666408802dadc0e2070991151b16b9d
(cherry picked from commit 3c00b28bf60ab01b449e16df045238f4bae4d700)
2014-05-02 16:23:13 -07:00
Deepanshu Gupta
1ed75bde09
Remove references to non-std Java classes. [DO NOT MERGE]
...
This change adds a substitute for the Charsets class in java namespace.
The original cherry pick of the change had dropped this substitute. But
the substitute is required for bug b.android.com/59732
The original cherry-pick is 6335590aa8997944cc7fb358a315dbb9b789f87f and
the original change is 81f74f4bc96ea4266cebe1b785d095558f540800
The original Change-Id is Iac5b272652e2780c9bb72d19f415d150948ca589
Change-Id: I76c87c74ee088778b37d1a7a7d531e0fde5c758f
2014-05-02 16:22:14 -07:00