summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
Diffstat (limited to 'res')
-rw-r--r--res/drawable/button_bg.xml4
-rw-r--r--res/layout-land/launcher.xml44
-rw-r--r--res/layout/market_button.xml1
-rw-r--r--res/values-it/strings.xml2
-rw-r--r--res/values-land/dimens.xml4
-rw-r--r--res/values-land/styles.xml6
-rw-r--r--res/values-port/styles.xml5
-rw-r--r--res/values-pt-rPT/strings.xml6
-rw-r--r--res/values-sw/strings.xml6
-rw-r--r--res/values-sw340dp-port/styles.xml3
-rw-r--r--res/values-sw600dp-port/styles.xml24
-rw-r--r--res/values-sw600dp/styles.xml1
-rw-r--r--res/values/styles.xml6
13 files changed, 77 insertions, 35 deletions
diff --git a/res/drawable/button_bg.xml b/res/drawable/button_bg.xml
index a830594ea..e7b1bcd5a 100644
--- a/res/drawable/button_bg.xml
+++ b/res/drawable/button_bg.xml
@@ -15,7 +15,7 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_focused="true" android:drawable="@drawable/focused_bg" />
- <item android:state_pressed="true" android:drawable="@drawable/home_press" />
+ <item android:state_focused="true" android:drawable="@drawable/tab_unselected_focused_holo" />
+ <item android:state_pressed="true" android:drawable="@drawable/tab_unselected_focused_holo" />
<item android:drawable="@android:color/transparent" />
</selector>
diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml
index a74eb14c8..c11c788d2 100644
--- a/res/layout-land/launcher.xml
+++ b/res/layout-land/launcher.xml
@@ -22,29 +22,6 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
- <!-- Keep these behind the workspace so that they are not visible when
- we go into AllApps -->
- <include
- android:id="@+id/qsb_divider"
- layout="@layout/workspace_divider"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:layout_marginLeft="@dimen/qsb_bar_height"
- android:layout_gravity="left" />
- <include
- android:id="@+id/dock_divider"
- layout="@layout/workspace_divider"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:layout_marginRight="@dimen/button_bar_height"
- android:layout_gravity="right" />
- <include
- android:id="@+id/paged_view_indicator"
- layout="@layout/scroll_indicator"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="bottom" />
-
<!-- The workspace contains 5 screens of cells -->
<com.android.launcher2.Workspace
android:id="@+id/workspace"
@@ -66,6 +43,27 @@
<include android:id="@+id/cell5" layout="@layout/workspace_screen" />
</com.android.launcher2.Workspace>
+ <include
+ android:id="@+id/qsb_divider"
+ layout="@layout/workspace_divider"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_marginLeft="@dimen/qsb_bar_height"
+ android:layout_gravity="left" />
+ <include
+ android:id="@+id/dock_divider"
+ layout="@layout/workspace_divider"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_marginRight="@dimen/button_bar_height"
+ android:layout_gravity="right" />
+ <include
+ android:id="@+id/paged_view_indicator"
+ layout="@layout/scroll_indicator"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="bottom" />
+
<include layout="@layout/hotseat"
android:id="@+id/hotseat"
android:layout_width="@dimen/button_bar_height_plus_padding"
diff --git a/res/layout/market_button.xml b/res/layout/market_button.xml
index 5e1015631..27eb3fd36 100644
--- a/res/layout/market_button.xml
+++ b/res/layout/market_button.xml
@@ -21,6 +21,7 @@
android:gravity="center"
android:paddingLeft="16dp"
android:paddingRight="16dp"
+ android:background="@drawable/tab_widget_indicator_selector"
android:contentDescription="@string/market"
android:shadowColor="@color/workspace_all_apps_and_delete_zone_text_shadow_color"
android:shadowDx="0.0"
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 327d90d95..f9353034f 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -88,7 +88,7 @@
<string name="workspace_scroll_format" msgid="7911126267695001437">"Area di lavoro %1$d di %2$d"</string>
<string name="apps_customize_apps_scroll_format" msgid="5494241912377704885">"Pagina di applicazioni %1$d di %2$d"</string>
<string name="apps_customize_widgets_scroll_format" msgid="5383009742241717437">"Pagina di widget %1$d di %2$d"</string>
- <string name="workspace_cling_title" msgid="738396473989890567">"Mettiti comodo"</string>
+ <string name="workspace_cling_title" msgid="738396473989890567">"Personalizza la schermata home"</string>
<string name="workspace_cling_move_item" msgid="791013895761065070">"Puoi posizionare le tue applicazioni preferite qui."</string>
<string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"Per visualizzare tutte le tue applicazioni, tocca il cerchio."</string>
<string name="all_apps_cling_title" msgid="2559734712581447107">"Scegli alcune applicazioni"</string>
diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml
index 89e6773fc..6d0261f89 100644
--- a/res/values-land/dimens.xml
+++ b/res/values-land/dimens.xml
@@ -31,7 +31,9 @@
really only in spring loaded mode... -->
<dimen name="workspace_top_padding">0dp</dimen>
<dimen name="workspace_bottom_padding">0dp</dimen>
- <dimen name="workspace_page_spacing">-1dp</dimen>
+ <!-- We really want the page spacing to be the max of either the button bar
+ height or the qsb bar height -->
+ <dimen name="workspace_page_spacing">@dimen/button_bar_height</dimen>
<dimen name="workspace_divider_padding_left">0dp</dimen>
<dimen name="workspace_divider_padding_right">0dp</dimen>
<dimen name="workspace_divider_padding_top">12dp</dimen>
diff --git a/res/values-land/styles.xml b/res/values-land/styles.xml
index 7949d2d34..71ab65859 100644
--- a/res/values-land/styles.xml
+++ b/res/values-land/styles.xml
@@ -23,6 +23,7 @@
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
</style>
+
<!-- Search Bar -->
<style name="QSBBar">
<item name="android:orientation">vertical</item>
@@ -65,5 +66,10 @@
<item name="android:shadowDy">1.0</item>
<item name="android:shadowRadius">4.0</item>
</style>
+
+<!-- AppsCustomize -->
+ <style name="TabIndicator.AppsCustomize">
+ <item name="android:maxWidth">200dp</item>
+ </style>
</resources>
diff --git a/res/values-port/styles.xml b/res/values-port/styles.xml
index d631d1e17..20369c916 100644
--- a/res/values-port/styles.xml
+++ b/res/values-port/styles.xml
@@ -29,4 +29,9 @@
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
</style>
+
+<!-- AppsCustomize -->
+ <style name="TabIndicator.AppsCustomize">
+ <item name="android:maxWidth">130dp</item>
+ </style>
</resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 398d81a93..db7419852 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -69,9 +69,9 @@
<string name="cab_menu_delete_app" msgid="4089398025537640349">"Desinstalar a aplicação"</string>
<string name="cab_menu_app_info" msgid="914548323652698884">"Detalhes da aplicação"</string>
<string name="cab_app_selection_text" msgid="6378522164293415735">"1 aplicação selecionada"</string>
- <string name="cab_widget_selection_text" msgid="962527270506951955">"1 widget seleccionado"</string>
- <string name="cab_folder_selection_text" msgid="8916111874189565067">"1 pasta seleccionada"</string>
- <string name="cab_shortcut_selection_text" msgid="8115847384500412878">"1 atalho seleccionado"</string>
+ <string name="cab_widget_selection_text" msgid="962527270506951955">"1 widget selecionado"</string>
+ <string name="cab_folder_selection_text" msgid="8916111874189565067">"1 pasta selecionada"</string>
+ <string name="cab_shortcut_selection_text" msgid="8115847384500412878">"1 atalho selecionado"</string>
<string name="permlab_install_shortcut" msgid="1201690825493376489">"instalar atalhos"</string>
<string name="permdesc_install_shortcut" msgid="8634424803272077038">"Permite que uma aplicação adicione atalhos sem a intervenção do utilizador."</string>
<string name="permlab_uninstall_shortcut" msgid="7696645932555926449">"desinstalar atalhos"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index df786fb1e..490979e9b 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -36,7 +36,7 @@
<string name="rename_action" msgid="6016003384693240896">"Sawa"</string>
<string name="cancel_action" msgid="3811860427489435048">"Ghairi"</string>
<string name="menu_item_add_item" msgid="6233177331075781114">"Ongeza kwa skrini ya Nyumbani"</string>
- <string name="group_applications" msgid="2103752818818161976">"Prog"</string>
+ <string name="group_applications" msgid="2103752818818161976">"Programu"</string>
<string name="group_shortcuts" msgid="9133529424900391877">"Njia za mkato"</string>
<string name="group_widgets" msgid="6704978494073105844">"Wijeti"</string>
<string name="group_wallpapers" msgid="1568191644272224858">"Mandhari"</string>
@@ -56,7 +56,7 @@
<string name="info_target_label" msgid="4019495079517426980">"Maelezo ya programu"</string>
<string name="accessibility_search_button" msgid="816822994629942611">"Tafuta"</string>
<string name="accessibility_voice_search_button" msgid="3938249215065842475">"Utafutaji wa Sauti"</string>
- <string name="accessibility_all_apps_button" msgid="8803738611398979849">"Prog"</string>
+ <string name="accessibility_all_apps_button" msgid="8803738611398979849">"Programu"</string>
<string name="accessibility_delete_button" msgid="3628162007991023603">"Ondoa"</string>
<string name="delete_zone_label_all_apps_system_app" msgid="3683920959591819044">"Sanidua sasisho"</string>
<string name="menu_add" msgid="3065046628354640854">"Ongeza"</string>
@@ -99,7 +99,7 @@
<string name="cling_dismiss" msgid="2780907108735868381">"Sawa"</string>
<string name="folder_opened" msgid="4129072635480822768">"Folda imefunguliwa,%1$d na %2$d"</string>
<string name="folder_tap_to_close" msgid="4076794242530255812">"Gonga ili kufunga folda"</string>
- <string name="folder_tap_to_rename" msgid="2125528923948315223">"Gonga kukubali jina"</string>
+ <string name="folder_tap_to_rename" msgid="2125528923948315223">"Gonga ili kukubali jina"</string>
<string name="folder_closed" msgid="3130534551370511932">"Folda imefungwa"</string>
<string name="folder_renamed" msgid="781234745487414781">"Folda imebadilishwa jina hadi %1$s"</string>
<string name="folder_name_format" msgid="4513766553514769310">"Folda: %1$s"</string>
diff --git a/res/values-sw340dp-port/styles.xml b/res/values-sw340dp-port/styles.xml
index 9a4224988..b309d85d0 100644
--- a/res/values-sw340dp-port/styles.xml
+++ b/res/values-sw340dp-port/styles.xml
@@ -26,6 +26,9 @@
</style>
<!-- AppsCustomize -->
+ <style name="TabIndicator.AppsCustomize">
+ <item name="android:maxWidth">150dp</item>
+ </style>
<style name="WorkspaceIcon.Portrait.AppsCustomize">
<item name="android:singleLine">false</item>
<item name="android:maxLines">2</item>
diff --git a/res/values-sw600dp-port/styles.xml b/res/values-sw600dp-port/styles.xml
new file mode 100644
index 000000000..57f07acaf
--- /dev/null
+++ b/res/values-sw600dp-port/styles.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+* Copyright (C) 2011 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>
+ <style name="TabIndicator.AppsCustomize">
+ <item name="android:maxWidth">180dp</item>
+ </style>
+</resources>
diff --git a/res/values-sw600dp/styles.xml b/res/values-sw600dp/styles.xml
index e0542ba98..87110da9f 100644
--- a/res/values-sw600dp/styles.xml
+++ b/res/values-sw600dp/styles.xml
@@ -114,6 +114,7 @@
<item name="android:paddingLeft">32dp</item>
<item name="android:paddingRight">32dp</item>
<item name="android:textSize">14sp</item>
+ <item name="android:maxWidth">240dp</item>
</style>
<!-- QSB Search / Drop Target bar -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 502a8368c..909887c44 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -161,13 +161,15 @@
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">match_parent</item>
<item name="android:gravity">center</item>
- <item name="android:paddingLeft">24dp</item>
- <item name="android:paddingRight">24dp</item>
+ <item name="android:paddingLeft">20dp</item>
+ <item name="android:paddingRight">20dp</item>
<item name="android:background">@drawable/tab_widget_indicator_selector</item>
<item name="android:textColor">?android:attr/textColorPrimary</item>
<item name="android:textSize">12sp</item>
<item name="android:textStyle">bold</item>
<item name="android:textAllCaps">true</item>
+ <item name="android:singleLine">true</item>
+ <item name="android:ellipsize">end</item>
</style>
<style name="TabIndicator.AppsCustomize">
<!-- Overridden in values-land -->
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-08 08:45:48 +0000