diff options
Diffstat (limited to 'packages/SystemUI/res/layout')
-rw-r--r-- | packages/SystemUI/res/layout/global_screenshot.xml | 40 | ||||
-rw-r--r-- | packages/SystemUI/res/layout/navigation_bar.xml | 139 | ||||
-rw-r--r-- | packages/SystemUI/res/layout/usb_preference_buttons.xml | 43 |
3 files changed, 129 insertions, 93 deletions
diff --git a/packages/SystemUI/res/layout/global_screenshot.xml b/packages/SystemUI/res/layout/global_screenshot.xml new file mode 100644 index 0000000..6cb8799 --- /dev/null +++ b/packages/SystemUI/res/layout/global_screenshot.xml @@ -0,0 +1,40 @@ +<?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. +--> +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent"> + <ImageView android:id="@+id/global_screenshot_background" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="#FF000000" + android:visibility="gone" /> + <FrameLayout + android:id="@+id/global_screenshot_container" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:background="@drawable/global_screenshot_background" + android:visibility="gone"> + <ImageView android:id="@+id/global_screenshot" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:adjustViewBounds="true" /> + </FrameLayout> + <ImageView android:id="@+id/global_screenshot_flash" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="#FFFFFFFF" + android:visibility="gone" /> +</FrameLayout> diff --git a/packages/SystemUI/res/layout/navigation_bar.xml b/packages/SystemUI/res/layout/navigation_bar.xml index b97c6a5..51e7d97 100644 --- a/packages/SystemUI/res/layout/navigation_bar.xml +++ b/packages/SystemUI/res/layout/navigation_bar.xml @@ -25,106 +25,145 @@ android:layout_width="match_parent" > - <FrameLayout - android:id="@+id/background" + <FrameLayout android:id="@+id/rot0" android:layout_height="match_parent" android:layout_width="match_parent" android:background="#FF000000" > - <LinearLayout android:id="@+id/rot0" + <LinearLayout android:layout_height="match_parent" android:layout_width="match_parent" - android:paddingLeft="8dip" - android:paddingRight="8dip" android:orientation="horizontal" > <!-- navigation controls --> + <View + android:layout_width="40dp" + android:layout_height="match_parent" + android:layout_weight="0" + /> <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/back" - android:layout_width="wrap_content" + android:layout_width="80dp" android:layout_height="match_parent" - android:src="@drawable/ic_sysbar_back" + android:src="@drawable/ic_sysbar_back_default" systemui:keyCode="4" + android:layout_weight="0" + /> + <View + android:layout_width="match_parent" + android:layout_height="match_parent" android:layout_weight="1" /> <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/home" - android:layout_width="wrap_content" + android:layout_width="80dp" android:layout_height="match_parent" - android:src="@drawable/ic_sysbar_home" + android:src="@drawable/ic_sysbar_home_default" systemui:keyCode="3" + android:layout_weight="0" + /> + <View + android:layout_width="match_parent" + android:layout_height="match_parent" android:layout_weight="1" /> + <ImageView android:id="@+id/recent_apps" + android:layout_width="80dp" + android:layout_height="match_parent" + android:src="@drawable/ic_sysbar_recent_default" + android:layout_weight="0" + /> <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/menu" - android:layout_width="wrap_content" + android:layout_width="40dp" android:layout_height="match_parent" - android:src="@drawable/ic_sysbar_menu" + android:src="@drawable/ic_sysbar_menu_default" systemui:keyCode="82" - android:layout_weight="1" + android:layout_weight="0" + android:visibility="invisible" /> </LinearLayout> - <LinearLayout android:id="@+id/rot90" + <View android:id="@+id/deadzone" + android:layout_height="@dimen/navigation_bar_deadzone_size" + android:layout_width="match_parent" + android:layout_gravity="top" + android:clickable="true" + /> + </FrameLayout> + + <FrameLayout android:id="@+id/rot90" + android:layout_height="match_parent" + android:layout_width="match_parent" + android:background="#FF000000" + android:visibility="gone" + android:paddingTop="24dp" + > + + <LinearLayout android:layout_height="match_parent" android:layout_width="match_parent" android:orientation="vertical" - android:visibility="gone" > - + <!-- navigation controls --> <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/menu" + android:layout_height="40dp" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:src="@drawable/ic_sysbar_menu" + android:src="@drawable/ic_sysbar_menu_default_land" systemui:keyCode="82" + android:layout_weight="0" + android:visibility="invisible" + /> + <ImageView android:id="@+id/recent_apps" + android:layout_height="80dp" + android:layout_width="match_parent" + android:src="@drawable/ic_sysbar_recent_default_land" + android:layout_weight="0" + /> + <View + android:layout_height="match_parent" + android:layout_width="match_parent" android:layout_weight="1" /> <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/home" + android:layout_height="80dp" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:src="@drawable/ic_sysbar_home" + android:src="@drawable/ic_sysbar_home_default_land" systemui:keyCode="3" - android:layout_weight="1" + android:layout_weight="0" /> - <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/back" + <View + android:layout_height="match_parent" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:src="@drawable/ic_sysbar_back" - systemui:keyCode="4" android:layout_weight="1" /> - </LinearLayout> - - <LinearLayout android:id="@+id/rot270" - android:layout_height="match_parent" - android:layout_width="match_parent" - android:orientation="vertical" - android:visibility="gone" - > - - <!-- navigation controls --> <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/back" + android:layout_height="80dp" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:src="@drawable/ic_sysbar_back" + android:src="@drawable/ic_sysbar_back_default_land" systemui:keyCode="4" - android:layout_weight="1" - /> - <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/home" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:src="@drawable/ic_sysbar_home" - systemui:keyCode="3" - android:layout_weight="1" + android:layout_weight="0" /> - <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/menu" + <View + android:layout_height="40dp" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:src="@drawable/ic_sysbar_menu" - systemui:keyCode="82" - android:layout_weight="1" + android:layout_weight="0" /> </LinearLayout> - + + <View android:id="@+id/deadzone" + android:layout_width="@dimen/navigation_bar_deadzone_size" + android:layout_height="match_parent" + android:layout_gravity="left" + android:clickable="true" + /> </FrameLayout> + + <!-- not used --> + <View android:id="@+id/rot270" + android:layout_height="match_parent" + android:layout_width="match_parent" + android:visibility="gone" + /> + </com.android.systemui.statusbar.phone.NavigationBarView> diff --git a/packages/SystemUI/res/layout/usb_preference_buttons.xml b/packages/SystemUI/res/layout/usb_preference_buttons.xml deleted file mode 100644 index babe07e..0000000 --- a/packages/SystemUI/res/layout/usb_preference_buttons.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2008 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. ---> - -<!-- Check box that is displayed in the activity resolver UI for the user - to make their selection the preferred activity. --> -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingLeft="14dip" - android:paddingRight="15dip" - android:orientation="vertical"> - - <Button - android:id="@+id/mtp_ptp_button" - android:text="@string/use_ptp_button_title" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:focusable="true" - android:clickable="true" /> - - <Button - android:id="@+id/installer_cd_button" - android:text="@string/installer_cd_button_title" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:focusable="true" - android:clickable="true" /> - -</LinearLayout> |