Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '5088fc858c5a7f234310b51c0fa87a9a617eef7d':
  Specialized prompting when 'home' has become ambiguous
This commit is contained in:
Christopher Tate
2013-10-01 13:40:56 -07:00
committed by Android Git Automerger
parent eba784f084 5088fc858c
commit e40b303342
3 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/java/com/android/internal/app/ResolverActivity.java
View File

@@ -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);
}

2
core/res/res/values/strings.xml
View File

@@ -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. -->

1
core/res/res/values/symbols.xml
View File

@@ -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" />