summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrint E. Kriebel <bekit@cyngn.com>2014-11-04 02:33:49 (GMT)
committerBrint E. Kriebel <bekit@cyngn.com>2014-11-04 02:33:49 (GMT)
commit6fbf5b61db891070a3feee8ba7069b573384d3e0 (patch)
treed21d71eb530fe25a28e85e9272f87f0b5daae692
parent4e90e2adf167eaa7bfba5d609ed5524832f09f79 (diff)
parent956a856a47d2faefa0101d1fae7b6ab0967234ea (diff)
downloadandroid_packages_apps_Trebuchet-6fbf5b61db891070a3feee8ba7069b573384d3e0.zip
android_packages_apps_Trebuchet-6fbf5b61db891070a3feee8ba7069b573384d3e0.tar.gz
android_packages_apps_Trebuchet-6fbf5b61db891070a3feee8ba7069b573384d3e0.tar.bz2
Merge branch 'cm-11.0' into stable/cm-11.0
-rw-r--r--res/drawable-hdpi/action_navigation_previous_light.pngbin627 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_navigation_next.pngbin0 -> 625 bytes
-rw-r--r--res/drawable-hdpi/ic_navigation_prev.pngbin0 -> 637 bytes
-rw-r--r--res/drawable-mdpi/action_navigation_previous_light.pngbin409 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_navigation_next.pngbin0 -> 386 bytes
-rw-r--r--res/drawable-mdpi/ic_navigation_prev.pngbin0 -> 408 bytes
-rw-r--r--res/drawable-xhdpi/action_navigation_previous_light.pngbin810 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_navigation_next.pngbin0 -> 801 bytes
-rw-r--r--res/drawable-xhdpi/ic_navigation_prev.pngbin0 -> 870 bytes
-rw-r--r--res/drawable-xxhdpi/action_navigation_previous_light.pngbin1327 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/ic_navigation_next.pngbin0 -> 1350 bytes
-rw-r--r--res/drawable-xxhdpi/ic_navigation_prev.pngbin0 -> 1360 bytes
-rw-r--r--res/layout/dynamic_grid_size_screen.xml3
-rw-r--r--res/layout/settings_pane_list_item.xml27
-rw-r--r--res/layout/settings_transitions_screen.xml29
-rw-r--r--res/values-az/cm_arrays.xml26
-rw-r--r--res/values-az/cm_strings.xml30
-rw-r--r--res/values-ca/cm_strings.xml2
-rw-r--r--res/values-lb/cm_arrays.xml14
-rw-r--r--res/values-lb/cm_strings.xml9
-rw-r--r--res/values-lv/cm_arrays.xml35
-rw-r--r--res/values-lv/cm_strings.xml52
-rw-r--r--res/values-tr/cm_strings.xml4
-rw-r--r--res/values-zh-rHK/cm_strings.xml1
-rw-r--r--res/values-zh-rTW/cm_arrays.xml2
-rw-r--r--res/values-zh-rTW/cm_strings.xml8
-rw-r--r--src/com/android/launcher3/DynamicGridSizeFragment.java25
-rw-r--r--src/com/android/launcher3/GelIntegrationHelper.java11
-rw-r--r--src/com/android/launcher3/Launcher.java33
-rw-r--r--src/com/android/launcher3/OverviewSettingsPanel.java1
-rw-r--r--src/com/android/launcher3/TransitionEffectsFragment.java23
-rw-r--r--src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java15
32 files changed, 274 insertions, 76 deletions
diff --git a/res/drawable-hdpi/action_navigation_previous_light.png b/res/drawable-hdpi/action_navigation_previous_light.png
deleted file mode 100644
index 874466f..0000000
--- a/res/drawable-hdpi/action_navigation_previous_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_navigation_next.png b/res/drawable-hdpi/ic_navigation_next.png
new file mode 100644
index 0000000..fb3e40b
--- /dev/null
+++ b/res/drawable-hdpi/ic_navigation_next.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_navigation_prev.png b/res/drawable-hdpi/ic_navigation_prev.png
new file mode 100644
index 0000000..2e08702
--- /dev/null
+++ b/res/drawable-hdpi/ic_navigation_prev.png
Binary files differ
diff --git a/res/drawable-mdpi/action_navigation_previous_light.png b/res/drawable-mdpi/action_navigation_previous_light.png
deleted file mode 100644
index f50c8f2..0000000
--- a/res/drawable-mdpi/action_navigation_previous_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_navigation_next.png b/res/drawable-mdpi/ic_navigation_next.png
new file mode 100644
index 0000000..c86cf60
--- /dev/null
+++ b/res/drawable-mdpi/ic_navigation_next.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_navigation_prev.png b/res/drawable-mdpi/ic_navigation_prev.png
new file mode 100644
index 0000000..080e723
--- /dev/null
+++ b/res/drawable-mdpi/ic_navigation_prev.png
Binary files differ
diff --git a/res/drawable-xhdpi/action_navigation_previous_light.png b/res/drawable-xhdpi/action_navigation_previous_light.png
deleted file mode 100644
index 22bd163..0000000
--- a/res/drawable-xhdpi/action_navigation_previous_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_navigation_next.png b/res/drawable-xhdpi/ic_navigation_next.png
new file mode 100644
index 0000000..11c943d
--- /dev/null
+++ b/res/drawable-xhdpi/ic_navigation_next.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_navigation_prev.png b/res/drawable-xhdpi/ic_navigation_prev.png
new file mode 100644
index 0000000..b817dbb
--- /dev/null
+++ b/res/drawable-xhdpi/ic_navigation_prev.png
Binary files differ
diff --git a/res/drawable-xxhdpi/action_navigation_previous_light.png b/res/drawable-xxhdpi/action_navigation_previous_light.png
deleted file mode 100644
index ca3d00c..0000000
--- a/res/drawable-xxhdpi/action_navigation_previous_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_navigation_next.png b/res/drawable-xxhdpi/ic_navigation_next.png
new file mode 100644
index 0000000..3259520
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_navigation_next.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_navigation_prev.png b/res/drawable-xxhdpi/ic_navigation_prev.png
new file mode 100644
index 0000000..1e763d3
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_navigation_prev.png
Binary files differ
diff --git a/res/layout/dynamic_grid_size_screen.xml b/res/layout/dynamic_grid_size_screen.xml
index f7cafaf..dcf399f 100644
--- a/res/layout/dynamic_grid_size_screen.xml
+++ b/res/layout/dynamic_grid_size_screen.xml
@@ -17,11 +17,12 @@
android:clickable="true" >
<ImageView
+ android:id="@+id/nav_prev"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:adjustViewBounds="true"
- android:src="@drawable/action_navigation_previous_light" />
+ android:src="@drawable/ic_navigation_prev" />
<TextView
android:layout_width="wrap_content"
diff --git a/res/layout/settings_pane_list_item.xml b/res/layout/settings_pane_list_item.xml
index 0053f4c..75a6b32 100644
--- a/res/layout/settings_pane_list_item.xml
+++ b/res/layout/settings_pane_list_item.xml
@@ -3,42 +3,35 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal|bottom"
android:background="@drawable/listitem_bg"
- android:paddingLeft="@dimen/overview_panel_list_padding"
- android:paddingRight="@dimen/overview_panel_list_padding"
+ android:paddingStart="@dimen/overview_panel_list_padding"
+ android:paddingEnd="@dimen/overview_panel_list_padding"
+ android:paddingBottom="@dimen/overview_panel_list_padding"
+ android:paddingTop="@dimen/overview_panel_list_padding"
android:orientation="horizontal" >
<TextView
- android:id="@+id/item_name"
+ android:id="@+id/item_state"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawablePadding="4dp"
android:fontFamily="sans-serif-condensed"
- android:gravity="left"
- android:paddingBottom="@dimen/overview_panel_list_padding"
- android:paddingTop="@dimen/overview_panel_list_padding"
android:textSize="20sp"
+ android:textAllCaps="true"
android:textColor="@color/listitem_text"
- android:layout_alignParentLeft="true"
- android:scrollHorizontally="true"
+ android:layout_alignParentEnd="true"
android:ellipsize="end"
android:maxLines="1"/>
<TextView
- android:id="@+id/item_state"
+ android:id="@+id/item_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawablePadding="4dp"
android:fontFamily="sans-serif-condensed"
- android:gravity="right"
- android:paddingBottom="@dimen/overview_panel_list_padding"
- android:paddingTop="@dimen/overview_panel_list_padding"
android:textSize="20sp"
- android:textAllCaps="true"
android:textColor="@color/listitem_text"
- android:layout_alignParentRight="true"
- android:layout_toRightOf="@id/item_name"
- android:scrollHorizontally="true"
+ android:layout_toStartOf="@id/item_state"
+ android:layout_alignParentStart="true"
android:ellipsize="end"
android:maxLines="1"/>
-
</RelativeLayout> \ No newline at end of file
diff --git a/res/layout/settings_transitions_screen.xml b/res/layout/settings_transitions_screen.xml
index dd47636..fca36a8 100644
--- a/res/layout/settings_transitions_screen.xml
+++ b/res/layout/settings_transitions_screen.xml
@@ -17,15 +17,16 @@
android:layout_height="wrap_content"
android:orientation="horizontal"
android:background="@drawable/listitem_bg"
- android:layout_alignParentLeft="true"
+ android:layout_alignParentStart="true"
android:clickable="true" >
<ImageView
+ android:id="@+id/nav_prev"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:adjustViewBounds="true"
- android:src="@drawable/action_navigation_previous_light" />
+ android:src="@drawable/ic_navigation_prev" />
<TextView
android:id="@+id/transition_effect_title"
@@ -38,22 +39,16 @@
android:textSize="16sp" />
</LinearLayout>
- <LinearLayout
+ <ImageView
+ android:id="@+id/transition_options_menu"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:layout_alignParentRight="true"
- android:background="@drawable/listitem_bg"
- android:clickable="true" >
-
- <ImageView
- android:id="@+id/transition_options_menu"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="right"
- android:adjustViewBounds="true"
- android:src="@drawable/overflow_options_menu" />
- </LinearLayout>
+ android:layout_gravity="right"
+ android:paddingStart="10dip"
+ android:paddingEnd="10dip"
+ android:adjustViewBounds="true"
+ android:layout_alignParentEnd="true"
+ android:src="@drawable/overflow_options_menu" />
</RelativeLayout>
<ImageView
@@ -70,4 +65,4 @@
android:layout_height="wrap_content"
android:listSelector="@android:color/transparent"
android:splitMotionEvents="false"/>
-</LinearLayout> \ No newline at end of file
+</LinearLayout>
diff --git a/res/values-az/cm_arrays.xml b/res/values-az/cm_arrays.xml
index 092fa7e..0e0df59 100644
--- a/res/values-az/cm_arrays.xml
+++ b/res/values-az/cm_arrays.xml
@@ -18,18 +18,18 @@
<resources>
<string-array name="transition_effect_entries">
<item>Heç bir</item>
- <item>Zoom in</item>
- <item>Zoom out</item>
- <item>Rotate up</item>
- <item>Rotate down</item>
- <item>Cube in</item>
- <item>Cube out</item>
- <item>Stack</item>
- <item>Accordion</item>
- <item>Flip</item>
- <item>Cylinder in</item>
- <item>Cylinder out</item>
- <item>Carousel</item>
- <item>Overview</item>
+ <item>Yaxınlaşdır</item>
+ <item>Uzaqlaşdır</item>
+ <item>Yuxarı döndər</item>
+ <item>Aşağı döndər</item>
+ <item>Kub daxili</item>
+ <item>Kub xarici</item>
+ <item>Yığın</item>
+ <item>Akkordion</item>
+ <item>Çevir</item>
+ <item>Silindir daxili</item>
+ <item>Silindir xarici</item>
+ <item>Karusel</item>
+ <item>İcmal</item>
</string-array>
</resources>
diff --git a/res/values-az/cm_strings.xml b/res/values-az/cm_strings.xml
new file mode 100644
index 0000000..3ff201d
--- /dev/null
+++ b/res/values-az/cm_strings.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+ Copyright (C) 2014 The CyanogenMod 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>
+ <string name="home_screen_settings">ƏSAS EKRAN TƏNZİMLƏMƏLƏRİ</string>
+ <string name="drawer_settings">TƏTBİQETMƏ MENYUSU</string>
+ <string name="app_settings">TƏTBİQETMƏ TƏNZİMLƏMƏLƏRİ</string>
+ <string name="setting_state_on">AÇIQ</string>
+ <string name="setting_state_off">BAĞLI</string>
+ <string name="search_panel_gel">Google Now</string>
+ <string name="search_panel_custom_home">CM Home</string>
+ <string name="themes_button_text">Temalar</string>
+ <string name="scrolling_page_outlines">Səhifə sərhədi</string>
+ <string name="scrolling_fade_adjacent">Yan səhifələri soldur</string>
+ <string name="scrolling_wallpaper">Divar kağızını sürüşdür</string>
+</resources>
diff --git a/res/values-ca/cm_strings.xml b/res/values-ca/cm_strings.xml
index a8c6a35..3a0d0bc 100644
--- a/res/values-ca/cm_strings.xml
+++ b/res/values-ca/cm_strings.xml
@@ -22,7 +22,7 @@
<string name="setting_state_on">SÍ</string>
<string name="setting_state_off">NO</string>
<string name="search_panel_gel">Google Now</string>
- <string name="search_panel_custom_home">Inici CM</string>
+ <string name="search_panel_custom_home">CM Home</string>
<string name="themes_button_text">Temes</string>
<string name="scrolling_page_outlines">Vores de la pàgina</string>
<string name="scrolling_fade_adjacent">Esvaeix els costats de les pàgines</string>
diff --git a/res/values-lb/cm_arrays.xml b/res/values-lb/cm_arrays.xml
index 9a406f7..a6db728 100644
--- a/res/values-lb/cm_arrays.xml
+++ b/res/values-lb/cm_arrays.xml
@@ -18,17 +18,17 @@
<resources>
<string-array name="transition_effect_entries">
<item>Keen</item>
- <item>Zoom in</item>
- <item>Zoom out</item>
- <item>Rotate up</item>
+ <item>Erazoomen</item>
+ <item>Erauszoomen</item>
+ <item>Eroprotéieren</item>
<item>Rotate down</item>
- <item>Cube in</item>
- <item>Cube out</item>
+ <item>Cube eran</item>
+ <item>Cube eraus</item>
<item>Koup</item>
<item>Akkordeon</item>
<item>Ëmdréinen</item>
- <item>Cylinder in</item>
- <item>Cylinder out</item>
+ <item>Zylinder eran</item>
+ <item>Zylinder eraus</item>
<item>Karussell</item>
<item>Iwwersiicht</item>
</string-array>
diff --git a/res/values-lb/cm_strings.xml b/res/values-lb/cm_strings.xml
index bf9dd21..8cbc370 100644
--- a/res/values-lb/cm_strings.xml
+++ b/res/values-lb/cm_strings.xml
@@ -16,11 +16,20 @@
limitations under the License.
-->
<resources>
+ <string name="app_settings">APP-ASTELLUNGEN</string>
<string name="setting_state_on">UN</string>
<string name="setting_state_off">AUS</string>
+ <string name="search_panel_gel">Google Now</string>
+ <string name="search_panel_custom_home">CM Home</string>
+ <string name="themes_button_text">Designen</string>
<string name="scrolling_page_outlines">Säiterummen</string>
<string name="scrolling_fade_adjacent">Säiten um Rand ausblenden</string>
+ <string name="scrolling_wallpaper">Hannergrondbild scrollen</string>
+ <string name="grid_size_text">Gittergréisst</string>
<string name="sort_mode_title">Titel</string>
<string name="sort_mode_launch_count">Startunzuel</string>
<string name="sort_mode_install_time">Installatiounszäit</string>
+ <string name="home_screen_search_text">Sichkëscht</string>
+ <string name="icon_labels_hide">Verstoppen</string>
+ <string name="dialog_confirm">Bestätegen</string>
</resources>
diff --git a/res/values-lv/cm_arrays.xml b/res/values-lv/cm_arrays.xml
new file mode 100644
index 0000000..5c26e73
--- /dev/null
+++ b/res/values-lv/cm_arrays.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+ Copyright (C) 2014 The CyanogenMod 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>
+ <string-array name="transition_effect_entries">
+ <item>Neviens</item>
+ <item>Tuvināt</item>
+ <item>Tālināt</item>
+ <item>Pagriezt uz augšu</item>
+ <item>Pagriezt uz leju</item>
+ <item>Kubs uz iekšu</item>
+ <item>Kubs uz āru</item>
+ <item>Kaudzē</item>
+ <item>Akordeons</item>
+ <item>Apmest</item>
+ <item>Cilindrs uz iekšu</item>
+ <item>Cilindrs uz āru</item>
+ <item>Karuselis</item>
+ <item>Pārskats</item>
+ </string-array>
+</resources>
diff --git a/res/values-lv/cm_strings.xml b/res/values-lv/cm_strings.xml
new file mode 100644
index 0000000..24ab36b
--- /dev/null
+++ b/res/values-lv/cm_strings.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+ Copyright (C) 2014 The CyanogenMod 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>
+ <string name="home_screen_settings">MĀJAS EKRĀNA IESTATĪJUMI</string>
+ <string name="drawer_settings">ATVILKTNES IESTATĪJUMI</string>
+ <string name="app_settings">LIETOTŅU IESTATĪJUMI</string>
+ <string name="setting_state_on">IESLĒGTS</string>
+ <string name="setting_state_off">IZSLĒGTS</string>
+ <string name="search_panel_gel">Google Now</string>
+ <string name="search_panel_custom_home">CM mājas</string>
+ <string name="themes_button_text">Tēmas</string>
+ <string name="scrolling_page_outlines">Lapas struktūra</string>
+ <string name="scrolling_fade_adjacent">Izbalināt malējās lapas</string>
+ <string name="scrolling_wallpaper">Pārtīt tapeti</string>
+ <string name="grid_size_text">Režģa izmērs</string>
+ <string name="grid_size_comfortable">Ērts</string>
+ <string name="grid_size_cozy">Mājīgs</string>
+ <string name="grid_size_condensed">Saīspiests</string>
+ <string name="grid_size_custom">Pielāgots</string>
+ <string name="grid_size_custom_and_size">Pielāgots (%1$s)</string>
+ <string name="preferences_interface_homescreen_custom">Izvēlieties pielāgotu izmēru</string>
+ <string name="scroll_effect_text">Ritināšanas efekts</string>
+ <string name="drawer_sorting_text">Kārtošanas režīms</string>
+ <string name="sort_mode_title">Nosaukums</string>
+ <string name="sort_mode_launch_count">Palaišanas reizes</string>
+ <string name="sort_mode_install_time">Uzstādīšanas laiks</string>
+ <string name="home_screen_search_text">Meklēšanas josla</string>
+ <string name="larger_icons_text">Lielākas ikonas</string>
+ <string name="icon_labels">Ikonas etiķete</string>
+ <string name="icon_labels_show">Rādīt</string>
+ <string name="icon_labels_hide">Slēpt</string>
+ <string name="protected_app_settings">Aizsargātās lietotnes</string>
+ <string name="search_screen_left_text">Meklēšanas panelis</string>
+ <string name="dialog_confirm">Apstiprināt</string>
+ <string name="permission_label_read_extension_data">pieprasīt DashClock paplašinājuma datus</string>
+ <string name="permission_desc_read_extension_data">Ļauj lietotnei pieprasīt DashClock paplašinājuma datus</string>
+</resources>
diff --git a/res/values-tr/cm_strings.xml b/res/values-tr/cm_strings.xml
index fe693f1..016dd2f 100644
--- a/res/values-tr/cm_strings.xml
+++ b/res/values-tr/cm_strings.xml
@@ -28,9 +28,9 @@
<string name="scrolling_fade_adjacent">Yan sayfaları soldur</string>
<string name="scrolling_wallpaper">Duvarkağıdını kaydır</string>
<string name="grid_size_text">Izgara boyutu</string>
- <string name="grid_size_comfortable">Rahat</string>
+ <string name="grid_size_comfortable">Seyrek</string>
<string name="grid_size_cozy">Rahat</string>
- <string name="grid_size_condensed">Kalın</string>
+ <string name="grid_size_condensed">Yoğun</string>
<string name="grid_size_custom">Özel</string>
<string name="grid_size_custom_and_size">Özel (%1$s)</string>
<string name="preferences_interface_homescreen_custom">Özel boyut seçin</string>
diff --git a/res/values-zh-rHK/cm_strings.xml b/res/values-zh-rHK/cm_strings.xml
index 815b005..7220e26 100644
--- a/res/values-zh-rHK/cm_strings.xml
+++ b/res/values-zh-rHK/cm_strings.xml
@@ -23,6 +23,7 @@
<string name="themes_button_text">主題</string>
<string name="scrolling_page_outlines">頁面輪廓</string>
<string name="scrolling_fade_adjacent">邊頁淡出</string>
+ <string name="scrolling_wallpaper">捲動桌布</string>
<string name="scroll_effect_text">滾動效果</string>
<string name="drawer_sorting_text">排序模式</string>
<string name="sort_mode_title">標題</string>
diff --git a/res/values-zh-rTW/cm_arrays.xml b/res/values-zh-rTW/cm_arrays.xml
index d067ade..ac43d3f 100644
--- a/res/values-zh-rTW/cm_arrays.xml
+++ b/res/values-zh-rTW/cm_arrays.xml
@@ -29,7 +29,7 @@
<item>Flip</item>
<item>Cylinder in</item>
<item>Cylinder out</item>
- <item>Carousel</item>
+ <item>幻燈片</item>
<item>概述</item>
</string-array>
</resources>
diff --git a/res/values-zh-rTW/cm_strings.xml b/res/values-zh-rTW/cm_strings.xml
index e3cb73c..0bf6e1b 100644
--- a/res/values-zh-rTW/cm_strings.xml
+++ b/res/values-zh-rTW/cm_strings.xml
@@ -16,11 +16,16 @@
limitations under the License.
-->
<resources>
+ <string name="home_screen_settings">主螢幕設定</string>
+ <string name="drawer_settings">抽屜設定</string>
<string name="setting_state_on">開啟</string>
<string name="setting_state_off">關閉</string>
+ <string name="search_panel_gel">Google 即時資訊</string>
<string name="themes_button_text">主題</string>
<string name="scrolling_fade_adjacent">邊頁淡出</string>
<string name="scrolling_wallpaper">滾動桌面</string>
+ <string name="grid_size_condensed">密集</string>
+ <string name="grid_size_custom">自訂</string>
<string name="scroll_effect_text">滾動效果</string>
<string name="drawer_sorting_text">排序模式</string>
<string name="sort_mode_title">標題</string>
@@ -31,4 +36,7 @@
<string name="icon_labels">程式名稱</string>
<string name="icon_labels_show">顯示</string>
<string name="icon_labels_hide">隱藏</string>
+ <string name="protected_app_settings">受保護的應用程式</string>
+ <string name="search_screen_left_text">搜尋面板</string>
+ <string name="dialog_confirm">確認</string>
</resources>
diff --git a/src/com/android/launcher3/DynamicGridSizeFragment.java b/src/com/android/launcher3/DynamicGridSizeFragment.java
index 69720a5..74e47ea 100644
--- a/src/com/android/launcher3/DynamicGridSizeFragment.java
+++ b/src/com/android/launcher3/DynamicGridSizeFragment.java
@@ -23,14 +23,15 @@ import android.app.Dialog;
import android.app.Fragment;
import android.content.Context;
import android.content.DialogInterface;
+import android.content.res.Configuration;
import android.content.res.Resources;
-import android.graphics.Bitmap;
import android.graphics.Canvas;
import android.graphics.Color;
import android.graphics.Paint;
import android.os.Bundle;
import android.util.AttributeSet;
import android.util.DisplayMetrics;
+import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -42,7 +43,6 @@ import android.widget.LinearLayout;
import android.widget.ListView;
import android.widget.NumberPicker;
import android.widget.TextView;
-
import com.android.launcher3.settings.SettingsProvider;
public class DynamicGridSizeFragment extends Fragment
@@ -122,6 +122,13 @@ public class DynamicGridSizeFragment extends Fragment
R.layout.settings_pane_list_item, values);
mListView.setAdapter(mAdapter);
+ // RTL
+ ImageView navPrev = (ImageView) v.findViewById(R.id.nav_prev);
+ Configuration config = getResources().getConfiguration();
+ if (config.getLayoutDirection() == View.LAYOUT_DIRECTION_RTL) {
+ navPrev.setImageResource(R.drawable.ic_navigation_next);
+ }
+
return v;
}
@@ -141,7 +148,13 @@ public class DynamicGridSizeFragment extends Fragment
DisplayMetrics displaymetrics = new DisplayMetrics();
getActivity().getWindowManager().getDefaultDisplay().getMetrics(displaymetrics);
int width = displaymetrics.widthPixels;
- final ObjectAnimator anim = ObjectAnimator.ofFloat(this, "translationX", width, 0);
+ Configuration config = getResources().getConfiguration();
+ final ObjectAnimator anim;
+ if (config.getLayoutDirection() == View.LAYOUT_DIRECTION_RTL) {
+ anim = ObjectAnimator.ofFloat(this, "translationX", -width, 0);
+ } else {
+ anim = ObjectAnimator.ofFloat(this, "translationX", width, 0);
+ }
final View darkPanel = ((Launcher) getActivity()).getDarkPanel();
darkPanel.setVisibility(View.VISIBLE);
@@ -276,6 +289,12 @@ public class DynamicGridSizeFragment extends Fragment
TextView textView = (TextView) convertView.findViewById(R.id.item_name);
textView.setText(mTitles[position]);
+ // RTL
+ Configuration config = getResources().getConfiguration();
+ if (config.getLayoutDirection() == View.LAYOUT_DIRECTION_RTL) {
+ textView.setGravity(Gravity.RIGHT);
+ }
+
// Set selected state
if (position == mCurrentSize.getValue()) {
if (mCurrentSelection != null) {
diff --git a/src/com/android/launcher3/GelIntegrationHelper.java b/src/com/android/launcher3/GelIntegrationHelper.java
index 118be19..fbd6e5b 100644
--- a/src/com/android/launcher3/GelIntegrationHelper.java
+++ b/src/com/android/launcher3/GelIntegrationHelper.java
@@ -3,11 +3,13 @@ package com.android.launcher3;
import android.app.Activity;
import android.app.ActivityManager;
import android.app.SearchManager;
+import android.content.ActivityNotFoundException;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.service.gesture.EdgeGestureManager;
+import android.util.Log;
import com.android.internal.util.gesture.EdgeGesturePosition;
import java.util.List;
@@ -18,6 +20,7 @@ import java.util.List;
* in CyanogenMod.
*/
public class GelIntegrationHelper {
+ private static final String TAG = "GelIntegrationHelper";
private static final String GEL_ACTIVITY = "com.google.android.velvet.ui.VelvetActivity";
private static final String GEL_PACKAGE_NAME = "com.google.android.googlequicksearchbox";
@@ -88,8 +91,12 @@ public class GelIntegrationHelper {
intent.setComponent(globalSearchActivity);
}
- launcherActivity.startActivity(intent);
- launcherActivity.overridePendingTransition(0, R.anim.exit_out_right);
+ try {
+ launcherActivity.startActivity(intent);
+ launcherActivity.overridePendingTransition(0, R.anim.exit_out_right);
+ } catch (ActivityNotFoundException e) {
+ Log.e(TAG, "Unable to launch global search activity.");
+ }
}
private boolean isIntentSupported(Context context, Intent intent) {
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 17ddb7e..1d1208f 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1327,9 +1327,16 @@ public class Launcher extends Activity
}
protected void startThemeSettings() {
- Intent settings = new Intent().setClassName(OverviewSettingsPanel.ANDROID_SETTINGS,
- OverviewSettingsPanel.THEME_SETTINGS);
- startActivity(settings);
+ Intent chooser = new Intent(Intent.ACTION_MAIN)
+ .addCategory(OverviewSettingsPanel.THEME_CHOOSER_CATEGORY)
+ .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ try {
+ startActivity(chooser);
+ } catch (ActivityNotFoundException e) {
+ Intent settings = new Intent().setClassName(OverviewSettingsPanel.ANDROID_SETTINGS,
+ OverviewSettingsPanel.THEME_SETTINGS);
+ startActivity(settings);
+ }
if (mWorkspace.isInOverviewMode()) {
mWorkspace.exitOverviewMode(false);
@@ -1394,8 +1401,14 @@ public class Launcher extends Activity
mOverviewSettingsPanel.notifyDataSetInvalidated();
FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction();
- fragmentTransaction
- .setCustomAnimations(0, R.anim.exit_out_right);
+ Configuration config = getResources().getConfiguration();
+ if(config.getLayoutDirection() == View.LAYOUT_DIRECTION_RTL) {
+ fragmentTransaction
+ .setCustomAnimations(0, R.anim.exit_out_left);
+ } else {
+ fragmentTransaction
+ .setCustomAnimations(0, R.anim.exit_out_right);
+ }
fragmentTransaction
.remove(mDynamicGridSizeFragment).commit();
@@ -1438,8 +1451,14 @@ public class Launcher extends Activity
mOverviewSettingsPanel.notifyDataSetInvalidated();
FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction();
- fragmentTransaction
- .setCustomAnimations(0, R.anim.exit_out_right);
+ Configuration config = getResources().getConfiguration();
+ if(config.getLayoutDirection() == View.LAYOUT_DIRECTION_RTL) {
+ fragmentTransaction
+ .setCustomAnimations(0, R.anim.exit_out_left);
+ } else {
+ fragmentTransaction
+ .setCustomAnimations(0, R.anim.exit_out_right);
+ }
fragmentTransaction
.remove(mTransitionEffectsFragment).commit();
diff --git a/src/com/android/launcher3/OverviewSettingsPanel.java b/src/com/android/launcher3/OverviewSettingsPanel.java
index f0a568b..ef12b50 100644
--- a/src/com/android/launcher3/OverviewSettingsPanel.java
+++ b/src/com/android/launcher3/OverviewSettingsPanel.java
@@ -20,6 +20,7 @@ public class OverviewSettingsPanel {
"com.android.settings.applications.ProtectedAppsActivity";
public static final String THEME_SETTINGS =
"com.android.settings.Settings$ThemeSettingsActivity";
+ public static final String THEME_CHOOSER_CATEGORY = "cyngn.intent.category.APP_THEMES";
public static final int HOME_SETTINGS_POSITION = 0;
public static final int DRAWER_SETTINGS_POSITION = 1;
public static final int APP_SETTINGS_POSITION = 2;
diff --git a/src/com/android/launcher3/TransitionEffectsFragment.java b/src/com/android/launcher3/TransitionEffectsFragment.java
index 8f51e24..d490a00 100644
--- a/src/com/android/launcher3/TransitionEffectsFragment.java
+++ b/src/com/android/launcher3/TransitionEffectsFragment.java
@@ -4,11 +4,13 @@ import android.animation.Animator;
import android.animation.ObjectAnimator;
import android.app.Fragment;
import android.content.Context;
+import android.content.res.Configuration;
import android.content.res.TypedArray;
import android.graphics.Color;
import android.graphics.drawable.AnimationDrawable;
import android.os.Bundle;
import android.util.DisplayMetrics;
+import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;
import android.view.View.OnClickListener;
@@ -120,6 +122,12 @@ public class TransitionEffectsFragment extends Fragment {
mListView.setSelection(mCurrentPosition);
+ // RTL
+ ImageView navPrev = (ImageView) v.findViewById(R.id.nav_prev);
+ Configuration config = getResources().getConfiguration();
+ if (config.getLayoutDirection() == View.LAYOUT_DIRECTION_RTL) {
+ navPrev.setImageResource(R.drawable.ic_navigation_next);
+ }
return v;
}
@@ -163,7 +171,13 @@ public class TransitionEffectsFragment extends Fragment {
DisplayMetrics displaymetrics = new DisplayMetrics();
getActivity().getWindowManager().getDefaultDisplay().getMetrics(displaymetrics);
int width = displaymetrics.widthPixels;
- final ObjectAnimator anim = ObjectAnimator.ofFloat(this, "translationX", width, 0);
+ Configuration config = getResources().getConfiguration();
+ final ObjectAnimator anim;
+ if (config.getLayoutDirection() == View.LAYOUT_DIRECTION_RTL) {
+ anim = ObjectAnimator.ofFloat(this, "translationX", -width, 0);
+ } else {
+ anim = ObjectAnimator.ofFloat(this, "translationX", width, 0);
+ }
final View darkPanel = ((Launcher) getActivity()).getDarkPanel();
darkPanel.setVisibility(View.VISIBLE);
@@ -211,6 +225,13 @@ public class TransitionEffectsFragment extends Fragment {
parent, false);
TextView textView = (TextView) convertView
.findViewById(R.id.item_name);
+
+ // RTL
+ Configuration config = getResources().getConfiguration();
+ if (config.getLayoutDirection() == View.LAYOUT_DIRECTION_RTL) {
+ textView.setGravity(Gravity.RIGHT);
+ }
+
textView.setText(titles[position]);
// Set Selected State
if (position == mCurrentPosition) {
diff --git a/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java b/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java
index 35949e0..eca6492 100644
--- a/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java
+++ b/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java
@@ -2,23 +2,24 @@ package com.android.launcher3.list;
import android.content.Context;
import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.res.Configuration;
import android.content.res.Resources;
import android.database.Cursor;
import android.graphics.Typeface;
import android.util.TypedValue;
+import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;
+import android.view.View.OnClickListener;
import android.view.ViewGroup;
import android.widget.TextView;
+import com.android.launcher3.AppsCustomizePagedView;
import com.android.launcher3.DeviceProfile;
import com.android.launcher3.Launcher;
import com.android.launcher3.OverviewSettingsPanel;
-import com.android.launcher3.AppsCustomizePagedView;
import com.android.launcher3.R;
-
import com.android.launcher3.settings.SettingsProvider;
-import android.view.View.OnClickListener;
-import android.content.SharedPreferences;
public class SettingsPinnedHeaderAdapter extends PinnedHeaderListAdapter {
private static final int PARTITION_TAG = 0;
@@ -76,6 +77,12 @@ public class SettingsPinnedHeaderAdapter extends PinnedHeaderListAdapter {
@Override
protected void bindView(View v, int partition, Cursor cursor, int position) {
TextView text = (TextView)v.findViewById(R.id.item_name);
+ // RTL
+ Configuration config = mLauncher.getResources().getConfiguration();
+ if (config.getLayoutDirection() == View.LAYOUT_DIRECTION_RTL) {
+ text.setGravity(Gravity.RIGHT);
+ }
+
String title = cursor.getString(1);
text.setText(title);