diff options
| author | Winson Chung <winsonc@google.com> | 2011-06-01 17:28:46 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-01 17:28:46 -0700 |
| commit | e934f87c6adc29c84ea96c608db4e4e5dd6b4046 (patch) | |
| tree | c3918da892700e5aba0effde439400e370c46a31 /res/layout | |
| parent | 7446fee6cb1796efad265bee00b9bb51690d3af8 (diff) | |
| parent | 4c98d9235d164680186180974719f551cf935d08 (diff) | |
| download | android_packages_apps_Trebuchet-e934f87c6adc29c84ea96c608db4e4e5dd6b4046.tar.gz android_packages_apps_Trebuchet-e934f87c6adc29c84ea96c608db4e4e5dd6b4046.tar.bz2 android_packages_apps_Trebuchet-e934f87c6adc29c84ea96c608db4e4e5dd6b4046.zip | |
Merge "Adding drag target bar."
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/qsb_bar.xml | 34 |
1 files changed, 28 insertions, 6 deletions
diff --git a/res/layout/qsb_bar.xml b/res/layout/qsb_bar.xml index 54692249a..820fae69d 100644 --- a/res/layout/qsb_bar.xml +++ b/res/layout/qsb_bar.xml @@ -13,17 +13,17 @@ See the License for the specific language governing permissions and limitations under the License. --> -<FrameLayout +<com.android.launcher2.SearchDropTargetBar xmlns:android="http://schemas.android.com/apk/res/android" xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher" android:focusable="false"> <!-- Search buttons container --> <LinearLayout + style="@style/SearchDropTargetBar" android:id="@+id/qsb_search_bar" android:layout_width="match_parent" - android:layout_height="match_parent" - style="@style/SearchBar"> + android:layout_height="match_parent"> <!-- Global search icon --> <ImageView style="@style/SearchButton" @@ -61,10 +61,32 @@ <!-- Drag specific targets container --> <LinearLayout + style="@style/SearchDropTargetBar" android:id="@+id/drag_target_bar" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="#FF00FF00" - android:visibility="gone"> + android:alpha="0"> + + <FrameLayout + style="@style/DropTargetButtonContainer" + android:layout_weight="1"> + <!-- Delete target --> + <com.android.launcher2.DeleteDropTarget + style="@style/DropTargetButton" + android:id="@+id/delete_target" + android:text="@string/delete_zone_label_workspace" + android:drawableLeft="@drawable/delete_zone_selector" /> + </FrameLayout> + + <FrameLayout + style="@style/DropTargetButtonContainer" + android:layout_weight="1"> + <!-- Info target --> + <com.android.launcher2.InfoDropTarget + style="@style/DropTargetButton" + android:id="@+id/info_target" + android:text="@string/info_target_label" + android:drawableLeft="@drawable/ic_home_info_holo_dark" /> + </FrameLayout> </LinearLayout> -</FrameLayout> +</com.android.launcher2.SearchDropTargetBar> |