Automated import from //branches/donutburger/...@141363,141363
David Brown [Wed, 25 Mar 2009 03:08:08 +0000 (20:08 -0700)]
13 files changed:
res/drawable-finger/tray_handle_normal.9.png [deleted file]
res/drawable-finger/tray_handle_pressed.9.png [deleted file]
res/drawable-finger/tray_handle_selected.9.png [deleted file]
res/drawable-finger/tray_handle_strip.xml [copied from res/drawable-finger/tray_handle.xml with 77% similarity]
res/drawable-finger/tray_handle_strip_normal.9.png [new file with mode: 0644]
res/drawable-finger/tray_handle_strip_pressed.9.png [new file with mode: 0644]
res/drawable-finger/tray_handle_strip_selected.9.png [new file with mode: 0644]
res/drawable-finger/tray_handle_tab.xml [moved from res/drawable-finger/tray_handle.xml with 78% similarity]
res/drawable-finger/tray_handle_tab_normal.9.png [new file with mode: 0644]
res/drawable-finger/tray_handle_tab_pressed.9.png [new file with mode: 0644]
res/drawable-finger/tray_handle_tab_selected.9.png [new file with mode: 0644]
res/layout-finger/dtmf_twelve_key_dialer.xml
res/values/strings.xml

diff --git a/res/drawable-finger/tray_handle_normal.9.png b/res/drawable-finger/tray_handle_normal.9.png
deleted file mode 100644 (file)
index 0987580..0000000
Binary files a/res/drawable-finger/tray_handle_normal.9.png and /dev/null differ
diff --git a/res/drawable-finger/tray_handle_pressed.9.png b/res/drawable-finger/tray_handle_pressed.9.png
deleted file mode 100644 (file)
index db7f633..0000000
Binary files a/res/drawable-finger/tray_handle_pressed.9.png and /dev/null differ
diff --git a/res/drawable-finger/tray_handle_selected.9.png b/res/drawable-finger/tray_handle_selected.9.png
deleted file mode 100644 (file)
index e47e466..0000000
Binary files a/res/drawable-finger/tray_handle_selected.9.png and /dev/null differ
similarity index 77%
copy from res/drawable-finger/tray_handle.xml
copy to res/drawable-finger/tray_handle_strip.xml
index b184a56..faf20d4 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
+<!-- Copyright (C) 2009 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.
@@ -15,9 +15,9 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_window_focused="false" android:state_enabled="true" android:drawable="@drawable/tray_handle_normal" />
-    <item android:state_pressed="true" android:drawable="@drawable/tray_handle_pressed" />
-    <item android:state_focused="true" android:state_enabled="true" android:drawable="@drawable/tray_handle_selected" />
-    <item android:state_enabled="true" android:drawable="@drawable/tray_handle_normal" />
-    <item android:state_focused="true" android:drawable="@drawable/tray_handle_selected" />
+    <item android:state_window_focused="false" android:state_enabled="true" android:drawable="@drawable/tray_handle_strip_normal" />
+    <item android:state_pressed="true" android:drawable="@drawable/tray_handle_strip_pressed" />
+    <item android:state_focused="true" android:state_enabled="true" android:drawable="@drawable/tray_handle_strip_selected" />
+    <item android:state_enabled="true" android:drawable="@drawable/tray_handle_strip_normal" />
+    <item android:state_focused="true" android:drawable="@drawable/tray_handle_strip_selected" />
 </selector>
diff --git a/res/drawable-finger/tray_handle_strip_normal.9.png b/res/drawable-finger/tray_handle_strip_normal.9.png
new file mode 100644 (file)
index 0000000..dde0f1e
Binary files /dev/null and b/res/drawable-finger/tray_handle_strip_normal.9.png differ
diff --git a/res/drawable-finger/tray_handle_strip_pressed.9.png b/res/drawable-finger/tray_handle_strip_pressed.9.png
new file mode 100644 (file)
index 0000000..9ba4302
Binary files /dev/null and b/res/drawable-finger/tray_handle_strip_pressed.9.png differ
diff --git a/res/drawable-finger/tray_handle_strip_selected.9.png b/res/drawable-finger/tray_handle_strip_selected.9.png
new file mode 100644 (file)
index 0000000..6a46931
Binary files /dev/null and b/res/drawable-finger/tray_handle_strip_selected.9.png differ
similarity index 78%
rename from res/drawable-finger/tray_handle.xml
rename to res/drawable-finger/tray_handle_tab.xml
index b184a56..d8314ff 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
+<!-- Copyright (C) 2009 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.
@@ -15,9 +15,9 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_window_focused="false" android:state_enabled="true" android:drawable="@drawable/tray_handle_normal" />
-    <item android:state_pressed="true" android:drawable="@drawable/tray_handle_pressed" />
-    <item android:state_focused="true" android:state_enabled="true" android:drawable="@drawable/tray_handle_selected" />
-    <item android:state_enabled="true" android:drawable="@drawable/tray_handle_normal" />
-    <item android:state_focused="true" android:drawable="@drawable/tray_handle_selected" />
+    <item android:state_window_focused="false" android:state_enabled="true" android:drawable="@drawable/tray_handle_tab_normal" />
+    <item android:state_pressed="true" android:drawable="@drawable/tray_handle_tab_pressed" />
+    <item android:state_focused="true" android:state_enabled="true" android:drawable="@drawable/tray_handle_tab_selected" />
+    <item android:state_enabled="true" android:drawable="@drawable/tray_handle_tab_normal" />
+    <item android:state_focused="true" android:drawable="@drawable/tray_handle_tab_selected" />
 </selector>
diff --git a/res/drawable-finger/tray_handle_tab_normal.9.png b/res/drawable-finger/tray_handle_tab_normal.9.png
new file mode 100644 (file)
index 0000000..bc00120
Binary files /dev/null and b/res/drawable-finger/tray_handle_tab_normal.9.png differ
diff --git a/res/drawable-finger/tray_handle_tab_pressed.9.png b/res/drawable-finger/tray_handle_tab_pressed.9.png
new file mode 100644 (file)
index 0000000..9fab484
Binary files /dev/null and b/res/drawable-finger/tray_handle_tab_pressed.9.png differ
diff --git a/res/drawable-finger/tray_handle_tab_selected.9.png b/res/drawable-finger/tray_handle_tab_selected.9.png
new file mode 100644 (file)
index 0000000..6df753f
Binary files /dev/null and b/res/drawable-finger/tray_handle_tab_selected.9.png differ
index ec309f7..5b5fdbc 100644 (file)
     android:allowSingleTap="false"
     >
 
-    <!-- drawer handle imagebutton -->
-    <ImageButton
+    <!-- Drawer handle -->
+    <LinearLayout
         android:id="@id/dialer_tab"
+        android:orientation="horizontal"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:src="@drawable/ic_dialpad_tray"
-        android:background="@drawable/tray_handle"/>
+        android:gravity="bottom"
+        android:focusable="true"
+        >
+        <ImageView
+            android:layout_width="1dip"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:scaleType="fitXY"
+            android:duplicateParentState="true"
+            android:src="@drawable/tray_handle_strip"
+            />
+        <Button
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/dtmfDialpadHandleLabel"
+            android:singleLine="true"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textStyle="bold"
+            android:shadowDy="1"
+            android:shadowRadius="0.9"
+            android:shadowColor="#ffffffff"
+            android:duplicateParentState="true"
+            android:background="@drawable/tray_handle_tab"/>
+        <ImageView
+            android:layout_width="1dip"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:scaleType="fitXY"
+            android:src="@drawable/tray_handle_strip"
+            android:duplicateParentState="true"
+            />
+    </LinearLayout>
 
     <!-- drawer content dialer view -->
     <com.android.phone.DTMFTwelveKeyDialerView
@@ -64,7 +95,6 @@
             android:background="@drawable/btn_dial_textfield_normal_full"
             android:textColor="@color/dtmf_dialer_display_text"
             android:focusableInTouchMode="false"
-            android:hint="@string/dtmfDialpadHintText"
             android:clickable="false"/>
 
         <!-- Keypad section -->
index e31b82e..6b87678 100644 (file)
          dialpad is there to generate tones, not to add a new call.) -->
     <string name="dtmfDialpadHintText">Touch tone keypad</string>
 
+    <!-- Text displayed in the "sliding drawer handle" that you use to
+         open the in-call DTMF dialpad. -->
+    <string name="dtmfDialpadHandleLabel">Dialpad</string>
+
     <!-- Text displayed on the in-call screen's "touch lock" overlay,
          instructing the user that they need to double-tap to unlock the
          screen. -->