diff options
Diffstat (limited to 'packages/DocumentsUI')
10 files changed, 38 insertions, 7 deletions
diff --git a/packages/DocumentsUI/res/layout-sw720dp/activity.xml b/packages/DocumentsUI/res/layout-sw720dp/activity.xml index 2a273f4..221de13 100644 --- a/packages/DocumentsUI/res/layout-sw720dp/activity.xml +++ b/packages/DocumentsUI/res/layout-sw720dp/activity.xml @@ -55,6 +55,7 @@ android:layout_height="match_parent" android:layout_weight="1" android:orientation="vertical" + android:background="@color/material_grey_50" android:elevation="8dp"> <com.android.documentsui.DirectoryContainerView @@ -67,6 +68,7 @@ android:id="@+id/container_save" android:layout_width="match_parent" android:layout_height="wrap_content" + android:background="@color/material_grey_50" android:elevation="8dp" /> </LinearLayout> diff --git a/packages/DocumentsUI/res/layout/activity.xml b/packages/DocumentsUI/res/layout/activity.xml index 43fdaf2..32431e3 100644 --- a/packages/DocumentsUI/res/layout/activity.xml +++ b/packages/DocumentsUI/res/layout/activity.xml @@ -51,6 +51,7 @@ android:id="@+id/container_save" android:layout_width="match_parent" android:layout_height="wrap_content" + android:background="@color/material_grey_50" android:elevation="8dp" /> </LinearLayout> diff --git a/packages/DocumentsUI/res/layout/fragment_directory.xml b/packages/DocumentsUI/res/layout/fragment_directory.xml index 2c08e72..4717839 100644 --- a/packages/DocumentsUI/res/layout/fragment_directory.xml +++ b/packages/DocumentsUI/res/layout/fragment_directory.xml @@ -16,7 +16,8 @@ <com.android.documentsui.DirectoryView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" + android:background="@color/material_grey_50"> <TextView android:id="@android:id/empty" diff --git a/packages/DocumentsUI/res/values-bn-rBD/strings.xml b/packages/DocumentsUI/res/values-bn-rBD/strings.xml index a999300..4167194 100644 --- a/packages/DocumentsUI/res/values-bn-rBD/strings.xml +++ b/packages/DocumentsUI/res/values-bn-rBD/strings.xml @@ -22,7 +22,7 @@ <string name="menu_create_dir" msgid="5947289605844398389">"ফোল্ডার তৈরি করুন"</string> <string name="menu_grid" msgid="6878021334497835259">"গ্রিড দৃশ্য"</string> <string name="menu_list" msgid="7279285939892417279">"তালিকা দৃশ্য"</string> - <string name="menu_sort" msgid="7677740407158414452">"এর দ্বারা সাজান"</string> + <string name="menu_sort" msgid="7677740407158414452">"এই অনুসারে বাছুন"</string> <string name="menu_search" msgid="3816712084502856974">"অনুসন্ধান করুন"</string> <string name="menu_settings" msgid="6008033148948428823">"সেটিংস"</string> <string name="menu_open" msgid="432922957274920903">"খুলুন"</string> diff --git a/packages/DocumentsUI/res/values-fr-rCA/strings.xml b/packages/DocumentsUI/res/values-fr-rCA/strings.xml index 14f82ce..03f09ff 100644 --- a/packages/DocumentsUI/res/values-fr-rCA/strings.xml +++ b/packages/DocumentsUI/res/values-fr-rCA/strings.xml @@ -17,7 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="2783841764617238354">"Documents"</string> - <string name="title_open" msgid="4353228937663917801">"Ouvert à partir de"</string> + <string name="title_open" msgid="4353228937663917801">"Ouvrir à partir de"</string> <string name="title_save" msgid="2433679664882857999">"Enregistrer dans"</string> <string name="menu_create_dir" msgid="5947289605844398389">"Créer un dossier"</string> <string name="menu_grid" msgid="6878021334497835259">"Grille"</string> diff --git a/packages/DocumentsUI/res/values-pl/strings.xml b/packages/DocumentsUI/res/values-pl/strings.xml index 2b79f8e..84e5495 100644 --- a/packages/DocumentsUI/res/values-pl/strings.xml +++ b/packages/DocumentsUI/res/values-pl/strings.xml @@ -56,7 +56,7 @@ <string name="empty" msgid="7858882803708117596">"Brak elementów"</string> <string name="toast_no_application" msgid="1339885974067891667">"Nie można otworzyć pliku"</string> <string name="toast_failed_delete" msgid="2180678019407244069">"Nie można usunąć niektórych dokumentów"</string> - <string name="share_via" msgid="8966594246261344259">"Udostępnij przez"</string> + <string name="share_via" msgid="8966594246261344259">"Udostępnij przez:"</string> <string name="copy_notification_title" msgid="6374299806748219777">"Kopiowanie plików"</string> <string name="copy_remaining" msgid="6283790937387975095">"Pozostało: <xliff:g id="DURATION">%s</xliff:g>"</string> <plurals name="copy_begin" formatted="false" msgid="9071199452634086365"> diff --git a/packages/DocumentsUI/res/values-sl/strings.xml b/packages/DocumentsUI/res/values-sl/strings.xml index 65e857b..c753c57 100644 --- a/packages/DocumentsUI/res/values-sl/strings.xml +++ b/packages/DocumentsUI/res/values-sl/strings.xml @@ -17,8 +17,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="2783841764617238354">"Dokumenti"</string> - <string name="title_open" msgid="4353228937663917801">"Odpiranje iz"</string> - <string name="title_save" msgid="2433679664882857999">"Shranjevanje v"</string> + <string name="title_open" msgid="4353228937663917801">"Odpri iz mape"</string> + <string name="title_save" msgid="2433679664882857999">"Shrani v"</string> <string name="menu_create_dir" msgid="5947289605844398389">"Ustvarjanje mape"</string> <string name="menu_grid" msgid="6878021334497835259">"Mrežni pogled"</string> <string name="menu_list" msgid="7279285939892417279">"Pogled seznama"</string> @@ -30,7 +30,7 @@ <string name="menu_share" msgid="3075149983979628146">"Skupna raba"</string> <string name="menu_delete" msgid="8138799623850614177">"Izbriši"</string> <string name="menu_select_all" msgid="8323579667348729928">"Izberi vse"</string> - <string name="menu_copy" msgid="3612326052677229148">"Kopiranje v …"</string> + <string name="menu_copy" msgid="3612326052677229148">"Kopiraj v …"</string> <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Pokaži notranjo shrambo"</string> <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Pokaži kartico SD"</string> <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"Skrij notranjo shrambo"</string> diff --git a/packages/DocumentsUI/res/values/colors.xml b/packages/DocumentsUI/res/values/colors.xml index 2b839d4..ba8d69f 100644 --- a/packages/DocumentsUI/res/values/colors.xml +++ b/packages/DocumentsUI/res/values/colors.xml @@ -15,6 +15,7 @@ --> <resources> + <color name="material_grey_50">#fffafafa</color> <color name="material_grey_300">#ffeeeeee</color> <color name="item_doc_grid_background">@color/material_grey_300</color> diff --git a/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java b/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java index f4be9c5..006f6e9 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java +++ b/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java @@ -50,6 +50,8 @@ import android.net.Uri; import android.os.AsyncTask; import android.os.Bundle; import android.os.CancellationSignal; +import android.os.Handler; +import android.os.Looper; import android.os.OperationCanceledException; import android.os.Parcelable; import android.provider.DocumentsContract; @@ -135,6 +137,8 @@ public class DirectoryFragment extends Fragment { private final int mLoaderId = 42; + private final Handler mHandler = new Handler(Looper.getMainLooper()); + public static void showNormal(FragmentManager fm, RootInfo root, DocumentInfo doc, int anim) { show(fm, TYPE_NORMAL, root, doc, null, anim); } @@ -297,6 +301,21 @@ public class DirectoryFragment extends Fragment { @Override public void onLoadFinished(Loader<DirectoryResult> loader, DirectoryResult result) { + if (result == null || result.exception != null) { + // onBackPressed does a fragment transaction, which can't be done inside + // onLoadFinished + mHandler.post(new Runnable() { + @Override + public void run() { + final Activity activity = getActivity(); + if (activity != null) { + activity.onBackPressed(); + } + } + }); + return; + } + if (!isAdded()) return; mAdapter.swapResult(result); diff --git a/packages/DocumentsUI/src/com/android/documentsui/DirectoryLoader.java b/packages/DocumentsUI/src/com/android/documentsui/DirectoryLoader.java index 8e4ec8c..a8a61d2 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/DirectoryLoader.java +++ b/packages/DocumentsUI/src/com/android/documentsui/DirectoryLoader.java @@ -31,7 +31,10 @@ import android.content.Context; import android.database.Cursor; import android.net.Uri; import android.os.CancellationSignal; +import android.os.Handler; +import android.os.Looper; import android.os.OperationCanceledException; +import android.os.RemoteException; import android.provider.DocumentsContract; import android.provider.DocumentsContract.Document; import android.util.Log; @@ -163,6 +166,10 @@ public class DirectoryLoader extends AsyncTaskLoader<DirectoryResult> { cursor = client.query( mUri, null, null, null, getQuerySortOrder(result.sortOrder), mSignal); + if (cursor == null) { + throw new RemoteException("Provider returned null"); + } + cursor.registerContentObserver(mObserver); cursor = new RootCursorWrapper(mUri.getAuthority(), mRoot.rootId, cursor, -1); |