summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2015-01-17 01:58:01 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-01-17 01:58:01 +0000
commit54cdef77dbb958a853387957c303e1b872489b00 (patch)
treec900e398cf780b67a8e25319577022d1d8b9da9c /res
parent2d264802754e78a98ab1a52c39aa4ceef75b32ae (diff)
parent71b5c0b988a64b3a0613ded5403749bc537ee8a5 (diff)
downloadandroid_packages_apps_Trebuchet-54cdef77dbb958a853387957c303e1b872489b00.tar.gz
android_packages_apps_Trebuchet-54cdef77dbb958a853387957c303e1b872489b00.tar.bz2
android_packages_apps_Trebuchet-54cdef77dbb958a853387957c303e1b872489b00.zip
Merge "Adding accessibility controls" into ub-launcher3-almonte
Diffstat (limited to 'res')
-rw-r--r--res/layout/search_drop_target_bar.xml2
-rw-r--r--res/values-sw600dp/config.xml4
-rw-r--r--res/values-sw720dp/config.xml3
-rw-r--r--res/values/config.xml14
-rw-r--r--res/values/strings.xml7
5 files changed, 11 insertions, 19 deletions
diff --git a/res/layout/search_drop_target_bar.xml b/res/layout/search_drop_target_bar.xml
index af2d01634..0d7167e5b 100644
--- a/res/layout/search_drop_target_bar.xml
+++ b/res/layout/search_drop_target_bar.xml
@@ -38,7 +38,7 @@
android:id="@+id/delete_target_text"
style="@style/DropTargetButton"
android:drawableStart="@drawable/remove_target_selector"
- android:text="@string/delete_zone_label_workspace" />
+ android:text="@string/delete_target_label" />
</FrameLayout>
<FrameLayout
diff --git a/res/values-sw600dp/config.xml b/res/values-sw600dp/config.xml
index 15d5725d1..a7345a705 100644
--- a/res/values-sw600dp/config.xml
+++ b/res/values-sw600dp/config.xml
@@ -4,8 +4,4 @@
<!-- DragController -->
<integer name="config_flingToDeleteMinVelocity">-1000</integer>
-
- <!-- Camera distance for the overscroll effect. We use a higher value here because the
- workspace screens run nearly flush to the edge of the screen-->
- <integer name="config_cameraDistance">14000</integer>
</resources>
diff --git a/res/values-sw720dp/config.xml b/res/values-sw720dp/config.xml
index c00b5943f..3d2ca8318 100644
--- a/res/values-sw720dp/config.xml
+++ b/res/values-sw720dp/config.xml
@@ -10,9 +10,6 @@
<!-- Whether or not the drop targets drop down as opposed to fade in -->
<bool name="config_useDropTargetDownTransition">false</bool>
- <!-- Camera distance for the overscroll effect -->
- <integer name="config_cameraDistance">18000</integer>
-
<!-- Hotseat -->
<bool name="hotseat_transpose_layout_with_orientation">false</bool>
</resources>
diff --git a/res/values/config.xml b/res/values/config.xml
index 96bd13bbb..cbec51216 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -36,11 +36,6 @@
<!-- Fade/zoom in/out duration & scale in the AllApps transition.
Note: This should be less than the workspaceShrinkTime as they happen together. -->
<integer name="config_appsCustomizeRevealTime">220</integer>
- <integer name="config_appsCustomizeZoomInTime">350</integer>
- <integer name="config_appsCustomizeZoomOutTime">600</integer>
- <integer name="config_appsCustomizeZoomScaleFactor">7</integer>
- <integer name="config_appsCustomizeFadeInTime">250</integer>
- <integer name="config_appsCustomizeFadeOutTime">200</integer>
<integer name="config_appsCustomizeWorkspaceShrinkTime">300</integer>
<integer name="config_appsCustomizeConcealTime">250</integer>
@@ -90,9 +85,6 @@
<integer name="config_dragFadeOutAlpha">80</integer>
<integer name="config_dragFadeOutDuration">250</integer>
- <!-- Camera distance for the overscroll effect -->
- <integer name="config_cameraDistance">8000</integer>
-
<!-- Hotseat -->
<bool name="hotseat_transpose_layout_with_orientation">true</bool>
@@ -106,4 +98,10 @@
<!-- Name of a subclass of com.android.launcher3.BuildInfo used to
get build information. Can be empty. -->
<string name="build_info_class" translatable="false"></string>
+
+<!-- Accessibility actions -->
+ <item type="id" name="action_remove" />
+ <item type="id" name="action_uninstall" />
+ <item type="id" name="action_info" />
+ <item type="id" name="action_add_to_workspace" />
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4af1f7347..8b7e6c199 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -118,9 +118,6 @@ s -->
<!-- Label for button in all applications label to go back home (to the workspace / desktop)
for accessibilty (spoken when the button gets focus). -->
<string name="all_apps_home_button_label">Home</string>
- <!-- Label for trash icon on workspace. Meant to communicate the idea of removing the
- icon/widget from the home screen, but not permanently. [CHAR_LIMIT=30] -->
- <string name="delete_zone_label_workspace">Remove</string>
<!-- Label for trash icon in All Apps. The icon/widget will become completely unavailable on the
device. [CHAR_LIMIT=30]-->
<string name="delete_zone_label_all_apps">Uninstall</string>
@@ -304,4 +301,8 @@ s -->
<string name="abandoned_promise_explanation">The app for this icon isn\'t installed.
You can remove it, or search for the app and install it manually.
</string>
+
+<!-- Strings for accessibility actions -->
+ <!-- Accessibility action to add an app to workspace. [CHAR_LIMIT=30] -->
+ <string name="action_add_to_workspace">Add To Workspace</string>
</resources>