summaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
Diffstat (limited to 'ui')
-rw-r--r--ui/AndroidManifest.xml6
-rw-r--r--ui/res/layout/download_list.xml8
-rw-r--r--ui/res/layout/download_list_item.xml24
-rw-r--r--ui/res/layout/list_group_header.xml13
-rw-r--r--ui/res/values-ca/strings.xml2
-rw-r--r--ui/res/values-es/strings.xml2
-rw-r--r--ui/res/values-fa/strings.xml2
-rw-r--r--ui/res/values-hi/strings.xml2
-rw-r--r--ui/res/values/dimen.xml2
-rw-r--r--ui/src/com/android/providers/downloads/ui/DateSortedExpandableListAdapter.java2
-rw-r--r--ui/src/com/android/providers/downloads/ui/DownloadItem.java15
11 files changed, 46 insertions, 32 deletions
diff --git a/ui/AndroidManifest.xml b/ui/AndroidManifest.xml
index 04d18635..f707dfbd 100644
--- a/ui/AndroidManifest.xml
+++ b/ui/AndroidManifest.xml
@@ -9,11 +9,13 @@
<application android:process="android.process.media"
android:label="@string/app_label"
android:icon="@mipmap/ic_launcher_download"
- android:hardwareAccelerated="true">
+ android:hardwareAccelerated="true"
+ android:supportsRtl="true"
+ android:requiredForAllUsers="true">
+
<activity android:name=".DownloadList"
android:launchMode="singleTop"
android:theme="@android:style/Theme.Holo.DialogWhenLarge">
-
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
diff --git a/ui/res/layout/download_list.xml b/ui/res/layout/download_list.xml
index e4ebf7c9..a0ff5ff2 100644
--- a/ui/res/layout/download_list.xml
+++ b/ui/res/layout/download_list.xml
@@ -30,16 +30,16 @@
android:layout_weight="1">
<ExpandableListView android:id="@+id/date_ordered_list"
- android:paddingLeft="16dip"
- android:paddingRight="16dip"
+ android:paddingStart="16dip"
+ android:paddingEnd="16dip"
android:paddingBottom="16dip"
android:clipToPadding="false"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scrollbarStyle="outsideOverlay" />
<ListView android:id="@+id/size_ordered_list"
- android:paddingLeft="16dip"
- android:paddingRight="16dip"
+ android:paddingStart="16dip"
+ android:paddingEnd="16dip"
android:paddingBottom="16dip"
android:clipToPadding="false"
android:layout_width="match_parent"
diff --git a/ui/res/layout/download_list_item.xml b/ui/res/layout/download_list_item.xml
index e5759d5d..2435ba7f 100644
--- a/ui/res/layout/download_list_item.xml
+++ b/ui/res/layout/download_list_item.xml
@@ -21,8 +21,9 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
- android:paddingRight="?android:attr/listPreferredItemPaddingRight"
+ android:minHeight="?android:attr/listPreferredItemHeight"
+ android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+ android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:paddingTop="8dip"
android:paddingBottom="8dip"
android:columnCount="4"
@@ -40,9 +41,10 @@
android:layout_width="@android:dimen/app_icon_size"
android:layout_height="@android:dimen/app_icon_size"
android:layout_rowSpan="3"
- android:layout_marginRight="8dip"
+ android:layout_marginEnd="8dip"
android:layout_gravity="center_vertical"
- android:scaleType="centerInside" />
+ android:scaleType="centerInside"
+ android:contentDescription="@null" />
<TextView
android:id="@+id/download_title"
@@ -52,7 +54,8 @@
android:singleLine="true"
android:ellipsize="marquee"
android:textStyle="bold"
- android:textAppearance="?android:attr/textAppearance" />
+ android:textAppearance="?android:attr/textAppearance"
+ android:textAlignment="viewStart" />
<TextView
android:id="@+id/domain"
@@ -61,7 +64,8 @@
android:layout_gravity="fill_horizontal"
android:singleLine="true"
android:ellipsize="marquee"
- android:textAppearance="?android:attr/textAppearanceSmall" />
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textAlignment="viewStart" />
<TextView
android:id="@+id/size_text"
@@ -69,11 +73,13 @@
android:layout_gravity="fill_horizontal"
android:singleLine="true"
android:ellipsize="marquee"
- android:textAppearance="?android:attr/textAppearanceSmall" />
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textAlignment="viewStart" />
<TextView
android:id="@+id/status_text"
- android:layout_marginLeft="8dip"
- android:textAppearance="?android:attr/textAppearanceSmall" />
+ android:layout_marginStart="8dip"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textAlignment="viewStart" />
</com.android.providers.downloads.ui.DownloadItem>
diff --git a/ui/res/layout/list_group_header.xml b/ui/res/layout/list_group_header.xml
index 2600f8de..466cd6c6 100644
--- a/ui/res/layout/list_group_header.xml
+++ b/ui/res/layout/list_group_header.xml
@@ -15,10 +15,9 @@
-->
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:minHeight="?android:attr/listPreferredItemHeight"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:paddingLeft="43dip"
- android:layout_gravity="center_vertical"
- android:gravity="center_vertical"/>
+ android:id="@android:id/text1"
+ android:layout_width="match_parent"
+ android:layout_height="?android:attr/listPreferredItemHeight"
+ android:paddingStart="?android:attr/expandableListPreferredItemPaddingLeft"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:gravity="center_vertical" />
diff --git a/ui/res/values-ca/strings.xml b/ui/res/values-ca/strings.xml
index 43a8e38e..072ca539 100644
--- a/ui/res/values-ca/strings.xml
+++ b/ui/res/values-ca/strings.xml
@@ -31,7 +31,7 @@
<string name="dialog_failed_body" msgid="587545111677064427">"Vols tornar a intentar baixar el fitxer més tard o vols suprimir-lo de la cua?"</string>
<string name="dialog_title_queued_body" msgid="6760681913815015219">"Fitxer en cua"</string>
<string name="dialog_queued_body" msgid="708552801635572720">"Aquest fitxer està en cua per baixar més endavant, per tant, encara no està disponible."</string>
- <string name="dialog_file_missing_body" msgid="3223012612774276284">"No es troba el fitxer que s\'ha baixat."</string>
+ <string name="dialog_file_missing_body" msgid="3223012612774276284">"No es pot trobar el fitxer baixat."</string>
<string name="dialog_insufficient_space_on_external" msgid="8692452156251449195">"No es pot finalitzar la baixada. No hi ha prou espai a l\'emmagatzematge extern."</string>
<string name="dialog_insufficient_space_on_cache" msgid="6313630206163908994">"No es pot finalitzar la baixada. No hi ha prou espai a l\'emmagatzematge intern."</string>
<string name="dialog_cannot_resume" msgid="8664509751358983543">"S\'ha interromput la baixada i no es pot reprendre."</string>
diff --git a/ui/res/values-es/strings.xml b/ui/res/values-es/strings.xml
index 5c724609..37903dca 100644
--- a/ui/res/values-es/strings.xml
+++ b/ui/res/values-es/strings.xml
@@ -45,6 +45,6 @@
<string name="retry_download" msgid="7617100787922717912">"Reintentar"</string>
<string name="deselect_all" msgid="6348198946254776764">"Desmarcar todo"</string>
<string name="select_all" msgid="634074918366265804">"Seleccionar todo"</string>
- <string name="selected_count" msgid="2101564570019753277">"Has seleccionado <xliff:g id="NUMBER">%1$d</xliff:g> de <xliff:g id="TOTAL">%2$d</xliff:g>."</string>
+ <string name="selected_count" msgid="2101564570019753277">"Elegido: <xliff:g id="NUMBER">%1$d</xliff:g> de <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
<string name="download_share_dialog" msgid="3355867339806448955">"Compartir a través de"</string>
</resources>
diff --git a/ui/res/values-fa/strings.xml b/ui/res/values-fa/strings.xml
index fd81dd26..8650ce35 100644
--- a/ui/res/values-fa/strings.xml
+++ b/ui/res/values-fa/strings.xml
@@ -21,7 +21,7 @@
<string name="download_title_sorted_by_size" msgid="1417193166677094813">"دانلودها - مرتب شده بر اساس اندازه"</string>
<string name="no_downloads" msgid="1029667411186146836">"خیر دانلودها."</string>
<string name="missing_title" msgid="830115697868833773">"&lt;ناشناس&gt;"</string>
- <string name="button_sort_by_size" msgid="7331549713691146251">"ترتیب بر اساس اندازه"</string>
+ <string name="button_sort_by_size" msgid="7331549713691146251">"بر اساس اندازه مرتب شود"</string>
<string name="button_sort_by_date" msgid="8800842892684101528">"ترتیب براساس تاریخ"</string>
<string name="download_queued" msgid="104973307780629904">"در صف"</string>
<string name="download_running" msgid="4656462962155580641">"در حال انجام"</string>
diff --git a/ui/res/values-hi/strings.xml b/ui/res/values-hi/strings.xml
index 8e36dcc8..4761bd34 100644
--- a/ui/res/values-hi/strings.xml
+++ b/ui/res/values-hi/strings.xml
@@ -46,5 +46,5 @@
<string name="deselect_all" msgid="6348198946254776764">"सभी का चयन रद्द करें"</string>
<string name="select_all" msgid="634074918366265804">"सभी चुनें"</string>
<string name="selected_count" msgid="2101564570019753277">"<xliff:g id="TOTAL">%2$d</xliff:g> में से <xliff:g id="NUMBER">%1$d</xliff:g> चयनित"</string>
- <string name="download_share_dialog" msgid="3355867339806448955">"इसके द्वारा शेयर करें"</string>
+ <string name="download_share_dialog" msgid="3355867339806448955">"इसके द्वारा साझा करें"</string>
</resources>
diff --git a/ui/res/values/dimen.xml b/ui/res/values/dimen.xml
index 6e48f132..7519b878 100644
--- a/ui/res/values/dimen.xml
+++ b/ui/res/values/dimen.xml
@@ -15,5 +15,5 @@
-->
<resources>
- <dimen name="checkmark_area">40dip</dimen>
+ <dimen name="checkmark_area">48dip</dimen>
</resources>
diff --git a/ui/src/com/android/providers/downloads/ui/DateSortedExpandableListAdapter.java b/ui/src/com/android/providers/downloads/ui/DateSortedExpandableListAdapter.java
index 19132a11..f5d70770 100644
--- a/ui/src/com/android/providers/downloads/ui/DateSortedExpandableListAdapter.java
+++ b/ui/src/com/android/providers/downloads/ui/DateSortedExpandableListAdapter.java
@@ -273,7 +273,7 @@ public class DateSortedExpandableListAdapter implements ExpandableListAdapter {
TextView item;
if (null == convertView || !(convertView instanceof TextView)) {
LayoutInflater factory = LayoutInflater.from(mContext);
- item = (TextView) factory.inflate(R.layout.list_group_header, null);
+ item = (TextView) factory.inflate(R.layout.list_group_header, parent, false);
} else {
item = (TextView) convertView;
}
diff --git a/ui/src/com/android/providers/downloads/ui/DownloadItem.java b/ui/src/com/android/providers/downloads/ui/DownloadItem.java
index e24ac4a4..0562cd05 100644
--- a/ui/src/com/android/providers/downloads/ui/DownloadItem.java
+++ b/ui/src/com/android/providers/downloads/ui/DownloadItem.java
@@ -18,12 +18,11 @@ package com.android.providers.downloads.ui;
import android.content.Context;
import android.util.AttributeSet;
-import android.view.accessibility.AccessibilityEvent;
import android.view.MotionEvent;
+import android.view.accessibility.AccessibilityEvent;
import android.widget.CheckBox;
import android.widget.Checkable;
import android.widget.GridLayout;
-import android.widget.RelativeLayout;
/**
* This class customizes RelativeLayout to directly handle clicks on the left part of the view and
@@ -83,12 +82,20 @@ public class DownloadItem extends GridLayout implements Checkable {
mDownloadList = downloadList;
}
+ private boolean inCheckArea(MotionEvent event) {
+ if (isLayoutRtl()) {
+ return event.getX() > getWidth() - CHECKMARK_AREA;
+ } else {
+ return event.getX() < CHECKMARK_AREA;
+ }
+ }
+
@Override
public boolean onTouchEvent(MotionEvent event) {
boolean handled = false;
switch(event.getAction()) {
case MotionEvent.ACTION_DOWN:
- if (event.getX() < CHECKMARK_AREA) {
+ if (inCheckArea(event)) {
mIsInDownEvent = true;
handled = true;
}
@@ -99,7 +106,7 @@ public class DownloadItem extends GridLayout implements Checkable {
break;
case MotionEvent.ACTION_UP:
- if (mIsInDownEvent && event.getX() < CHECKMARK_AREA) {
+ if (mIsInDownEvent && inCheckArea(event)) {
toggle();
sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_CLICKED);
handled = true;