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

Commit 52a9e0e1 authored by Ben Lin's avatar Ben Lin Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE ANYWHERE Revert "Using Activity#setTitle to have TalkBack... 

Merge "DO NOT MERGE ANYWHERE Revert "Using Activity#setTitle to have TalkBack announce root traversal."" into nyc-mr2-dev
parents c5700918 98e58262

packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java

+0 −6
Original line number Original line Diff line number Diff line
@@ -387,12 +387,6 @@ public abstract class BaseActivity extends Activity 
        }

        }





        mNavigator.update();

        mNavigator.update();

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

        if (mState.stack.isRecents()) {

            setTitle(mRoots.getRecentsRoot().title);

        } else {

            setTitle(mState.stack.getTitle());

        }

        invalidateOptionsMenu();

        invalidateOptionsMenu();

    }

    }

packages/DocumentsUI/src/com/android/documentsui/FilesActivity.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -192,7 +192,7 @@ public class FilesActivity extends BaseActivity { 
        Intent intent = getIntent();

        Intent intent = getIntent();

        return (intent != null && intent.hasExtra(Intent.EXTRA_TITLE))

        return (intent != null && intent.hasExtra(Intent.EXTRA_TITLE))

                ? intent.getStringExtra(Intent.EXTRA_TITLE)

                ? intent.getStringExtra(Intent.EXTRA_TITLE)

                : getString(R.string.downloads_label);

                : getTitle().toString();

    }

    }





    @Override

    @Override