Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aba22fb4 authored by Zemiao Zhu's avatar Zemiao Zhu Committed by Automerger Merge Worker
Browse files

Merge "Fix talkback directory name when first launch app or rotate screen."... 

Merge "Fix talkback directory name when first launch app or rotate screen." into rvc-dev am: b646cf76 am: bda6a107 am: 8df43e9f

Change-Id: Id79b0d5999c13e626ab9fafda315c91e407f5e03
parents 41d43e9c 8df43e9f

src/com/android/documentsui/BaseActivity.java

+20 −2
Original line number Diff line number Diff line
@@ -75,7 +75,6 @@ import com.android.documentsui.sorting.SortController; 
import com.android.documentsui.sorting.SortModel;



import com.google.android.material.appbar.AppBarLayout;

import com.google.android.material.tabs.TabLayout;



import java.util.ArrayList;

import java.util.Date;
@@ -343,6 +342,19 @@ public abstract class BaseActivity 
        mRootsMonitor.start();

    }



    @Override

    protected void onStart() {

        super.onStart();

        if (mState.stack.getTitle() == null) {

            // First launch.

            setTitle("");

            return;

        }



        // Append app name for TalkBack when app enters foreground.

        setTitle(String.format("%s. %s", getString(R.string.files_label), mState.stack.getTitle()));

    }



    @Override

    public boolean onCreateOptionsMenu(Menu menu) {

        boolean showMenu = super.onCreateOptionsMenu(menu);
@@ -606,7 +618,13 @@ public abstract class BaseActivity 
        }



        // Causes talkback to announce the activity's new title

        String appName = getString(R.string.files_label);

        if (getTitle().toString().isEmpty()) {

            // First launch, TalkBack announces app name.

            setTitle(String.format("%s. %s", appName, mState.stack.getTitle()));

        } else {

            setTitle(mState.stack.getTitle());

        }



        invalidateOptionsMenu();

        mSortController.onViewModeChanged(mState.derivedMode);

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

+0 −4
Original line number Diff line number Diff line
@@ -116,10 +116,6 @@ class ActionHandler<T extends FragmentActivity & Addons> extends AbstractActionH 
            return;

        }



        // We set the activity title in AsyncTask.onPostExecute().

        // To prevent talkback from reading aloud the default title, we clear it here.

        mActivity.setTitle("");



        if (launchHomeForCopyDestination(intent)) {

            if (DEBUG) {

                Log.d(TAG, "Launching directly into Home directory for copy destination.");