From e804cb56d02cc31b917e755670f08cb4ec60cf80 Mon Sep 17 00:00:00 2001
From: John Spurlock <jspurlock@google.com>
Date: Fri, 14 Jun 2013 13:59:31 -0400
Subject: Stabilize hideybar confirmation toast.

Remove gravity workaround no longer needed after recent window
manager layout fix.

Also migrate instable code-based toast text calculation to use
the resource system properly.

Change-Id: Ifa380e387389ed9917336ad19dfde49f67a5fb10
---
 packages/SystemUI/res/values-land/refs.xml         | 20 ++++++++++++++++++++
 packages/SystemUI/res/values-sw600dp-port/refs.xml | 20 ++++++++++++++++++++
 packages/SystemUI/res/values/strings.xml           | 11 ++++-------
 3 files changed, 44 insertions(+), 7 deletions(-)
 create mode 100644 packages/SystemUI/res/values-land/refs.xml
 create mode 100644 packages/SystemUI/res/values-sw600dp-port/refs.xml

(limited to 'packages/SystemUI/res')

diff --git a/packages/SystemUI/res/values-land/refs.xml b/packages/SystemUI/res/values-land/refs.xml
new file mode 100644
index 0000000..f5e79b9
--- /dev/null
+++ b/packages/SystemUI/res/values-land/refs.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ * Copyright (c) 2013, 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>
+    <item type="string" name="hideybar_confirmation_message">@string/hideybar_confirmation_message_long</item>
+</resources>
diff --git a/packages/SystemUI/res/values-sw600dp-port/refs.xml b/packages/SystemUI/res/values-sw600dp-port/refs.xml
new file mode 100644
index 0000000..f5e79b9
--- /dev/null
+++ b/packages/SystemUI/res/values-sw600dp-port/refs.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ * Copyright (c) 2013, 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>
+    <item type="string" name="hideybar_confirmation_message">@string/hideybar_confirmation_message_long</item>
+</resources>
diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml
index 9498fe4..a462465 100644
--- a/packages/SystemUI/res/values/strings.xml
+++ b/packages/SystemUI/res/values/strings.xml
@@ -517,12 +517,9 @@
     <!-- Body of help text shown when the notification panel is pulled down for the very first time. [CHAR LIMIT=NONE] -->
     <string name="status_bar_help_text">Access them anytime by swiping down.\nSwipe down again for system controls.</string>
 
-    <!-- Toast bar message when hiding the navigation bar on bottom -->
-    <string name="hideybar_confirmation_message_bottom">Swipe up from bottom of screen to reveal system bar</string>
+    <!-- Toast bar message when hiding the navigation bar -->
+    <string name="hideybar_confirmation_message">Swipe edge of screen to reveal bar</string>
 
-    <!-- Shorter version of toast bar message when hiding the navigation bar on bottom -->
-    <string name="hideybar_confirmation_message_bottom_short">Swipe bottom of screen to reveal bar</string>
-
-    <!-- Toast bar message when hiding the navigation bar on right -->
-    <string name="hideybar_confirmation_message_right">Swipe from right of screen to reveal system bar</string>
+    <!-- Longer version of toast bar message when hiding the navigation bar (if room) -->
+    <string name="hideybar_confirmation_message_long">Swipe from edge of screen to reveal system bar</string>
 </resources>
-- 
cgit v1.1