diff options
Diffstat (limited to 'res/layout-watch')
-rw-r--r-- | res/layout-watch/accept_deny_dialog.xml | 111 | ||||
-rw-r--r-- | res/layout-watch/confirmation_dialog.xml | 131 | ||||
-rw-r--r-- | res/layout-watch/permissions_settings_item.xml | 47 | ||||
-rw-r--r-- | res/layout-watch/settings.xml | 21 | ||||
-rw-r--r-- | res/layout-watch/settings_internal.xml | 56 |
5 files changed, 111 insertions, 255 deletions
diff --git a/res/layout-watch/accept_deny_dialog.xml b/res/layout-watch/accept_deny_dialog.xml new file mode 100644 index 00000000..1a0509ee --- /dev/null +++ b/res/layout-watch/accept_deny_dialog.xml @@ -0,0 +1,111 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2016 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. +--> +<ScrollView + xmlns:android="http://schemas.android.com/apk/res/android" + android:fillViewport="true" + android:layout_width="match_parent" + android:layout_height="match_parent"> + <LinearLayout + android:id="@android:id/content" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical"> + + <FrameLayout + android:adjustViewBounds="true" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:minHeight="@dimen/diag_preferred_padding"> + <ImageView android:id="@android:id/icon" + android:adjustViewBounds="true" + android:maxHeight="24dp" + android:maxWidth="24dp" + android:layout_marginTop="@dimen/diag_icon_margin_top" + android:layout_marginBottom="8dp" + android:layout_gravity="center_horizontal" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:scaleType="centerInside" + android:visibility="gone" + android:src="@null" /> + </FrameLayout> + + <TextView android:id="@android:id/title" + android:gravity="center" + android:layout_marginBottom="8dp" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingLeft="@dimen/diag_preferred_padding" + android:paddingRight="@dimen/diag_preferred_padding" + android:textAppearance="@android:style/TextAppearance.Material.Title" /> + + <TextView + android:id="@android:id/message" + android:gravity="center" + android:layout_marginBottom="8dp" + android:layout_height="wrap_content" + android:layout_width="match_parent" + android:paddingLeft="@dimen/diag_preferred_padding" + android:paddingRight="@dimen/diag_preferred_padding" + android:textAppearance="@android:style/TextAppearance.Material.Subhead" + android:visibility="gone" /> + + <FrameLayout + android:id="@+id/buttonPanel" + android:layout_weight="1" + android:layout_width="match_parent" + android:layout_height="wrap_content"> + <LinearLayout + android:id="@+id/buttonContainer" + android:orientation="horizontal" + android:gravity="center_horizontal|top" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="bottom" + android:paddingTop="8dp" + android:paddingBottom="@dimen/diag_button_padding_bottom" + android:paddingLeft="@dimen/diag_button_padding_horizontal" + android:paddingRight="@dimen/diag_button_padding_horizontal" + style="?android:attr/buttonBarStyle"> + + <ImageButton + android:id="@android:id/button2" + android:src="@drawable/ic_cc_clear" + android:background="@drawable/accept_deny_dialog_negative_bg" + android:contentDescription="@string/generic_cancel" + android:layout_width="@dimen/diag_button_size" + android:layout_height="@dimen/diag_button_size" + android:visibility="gone" /> + + <Space + android:id="@+id/spacer" + android:layout_width="0dp" + android:layout_height="0dp" + android:visibility="gone" + android:layout_weight="1" /> + + <ImageButton + android:id="@android:id/button1" + android:src="@drawable/ic_cc_checkmark" + android:background="@drawable/accept_deny_dialog_positive_bg" + android:contentDescription="@string/generic_yes" + android:layout_width="@dimen/diag_button_size" + android:layout_height="@dimen/diag_button_size" + android:visibility="gone" /> + </LinearLayout> + </FrameLayout> + </LinearLayout> +</ScrollView> diff --git a/res/layout-watch/confirmation_dialog.xml b/res/layout-watch/confirmation_dialog.xml deleted file mode 100644 index ea25b6b4..00000000 --- a/res/layout-watch/confirmation_dialog.xml +++ /dev/null @@ -1,131 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2015 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:id="@+id/confirmation" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <ScrollView - android:id="@+id/scrolling_container" - android:overScrollMode="never" - android:scrollbars="none" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <LinearLayout - android:id="@+id/content" - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingTop="@dimen/conf_diag_content_padding_top"> - - <LinearLayout - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:minHeight="@dimen/conf_diag_min_space_above_message" - android:gravity="bottom"> - <TextView - android:id="@+id/current_page_text" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_horizontal" - android:layout_marginTop="@dimen/grant_permissions_app_breadcrumb_margin_top" - android:textAppearance="@style/GrantPermissions.BreadcrumbText" /> - - <ImageView - android:id="@+id/icon" - android:layout_width="@dimen/grant_permissions_app_icon_size" - android:layout_height="@dimen/grant_permissions_app_icon_size" - android:tint="@color/grant_permissions_app_color" - android:layout_gravity="center_horizontal" - android:layout_marginTop="@dimen/grant_permissions_app_icon_margin_top"/> - </LinearLayout> - - <TextView - android:id="@+id/message" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="@dimen/grant_permissions_title_margin_top" - android:paddingLeft="@dimen/grant_permissions_message_side_padding" - android:paddingRight="@dimen/grant_permissions_message_side_padding" - android:gravity="center" - android:textAppearance="@style/GrantPermissions.TitleText"/> - </LinearLayout> - </ScrollView> - - <!-- TODO: Change this to use a ViewStub instead of show/hiding the two layouts --> - <FrameLayout android:id="@+id/button_bar_container" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="bottom" - android:background="#FF606060"> - <FrameLayout - android:id="@+id/horizontal_button_bar" - android:layout_width="match_parent" - android:layout_height="@dimen/conf_diag_button_container_height"> - <Button - android:id="@+id/permission_deny_button" - android:layout_width="54dp" - android:layout_height="54dp" - android:layout_gravity="top|left" - android:layout_marginLeft="@dimen/conf_diag_2button_margin_side" - android:layout_marginTop="@dimen/conf_diag_2button_margin_top" - android:background="@drawable/cancel_button"/> - - <Button - android:id="@+id/permission_allow_button" - android:layout_width="54dp" - android:layout_height="54dp" - android:layout_gravity="top|right" - android:layout_marginRight="@dimen/conf_diag_2button_margin_side" - android:layout_marginTop="@dimen/conf_diag_2button_margin_top" - android:background="@drawable/confirm_button"/> - </FrameLayout> - - <FrameLayout - android:id="@+id/vertical_button_bar" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingLeft="@dimen/conf_diag_3button_padding_side" - android:paddingRight="@dimen/conf_diag_3button_padding_side" - android:visibility="gone"> - <LinearLayout - android:id="@+id/buttonPanel" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="vertical"> - <Button - android:id="@+id/vertical_button1" - style="@style/Widget.WearDiag.Button"/> - - <Button - android:id="@+id/vertical_button2" - style="@style/Widget.WearDiag.Button"/> - - <Button - android:id="@+id/vertical_button3" - style="@style/Widget.WearDiag.Button"/> - - <!-- Adding padding to the bottom button causes rendering issues, so add - an empty view here instead --> - <Space android:layout_width="match_parent" - android:layout_height="@dimen/conf_diag_3button_padding_bottom"/> - </LinearLayout> - </FrameLayout> - </FrameLayout> -</FrameLayout> diff --git a/res/layout-watch/permissions_settings_item.xml b/res/layout-watch/permissions_settings_item.xml deleted file mode 100644 index b370f1ac..00000000 --- a/res/layout-watch/permissions_settings_item.xml +++ /dev/null @@ -1,47 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - android:layout_width="match_parent" - android:layout_height="wrap_content" > - <android.support.wearable.view.CircledImageView - android:id="@+id/image" - android:alpha="0.5" - android:layout_height="52dp" - android:layout_width="52dp" - android:layout_gravity="center_vertical" - app:circle_border_color="#FFFFFFFF" - app:circle_border_width="1dp" - app:circle_color="#00000000" - app:image_tint="#FFFFFFFF"/> - - <LinearLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="@dimen/settings_text_margin_left" - android:layout_gravity="center_vertical" - android:orientation="vertical" > - - <TextView - android:id="@+id/text" - android:alpha="0.5" - android:fontFamily="sans-serif-condensed-light" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textColor="@color/permissions_settings_item_color" - android:textSize="14sp" - android:maxLines="2" - android:ellipsize="end"/> - <TextView - android:id="@+id/state" - android:alpha="0.5" - android:fontFamily="sans-serif-condensed-light" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textColor="@color/permissions_settings_item_color" - android:textSize="14sp" - android:maxLines="1" - android:ellipsize="end"/> - </LinearLayout> - -</LinearLayout> diff --git a/res/layout-watch/settings.xml b/res/layout-watch/settings.xml deleted file mode 100644 index 46249d50..00000000 --- a/res/layout-watch/settings.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2015 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:id="@+id/container" - android:layout_width="match_parent" - android:layout_height="match_parent"> - <include layout="@layout/settings_internal" /> -</FrameLayout> diff --git a/res/layout-watch/settings_internal.xml b/res/layout-watch/settings_internal.xml deleted file mode 100644 index e1947aaa..00000000 --- a/res/layout-watch/settings_internal.xml +++ /dev/null @@ -1,56 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2015 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. ---> -<merge xmlns:android="http://schemas.android.com/apk/res/android"> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> - <TextView - android:id="@+id/header" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:minHeight="@dimen/settings_header_base_height" - android:layout_marginLeft="16dp" - android:layout_marginTop="@dimen/settings_header_top_margin" - android:textSize="@dimen/setting_short_header_text_size" - android:maxLines="2" - android:ellipsize="end" - android:textColor="#9E9E9E" - android:fontFamily="sans-serif-condensed-light" - /> - - <TextView - android:id="@+id/details" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:minHeight="@dimen/settings_header_base_height" - android:layout_marginLeft="16dp" - android:layout_marginTop="@dimen/settings_header_top_margin" - android:maxLines="2" - android:ellipsize="end" - android:textColor="@color/permissions_settings_item_color" - android:textSize="14sp" - android:visibility="gone" - /> - </LinearLayout> - - <android.support.wearable.view.WearableListView - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/wheel" - android:layout_width="match_parent" - android:layout_height="match_parent" - /> -</merge> |