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

Commit e40b3033 authored by Christopher Tate's avatar Christopher Tate Committed by Android Git Automerger
Browse files

am 5088fc85: Merge "Specialized prompting when \'home\' has become ambiguous" into klp-dev 

* commit '5088fc85':
  Specialized prompting when 'home' has become ambiguous
parents eba784f0 5088fc85

core/java/com/android/internal/app/ResolverActivity.java

+14 −2
Original line number Diff line number Diff line
@@ -100,8 +100,20 @@ public class ResolverActivity extends AlertActivity implements AdapterView.OnIte 


    @Override

    protected void onCreate(Bundle savedInstanceState) {

        onCreate(savedInstanceState, makeMyIntent(),

                getResources().getText(com.android.internal.R.string.whichApplication),

        // Use a specialized prompt when we're handling the 'Home' app startActivity()

        final int titleResource;

        final Intent intent = makeMyIntent();

        final Set<String> categories = intent.getCategories();

        if (Intent.ACTION_MAIN.equals(intent.getAction())

                && categories != null

                && categories.size() == 1

                && categories.contains(Intent.CATEGORY_HOME)) {

            titleResource = com.android.internal.R.string.whichHomeApplication;

        } else {

            titleResource = com.android.internal.R.string.whichApplication;

        }



        onCreate(savedInstanceState, intent, getResources().getText(titleResource),

                null, null, true);

    }

core/res/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -3182,6 +3182,8 @@ 


    <!-- Title of intent resolver dialog when selecting an application to run. -->

    <string name="whichApplication">Complete action using</string>

    <!-- Title of intent resolver dialog when selecting a HOME application to run. -->

    <string name="whichHomeApplication">Select a home app</string>

    <!-- Option to always use the selected application resolution in the future. See the "Complete action using" dialog title-->

    <string name="alwaysUse">Use by default for this action.</string>

    <!-- Text displayed when the user selects the check box for setting default application.  See the "Use by default for this action" check box. -->

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -800,6 +800,7 @@ 
  <java-symbol type="string" name="web_user_agent_target_content" />

  <java-symbol type="string" name="webpage_unresponsive" />

  <java-symbol type="string" name="whichApplication" />

  <java-symbol type="string" name="whichHomeApplication" />

  <java-symbol type="string" name="wifi_available_sign_in" />

  <java-symbol type="string" name="network_available_sign_in" />

  <java-symbol type="string" name="network_available_sign_in_detailed" />