Merge "Fix drawer title not update to system language" (77b66f9f) · Commits · e / os / android_packages_apps_DocumentsUI

src/com/android/documentsui/dirlist/DirectoryFragment.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -902,7 +902,7 @@ public class DirectoryFragment extends Fragment implements SwipeRefreshLayout.On
		throw new UnsupportedOperationException("Unknown mode: " + mode);
		}

		intent.putExtra(DocumentsContract.EXTRA_PROMPT, getResources().getString(drawerTitleId));
		intent.putExtra(DocumentsContract.EXTRA_PROMPT, drawerTitleId);

		// Model must be accessed in UI thread, since underlying cursor is not threadsafe.
		List<DocumentInfo> docs = mModel.getDocuments(selected);

src/com/android/documentsui/picker/PickActivity.java

+21 −13

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@ import static com.android.documentsui.base.State.ACTION_OPEN_TREE;
		import static com.android.documentsui.base.State.ACTION_PICK_COPY_DESTINATION;

		import android.content.Intent;
		import android.content.res.Resources;
		import android.graphics.Color;
		import android.net.Uri;
		import android.os.Bundle;
		@@ -264,21 +265,28 @@ public class PickActivity extends BaseActivity implements ActionHandler.Addons {

		@Override
		public String getDrawerTitle() {
		String title = getIntent().getStringExtra(DocumentsContract.EXTRA_PROMPT);
		String title;
		try {
		// Internal use case, we will send string id instead of string text.
		title = getResources().getString(
		getIntent().getIntExtra(DocumentsContract.EXTRA_PROMPT, -1));
		} catch (Resources.NotFoundException e) {
		// 3rd party use case, it should send string text.
		title = getIntent().getStringExtra(DocumentsContract.EXTRA_PROMPT);
		if (title == null) {
		if (mState.action == ACTION_OPEN \|\|
		mState.action == ACTION_GET_CONTENT \|\|
		mState.action == ACTION_OPEN_TREE) {
		if (mState.action == ACTION_OPEN
		\|\| mState.action == ACTION_GET_CONTENT
		\|\| mState.action == ACTION_OPEN_TREE) {
		title = getResources().getString(R.string.title_open);
		} else if (mState.action == ACTION_CREATE \|\|
		mState.action == ACTION_PICK_COPY_DESTINATION) {
		} else if (mState.action == ACTION_CREATE
		\|\| mState.action == ACTION_PICK_COPY_DESTINATION) {
		title = getResources().getString(R.string.title_save);
		} else {
		// If all else fails, just call it "Documents".
		title = getResources().getString(R.string.app_label);
		}
		}

		}
		return title;
		}