diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2013-12-12 12:16:24 -0800 |
|---|---|---|
| committer | Deepanshu Gupta <deepanshu@google.com> | 2014-04-15 20:02:48 -0700 |
| commit | 4ccc4bd54f85d86818f61d728c6361d2003ddd8e (patch) | |
| tree | 3f613368ddaf738a9f0ee9754189068ba86c32e3 /tools/layoutlib/bridge/resources | |
| parent | acf0bce09fec2cabe871d7146aa62e9258fbf06d (diff) | |
| download | frameworks_base-4ccc4bd54f85d86818f61d728c6361d2003ddd8e.zip frameworks_base-4ccc4bd54f85d86818f61d728c6361d2003ddd8e.tar.gz frameworks_base-4ccc4bd54f85d86818f61d728c6361d2003ddd8e.tar.bz2 | |
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)
Diffstat (limited to 'tools/layoutlib/bridge/resources')
| -rw-r--r-- | tools/layoutlib/bridge/resources/bars/action_bar.xml | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/tools/layoutlib/bridge/resources/bars/action_bar.xml b/tools/layoutlib/bridge/resources/bars/action_bar.xml index 7adc5af..dcfb979 100644 --- a/tools/layoutlib/bridge/resources/bars/action_bar.xml +++ b/tools/layoutlib/bridge/resources/bars/action_bar.xml @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <merge xmlns:android="http://schemas.android.com/apk/res/android"> - <include layout="@android:layout/action_bar_home" /> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content"/> + +<include layout="@android:layout/screen_action_bar" /> + </merge> |