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

am 0060deb6: Merge "Move the account picker class name to a config resource." into jb-mr2-dev

Browse Source 
* commit '0060deb6edecd47967e8c05d41595170188a49fe':
  Move the account picker class name to a config resource.
This commit is contained in:
Amith Yamasani
2013-03-14 19:20:40 +00:00
committed by Android Git Automerger
parent 1a5bbe4675 0060deb6ed
commit 2d5e1227f6
3 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/java/android/accounts/AccountManager.java
View File

@@ -18,9 +18,11 @@ package android.accounts;
import android.app.Activity;
import android.content.Intent;
import android.content.ComponentName;
import android.content.Context;
import android.content.IntentFilter;
import android.content.BroadcastReceiver;
import android.content.res.Resources;
import android.database.SQLException;
import android.os.Bundle;
import android.os.Handler;
@@ -44,6 +46,7 @@ import java.util.concurrent.TimeUnit;
import java.util.HashMap;
import java.util.Map;
import com.android.internal.R;
import com.google.android.collect.Maps;
/**
@@ -1777,8 +1780,11 @@ public class AccountManager {
};
// have many accounts, launch the chooser
Intent intent = new Intent();
intent.setClassName("android",
"android.accounts.ChooseAccountActivity");
ComponentName componentName = ComponentName.unflattenFromString(
Resources.getSystem().getString(
R.string.config_chooseAccountActivity));
intent.setClassName(componentName.getPackageName(),
componentName.getClassName());
intent.putExtra(KEY_ACCOUNTS, accounts);
intent.putExtra(KEY_ACCOUNT_MANAGER_RESPONSE,
new AccountManagerResponse(chooseResponse));
@@ -1934,7 +1940,10 @@ public class AccountManager {
String[] addAccountRequiredFeatures,
Bundle addAccountOptions) {
Intent intent = new Intent();
intent.setClassName("android", "android.accounts.ChooseTypeAndAccountActivity");
ComponentName componentName = ComponentName.unflattenFromString(
Resources.getSystem().getString(R.string.config_chooseTypeAndAccountActivity));
intent.setClassName(componentName.getPackageName(),
componentName.getClassName());
intent.putExtra(ChooseTypeAndAccountActivity.EXTRA_ALLOWABLE_ACCOUNTS_ARRAYLIST,
allowableAccounts);
intent.putExtra(ChooseTypeAndAccountActivity.EXTRA_ALLOWABLE_ACCOUNT_TYPES_STRING_ARRAY,

10
core/res/res/values/config.xml
View File

@@ -1031,4 +1031,14 @@
<!-- Flag indicating if the speed up audio on mt call code should be executed -->
<bool name="config_speed_up_audio_on_mt_calls">false</bool>
<!-- Class name of the framework account picker activity.
Can be customized for other product types -->
<string name="config_chooseAccountActivity"
>android/android.accounts.ChooseAccountActivity</string>
<!-- Class name of the account type and account picker activity.
Can be customized for other product types -->
<string name="config_chooseTypeAndAccountActivity"
>android/android.accounts.ChooseTypeAndAccountActivity</string>
</resources>

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

@@ -863,6 +863,9 @@
<java-symbol type="string" name="media_route_status_available" />
<java-symbol type="string" name="media_route_status_not_available" />
<java-symbol type="string" name="owner_name" />
<java-symbol type="string" name="config_chooseAccountActivity" />
<java-symbol type="string" name="config_chooseTypeAndAccountActivity" />
<java-symbol type="plurals" name="abbrev_in_num_days" />
<java-symbol type="plurals" name="abbrev_in_num_hours" />