diff options
| author | Michael Kolb <kolby@google.com> | 2011-08-09 10:24:41 -0700 |
|---|---|---|
| committer | Michael Kolb <kolby@google.com> | 2011-08-15 13:31:03 -0700 |
| commit | c3af06776be83ba64a0d3549cb72ca6e5e7f03cd (patch) | |
| tree | 60d1a15205ac0b46f94528c0da0963a79f6d547e /res | |
| parent | 8d5af2d0208aa5b5197f50e12ba11c5565d74dc4 (diff) | |
| download | packages_apps_browser-c3af06776be83ba64a0d3549cb72ca6e5e7f03cd.zip packages_apps_browser-c3af06776be83ba64a0d3549cb72ca6e5e7f03cd.tar.gz packages_apps_browser-c3af06776be83ba64a0d3549cb72ca6e5e7f03cd.tar.bz2 | |
Tab switcher animation
Bug: 5123884
first step towards animations between browser and tab switcher
Change-Id: I1d959d42d0036f3c4498972fcc8ad434fa7f4437
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/anim_screen.xml | 32 | ||||
| -rw-r--r-- | res/layout/nav_tab_view.xml | 4 | ||||
| -rw-r--r-- | res/values/ids.xml | 1 |
3 files changed, 35 insertions, 2 deletions
diff --git a/res/layout/anim_screen.xml b/res/layout/anim_screen.xml new file mode 100644 index 0000000..399595e --- /dev/null +++ b/res/layout/anim_screen.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2011 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/main" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + android:focusable="false"> + <ImageView + android:id="@+id/title" + android:layout_width="match_parent" + android:layout_height="@dimen/toolbar_height" /> + <ImageView + android:id="@+id/content" + android:layout_width="match_parent" + android:layout_height="match_parent" /> +</LinearLayout> diff --git a/res/layout/nav_tab_view.xml b/res/layout/nav_tab_view.xml index 763f9c0..31df29b 100644 --- a/res/layout/nav_tab_view.xml +++ b/res/layout/nav_tab_view.xml @@ -17,7 +17,7 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/main" - android:layout_width="match_parent" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="vertical" android:background="@drawable/nav_tab_bg" @@ -52,10 +52,10 @@ </LinearLayout> <ImageView android:id="@+id/tab_view" + android:src="@drawable/ic_stop_holo_dark" android:layout_width="@dimen/nav_tab_width" android:layout_height="@dimen/nav_tab_height" android:paddingLeft="2dip" android:paddingRight="2dip" - android:layout_gravity="center_horizontal" android:focusable="false" /> </LinearLayout> diff --git a/res/values/ids.xml b/res/values/ids.xml index d6b74bd..f342d4c 100644 --- a/res/values/ids.xml +++ b/res/values/ids.xml @@ -19,4 +19,5 @@ <item type="id" name="group_position" /> <item type="id" name="child_position" /> <item type="id" name="child_id" /> + <item type="id" name="tab_view" /> </resources> |