From 38a75aef5178bbcec5441c4d7a53257e650b2e21 Mon Sep 17 00:00:00 2001
From: Michael Kwan <mkwan@google.com>
Date: Fri, 20 Jan 2017 16:05:06 -0800
Subject: Tweak resource selector to only pick width for watch percentage size.

Bug: 32643912
Change-Id: Ie6298f96448d97e49eab90d1e2271863cfd6bbd2
---
 res/values-sw192dp-watch/dimens_percent.xml | 21 ---------------------
 res/values-sw205dp-watch/dimens_percent.xml | 21 ---------------------
 res/values-sw225dp-watch/dimens_percent.xml | 21 ---------------------
 res/values-sw228dp-watch/dimens_percent.xml | 21 ---------------------
 res/values-sw240dp-watch/dimens_percent.xml | 21 ---------------------
 res/values-w192dp-watch/dimens_percent.xml  | 21 +++++++++++++++++++++
 res/values-w205dp-watch/dimens_percent.xml  | 21 +++++++++++++++++++++
 res/values-w225dp-watch/dimens_percent.xml  | 21 +++++++++++++++++++++
 res/values-w228dp-watch/dimens_percent.xml  | 21 +++++++++++++++++++++
 res/values-w240dp-watch/dimens_percent.xml  | 21 +++++++++++++++++++++
 10 files changed, 105 insertions(+), 105 deletions(-)
 delete mode 100644 res/values-sw192dp-watch/dimens_percent.xml
 delete mode 100644 res/values-sw205dp-watch/dimens_percent.xml
 delete mode 100644 res/values-sw225dp-watch/dimens_percent.xml
 delete mode 100644 res/values-sw228dp-watch/dimens_percent.xml
 delete mode 100644 res/values-sw240dp-watch/dimens_percent.xml
 create mode 100644 res/values-w192dp-watch/dimens_percent.xml
 create mode 100644 res/values-w205dp-watch/dimens_percent.xml
 create mode 100644 res/values-w225dp-watch/dimens_percent.xml
 create mode 100644 res/values-w228dp-watch/dimens_percent.xml
 create mode 100644 res/values-w240dp-watch/dimens_percent.xml

diff --git a/res/values-sw192dp-watch/dimens_percent.xml b/res/values-sw192dp-watch/dimens_percent.xml
deleted file mode 100644
index b5beca32..00000000
--- a/res/values-sw192dp-watch/dimens_percent.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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.
--->
-<resources>
-    <dimen name="screen_percentage_05">9.6dp</dimen>
-    <dimen name="screen_percentage_10">19.2dp</dimen>
-    <dimen name="screen_percentage_12">23.04dp</dimen>
-    <dimen name="screen_percentage_15">28.8dp</dimen>
-</resources>
diff --git a/res/values-sw205dp-watch/dimens_percent.xml b/res/values-sw205dp-watch/dimens_percent.xml
deleted file mode 100644
index 302d23ec..00000000
--- a/res/values-sw205dp-watch/dimens_percent.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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.
--->
-<resources>
-    <dimen name="screen_percentage_05">10.25dp</dimen>
-    <dimen name="screen_percentage_10">20.5dp</dimen>
-    <dimen name="screen_percentage_12">24.6dp</dimen>
-    <dimen name="screen_percentage_15">30.75dp</dimen>
-</resources>
diff --git a/res/values-sw225dp-watch/dimens_percent.xml b/res/values-sw225dp-watch/dimens_percent.xml
deleted file mode 100644
index 937c5d00..00000000
--- a/res/values-sw225dp-watch/dimens_percent.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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.
--->
-<resources>
-    <dimen name="screen_percentage_05">11.25dp</dimen>
-    <dimen name="screen_percentage_10">22.5dp</dimen>
-    <dimen name="screen_percentage_12">27dp</dimen>
-    <dimen name="screen_percentage_15">33.75dp</dimen>
-</resources>
diff --git a/res/values-sw228dp-watch/dimens_percent.xml b/res/values-sw228dp-watch/dimens_percent.xml
deleted file mode 100644
index b2ad3343..00000000
--- a/res/values-sw228dp-watch/dimens_percent.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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.
--->
-<resources>
-    <dimen name="screen_percentage_05">11.4dp</dimen>
-    <dimen name="screen_percentage_10">22.8dp</dimen>
-    <dimen name="screen_percentage_12">27.36dp</dimen>
-    <dimen name="screen_percentage_15">34.2dp</dimen>
-</resources>
diff --git a/res/values-sw240dp-watch/dimens_percent.xml b/res/values-sw240dp-watch/dimens_percent.xml
deleted file mode 100644
index ebc8c752..00000000
--- a/res/values-sw240dp-watch/dimens_percent.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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.
--->
-<resources>
-    <dimen name="screen_percentage_05">12dp</dimen>
-    <dimen name="screen_percentage_10">24dp</dimen>
-    <dimen name="screen_percentage_12">28.8dp</dimen>
-    <dimen name="screen_percentage_15">36dp</dimen>
-</resources>
diff --git a/res/values-w192dp-watch/dimens_percent.xml b/res/values-w192dp-watch/dimens_percent.xml
new file mode 100644
index 00000000..b5beca32
--- /dev/null
+++ b/res/values-w192dp-watch/dimens_percent.xml
@@ -0,0 +1,21 @@
+<?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.
+-->
+<resources>
+    <dimen name="screen_percentage_05">9.6dp</dimen>
+    <dimen name="screen_percentage_10">19.2dp</dimen>
+    <dimen name="screen_percentage_12">23.04dp</dimen>
+    <dimen name="screen_percentage_15">28.8dp</dimen>
+</resources>
diff --git a/res/values-w205dp-watch/dimens_percent.xml b/res/values-w205dp-watch/dimens_percent.xml
new file mode 100644
index 00000000..302d23ec
--- /dev/null
+++ b/res/values-w205dp-watch/dimens_percent.xml
@@ -0,0 +1,21 @@
+<?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.
+-->
+<resources>
+    <dimen name="screen_percentage_05">10.25dp</dimen>
+    <dimen name="screen_percentage_10">20.5dp</dimen>
+    <dimen name="screen_percentage_12">24.6dp</dimen>
+    <dimen name="screen_percentage_15">30.75dp</dimen>
+</resources>
diff --git a/res/values-w225dp-watch/dimens_percent.xml b/res/values-w225dp-watch/dimens_percent.xml
new file mode 100644
index 00000000..937c5d00
--- /dev/null
+++ b/res/values-w225dp-watch/dimens_percent.xml
@@ -0,0 +1,21 @@
+<?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.
+-->
+<resources>
+    <dimen name="screen_percentage_05">11.25dp</dimen>
+    <dimen name="screen_percentage_10">22.5dp</dimen>
+    <dimen name="screen_percentage_12">27dp</dimen>
+    <dimen name="screen_percentage_15">33.75dp</dimen>
+</resources>
diff --git a/res/values-w228dp-watch/dimens_percent.xml b/res/values-w228dp-watch/dimens_percent.xml
new file mode 100644
index 00000000..b2ad3343
--- /dev/null
+++ b/res/values-w228dp-watch/dimens_percent.xml
@@ -0,0 +1,21 @@
+<?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.
+-->
+<resources>
+    <dimen name="screen_percentage_05">11.4dp</dimen>
+    <dimen name="screen_percentage_10">22.8dp</dimen>
+    <dimen name="screen_percentage_12">27.36dp</dimen>
+    <dimen name="screen_percentage_15">34.2dp</dimen>
+</resources>
diff --git a/res/values-w240dp-watch/dimens_percent.xml b/res/values-w240dp-watch/dimens_percent.xml
new file mode 100644
index 00000000..ebc8c752
--- /dev/null
+++ b/res/values-w240dp-watch/dimens_percent.xml
@@ -0,0 +1,21 @@
+<?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.
+-->
+<resources>
+    <dimen name="screen_percentage_05">12dp</dimen>
+    <dimen name="screen_percentage_10">24dp</dimen>
+    <dimen name="screen_percentage_12">28.8dp</dimen>
+    <dimen name="screen_percentage_15">36dp</dimen>
+</resources>
-- 
cgit v1.2.3