diff options
Diffstat (limited to 'res')
-rw-r--r-- | res/drawable-watch/action_negative_bg.xml | 14 | ||||
-rw-r--r-- | res/drawable-watch/action_positive_bg.xml | 14 | ||||
-rw-r--r-- | res/drawable-watch/cancel_button.xml | 14 | ||||
-rw-r--r-- | res/drawable-watch/confirm_button.xml | 14 | ||||
-rw-r--r-- | res/drawable-watch/deny_button.xml | 14 | ||||
-rw-r--r-- | res/layout-watch/confirmation_dialog.xml | 12 | ||||
-rw-r--r-- | res/values-round/dimens.xml | 2 | ||||
-rw-r--r-- | res/values-watch/dimens.xml | 4 | ||||
-rw-r--r-- | res/values-watch/strings.xml | 4 |
9 files changed, 82 insertions, 10 deletions
diff --git a/res/drawable-watch/action_negative_bg.xml b/res/drawable-watch/action_negative_bg.xml index f1c33b54..7b21ba6d 100644 --- a/res/drawable-watch/action_negative_bg.xml +++ b/res/drawable-watch/action_negative_bg.xml @@ -1,4 +1,18 @@ <?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. +--> <selector xmlns:android="http://schemas.android.com/apk/res/android"> <item android:state_enabled="false"> <shape android:shape="oval"> diff --git a/res/drawable-watch/action_positive_bg.xml b/res/drawable-watch/action_positive_bg.xml index bc3e88ba..f3457c1a 100644 --- a/res/drawable-watch/action_positive_bg.xml +++ b/res/drawable-watch/action_positive_bg.xml @@ -1,4 +1,18 @@ <?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. +--> <selector xmlns:android="http://schemas.android.com/apk/res/android"> <item android:state_enabled="false"> <shape android:shape="oval"> diff --git a/res/drawable-watch/cancel_button.xml b/res/drawable-watch/cancel_button.xml index 5b16f549..641526a5 100644 --- a/res/drawable-watch/cancel_button.xml +++ b/res/drawable-watch/cancel_button.xml @@ -1,4 +1,18 @@ <?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. +--> <layer-list xmlns:android="http://schemas.android.com/apk/res/android" > <item android:drawable="@drawable/action_negative_bg" /> <item> diff --git a/res/drawable-watch/confirm_button.xml b/res/drawable-watch/confirm_button.xml index 6a895ec6..2b53e42e 100644 --- a/res/drawable-watch/confirm_button.xml +++ b/res/drawable-watch/confirm_button.xml @@ -1,4 +1,18 @@ <?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. +--> <layer-list xmlns:android="http://schemas.android.com/apk/res/android" > <item android:drawable="@drawable/action_positive_bg" /> <item> diff --git a/res/drawable-watch/deny_button.xml b/res/drawable-watch/deny_button.xml index 70ea453f..1e7582bc 100644 --- a/res/drawable-watch/deny_button.xml +++ b/res/drawable-watch/deny_button.xml @@ -1,4 +1,18 @@ <?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. +--> <layer-list xmlns:android="http://schemas.android.com/apk/res/android" > <item android:drawable="@drawable/action_negative_bg" /> <item> diff --git a/res/layout-watch/confirmation_dialog.xml b/res/layout-watch/confirmation_dialog.xml index 783d4051..0b93579e 100644 --- a/res/layout-watch/confirmation_dialog.xml +++ b/res/layout-watch/confirmation_dialog.xml @@ -29,7 +29,6 @@ <LinearLayout android:id="@+id/content" android:orientation="vertical" - android:paddingBottom="@dimen/conf_diag_button_container_height" android:layout_width="match_parent" android:layout_height="wrap_content"> @@ -89,13 +88,13 @@ 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:layout_marginLeft="@dimen/conf_diag_3button_margin_left" - android:layout_marginBottom="@dimen/conf_diag_3button_margin_bottom" + android:paddingLeft="@dimen/conf_diag_3button_padding_side" + android:paddingRight="@dimen/conf_diag_3button_padding_side" android:visibility="gone"> <LinearLayout android:id="@+id/buttonPanel" @@ -113,6 +112,11 @@ <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> diff --git a/res/values-round/dimens.xml b/res/values-round/dimens.xml index d9a522d4..5e7309b9 100644 --- a/res/values-round/dimens.xml +++ b/res/values-round/dimens.xml @@ -19,7 +19,5 @@ <dimen name="conf_diag_button_container_height">96dp</dimen> <dimen name="conf_diag_2button_margin_side">32dp</dimen> <dimen name="conf_diag_2button_margin_top">10dp</dimen> - <dimen name="conf_diag_3button_margin_left">36dp</dimen> - <dimen name="conf_diag_3button_margin_bottom">24dp</dimen> </resources> diff --git a/res/values-watch/dimens.xml b/res/values-watch/dimens.xml index fa657c73..24d2a058 100644 --- a/res/values-watch/dimens.xml +++ b/res/values-watch/dimens.xml @@ -30,8 +30,8 @@ <dimen name="conf_diag_button_container_height">72dp</dimen> <dimen name="conf_diag_2button_margin_side">16dp</dimen> <dimen name="conf_diag_2button_margin_top">9dp</dimen> - <dimen name="conf_diag_3button_margin_left">16dp</dimen> - <dimen name="conf_diag_3button_margin_bottom">9dp</dimen> + <dimen name="conf_diag_3button_padding_side">32dp</dimen> + <dimen name="conf_diag_3button_padding_bottom">22dp</dimen> <!-- START: Ported values --> diff --git a/res/values-watch/strings.xml b/res/values-watch/strings.xml index 2728da23..82fe4ae9 100644 --- a/res/values-watch/strings.xml +++ b/res/values-watch/strings.xml @@ -15,8 +15,8 @@ --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <!-- Title for the dialog button to deny a permission grant and never ask the user again. --> - <string name="grant_dialog_button_deny_dont_ask_again">Deny and don\'t ask again</string> + <!-- Title for the dialog button to deny a permission grant and never ask the user again. [CHAR LIMIT=29]--> + <string name="grant_dialog_button_deny_dont_ask_again">Deny, don\'t ask again</string> <!-- Template for the current permission from the total number of permissions. --> <string name="current_permission_template"> |