From b04fe4e82abb073b4e5d82563b0882cea0dcc139 Mon Sep 17 00:00:00 2001 From: Fred Quintana Date: Fri, 16 Sep 2011 21:17:21 -0700 Subject: [PATCH] Continuation of the unified account chooser flow. - made the UI match the spec - added ability to force the account chooser to appear - added ability to pass in a description that will override the stock one - added ability to pass in requiredFeatures for addAccount - added ability to pass in an authTokenType for addAccount Bug: 5293377 Change-Id: I243c0fd6598c943b1f65753e1f5d3c86629f64f5 --- api/14.txt | 2 +- api/current.txt | 2 +- .../java/android/accounts/AccountManager.java | 29 +++++- .../accounts/ChooseAccountTypeActivity.java | 14 +-- .../ChooseTypeAndAccountActivity.java | 85 +++++++++++++++--- core/res/AndroidManifest.xml | 9 +- .../drawable-hdpi/ic_checkmark_holo_light.png | Bin 0 -> 924 bytes .../drawable-mdpi/ic_checkmark_holo_light.png | Bin 0 -> 658 bytes .../ic_checkmark_holo_light.png | Bin 0 -> 1159 bytes core/res/res/layout/choose_account_type.xml | 49 ++++++++++ .../layout/choose_selected_account_row.xml | 46 ++++++++++ .../res/layout/choose_type_and_account.xml | 37 ++++++-- core/res/res/values/strings.xml | 11 ++- 13 files changed, 245 insertions(+), 39 deletions(-) create mode 100644 core/res/res/drawable-hdpi/ic_checkmark_holo_light.png create mode 100644 core/res/res/drawable-mdpi/ic_checkmark_holo_light.png create mode 100644 core/res/res/drawable-xhdpi/ic_checkmark_holo_light.png create mode 100644 core/res/res/layout/choose_account_type.xml create mode 100644 core/res/res/layout/choose_selected_account_row.xml diff --git a/api/14.txt b/api/14.txt index 0aa94b2d2e717..45bb8823753ff 100644 --- a/api/14.txt +++ b/api/14.txt @@ -2072,7 +2072,7 @@ package android.accounts { method public java.lang.String getUserData(android.accounts.Account, java.lang.String); method public android.accounts.AccountManagerFuture hasFeatures(android.accounts.Account, java.lang.String[], android.accounts.AccountManagerCallback, android.os.Handler); method public void invalidateAuthToken(java.lang.String, java.lang.String); - method public static android.content.Intent newChooseAccountIntent(android.accounts.Account, java.util.ArrayList, java.lang.String[], android.os.Bundle); + method public static android.content.Intent newChooseAccountIntent(android.accounts.Account, java.util.ArrayList, java.lang.String[], boolean, java.lang.String, java.lang.String, java.lang.String[], android.os.Bundle); method public java.lang.String peekAuthToken(android.accounts.Account, java.lang.String); method public android.accounts.AccountManagerFuture removeAccount(android.accounts.Account, android.accounts.AccountManagerCallback, android.os.Handler); method public void removeOnAccountsUpdatedListener(android.accounts.OnAccountsUpdateListener); diff --git a/api/current.txt b/api/current.txt index 0aa94b2d2e717..45bb8823753ff 100644 --- a/api/current.txt +++ b/api/current.txt @@ -2072,7 +2072,7 @@ package android.accounts { method public java.lang.String getUserData(android.accounts.Account, java.lang.String); method public android.accounts.AccountManagerFuture hasFeatures(android.accounts.Account, java.lang.String[], android.accounts.AccountManagerCallback, android.os.Handler); method public void invalidateAuthToken(java.lang.String, java.lang.String); - method public static android.content.Intent newChooseAccountIntent(android.accounts.Account, java.util.ArrayList, java.lang.String[], android.os.Bundle); + method public static android.content.Intent newChooseAccountIntent(android.accounts.Account, java.util.ArrayList, java.lang.String[], boolean, java.lang.String, java.lang.String, java.lang.String[], android.os.Bundle); method public java.lang.String peekAuthToken(android.accounts.Account, java.lang.String); method public android.accounts.AccountManagerFuture removeAccount(android.accounts.Account, android.accounts.AccountManagerCallback, android.os.Handler); method public void removeOnAccountsUpdatedListener(android.accounts.OnAccountsUpdateListener); diff --git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index 530ecf17d9802..3d3a37355a984 100644 --- a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java @@ -1790,22 +1790,43 @@ public class AccountManager { * @param allowableAccountTypes an optional string array of account types. These are used * both to filter the shown accounts and to filter the list of account types that are shown * when adding an account. - * @param addAccountOptions This {@link Bundle} is passed as the addAccount options - * @return an {@link Intent} that can be used to launch the ChooseAccount activity flow. + * @param alwaysPromptForAccount if set the account chooser screen is always shown, otherwise + * it is only shown when there is more than one account from which to choose + * @param descriptionOverrideText if set, this string is used as the description in the + * accounts chooser screen rather than the default + * @param addAccountAuthTokenType This {@link Bundle} is passed as the {@link #addAccount} + * authTokenType + * @param addAccountRequiredFeatures This {@link Bundle} is passed as the {@link #addAccount} + * requiredFeatures + * @param addAccountOptions This {@link Bundle} is passed as the {@link #addAccount} options + * @return an {@link Intent} that can be used to launch the ChooseAccount activity flow. */ static public Intent newChooseAccountIntent(Account selectedAccount, ArrayList allowableAccounts, String[] allowableAccountTypes, + boolean alwaysPromptForAccount, + String descriptionOverrideText, + String addAccountAuthTokenType, + String[] addAccountRequiredFeatures, Bundle addAccountOptions) { Intent intent = new Intent(); intent.setClassName("android", "android.accounts.ChooseTypeAndAccountActivity"); intent.putExtra(ChooseTypeAndAccountActivity.EXTRA_ALLOWABLE_ACCOUNTS_ARRAYLIST, allowableAccounts); - intent.putExtra(ChooseTypeAndAccountActivity.EXTRA_ALLOWABLE_ACCOUNT_TYPES_ARRAYLIST, - allowableAccountTypes != null ? Lists.newArrayList(allowableAccountTypes) : 0); + intent.putExtra(ChooseTypeAndAccountActivity.EXTRA_ALLOWABLE_ACCOUNT_TYPES_STRING_ARRAY, + allowableAccountTypes); intent.putExtra(ChooseTypeAndAccountActivity.EXTRA_ADD_ACCOUNT_OPTIONS_BUNDLE, addAccountOptions); intent.putExtra(ChooseTypeAndAccountActivity.EXTRA_SELECTED_ACCOUNT, selectedAccount); + intent.putExtra(ChooseTypeAndAccountActivity.EXTRA_ALWAYS_PROMPT_FOR_ACCOUNT, + alwaysPromptForAccount); + intent.putExtra(ChooseTypeAndAccountActivity.EXTRA_DESCRIPTION_TEXT_OVERRIDE, + descriptionOverrideText); + intent.putExtra(ChooseTypeAndAccountActivity.EXTRA_ADD_ACCOUNT_AUTH_TOKEN_TYPE_STRING, + addAccountAuthTokenType); + intent.putExtra( + ChooseTypeAndAccountActivity.EXTRA_ADD_ACCOUNT_REQUIRED_FEATURES_STRING_ARRAY, + addAccountRequiredFeatures); return intent; } diff --git a/core/java/android/accounts/ChooseAccountTypeActivity.java b/core/java/android/accounts/ChooseAccountTypeActivity.java index 836164cbc784b..f53e6f3733e3e 100644 --- a/core/java/android/accounts/ChooseAccountTypeActivity.java +++ b/core/java/android/accounts/ChooseAccountTypeActivity.java @@ -52,12 +52,12 @@ public class ChooseAccountTypeActivity extends Activity implements AccountManage @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.choose_account); + setContentView(R.layout.choose_account_type); // Read the validAccountTypes, if present, and add them to the setOfAllowableAccountTypes Set setOfAllowableAccountTypes = null; ArrayList validAccountTypes = getIntent().getStringArrayListExtra( - ChooseTypeAndAccountActivity.EXTRA_ALLOWABLE_ACCOUNT_TYPES_ARRAYLIST); + ChooseTypeAndAccountActivity.EXTRA_ALLOWABLE_ACCOUNT_TYPES_STRING_ARRAY); if (validAccountTypes != null) { setOfAllowableAccountTypes = new HashSet(validAccountTypes.size()); for (String type : validAccountTypes) { @@ -138,10 +138,14 @@ public class ChooseAccountTypeActivity extends Activity implements AccountManage protected void runAddAccountForAuthenticator(AuthInfo authInfo) { Log.d(TAG, "selected account type " + authInfo.name); - Bundle options = getIntent().getBundleExtra( + final Bundle options = getIntent().getBundleExtra( ChooseTypeAndAccountActivity.EXTRA_ADD_ACCOUNT_OPTIONS_BUNDLE); - AccountManager.get(this).addAccount(authInfo.desc.type, null, null, options, - this, this, null); + final String[] requiredFeatures = getIntent().getStringArrayExtra( + ChooseTypeAndAccountActivity.EXTRA_ADD_ACCOUNT_REQUIRED_FEATURES_STRING_ARRAY); + final String authTokenType = getIntent().getStringExtra( + ChooseTypeAndAccountActivity.EXTRA_ADD_ACCOUNT_AUTH_TOKEN_TYPE_STRING); + AccountManager.get(this).addAccount(authInfo.desc.type, authTokenType, requiredFeatures, + options, this, this, null /* Handler */); } public void run(final AccountManagerFuture accountManagerFuture) { diff --git a/core/java/android/accounts/ChooseTypeAndAccountActivity.java b/core/java/android/accounts/ChooseTypeAndAccountActivity.java index a903399c5fc88..b4030b9cbfae8 100644 --- a/core/java/android/accounts/ChooseTypeAndAccountActivity.java +++ b/core/java/android/accounts/ChooseTypeAndAccountActivity.java @@ -23,6 +23,7 @@ import android.content.res.Resources; import android.graphics.drawable.Drawable; import android.os.Bundle; import android.os.Parcelable; +import android.text.TextUtils; import android.util.Log; import android.view.LayoutInflater; import android.view.View; @@ -57,25 +58,68 @@ public class ChooseTypeAndAccountActivity extends Activity { * that match the types in this list, if this parameter is supplied. This list is also * used to filter the allowable account types if add account is selected. */ - public static final String EXTRA_ALLOWABLE_ACCOUNT_TYPES_ARRAYLIST = "allowableAccountTypes"; + public static final String EXTRA_ALLOWABLE_ACCOUNT_TYPES_STRING_ARRAY = "allowableAccountTypes"; /** - * This is passed as the options bundle in AccountManager.addAccount() if it is called. + * This is passed as the addAccountOptions parameter in AccountManager.addAccount() + * if it is called. */ public static final String EXTRA_ADD_ACCOUNT_OPTIONS_BUNDLE = "addAccountOptions"; + /** + * This is passed as the requiredFeatures parameter in AccountManager.addAccount() + * if it is called. + */ + public static final String EXTRA_ADD_ACCOUNT_REQUIRED_FEATURES_STRING_ARRAY = + "addAccountRequiredFeatures"; + + /** + * This is passed as the authTokenType string in AccountManager.addAccount() + * if it is called. + */ + public static final String EXTRA_ADD_ACCOUNT_AUTH_TOKEN_TYPE_STRING = "authTokenType"; + /** * If set then the specified account is already "selected". */ public static final String EXTRA_SELECTED_ACCOUNT = "selectedAccount"; + /** + * If true then display the account selection list even if there is just + * one account to choose from. boolean. + */ + public static final String EXTRA_ALWAYS_PROMPT_FOR_ACCOUNT = + "alwaysPromptForAccount"; + + /** + * If set then this string willb e used as the description rather than + * the default. + */ + public static final String EXTRA_DESCRIPTION_TEXT_OVERRIDE = + "descriptionTextOverride"; + private ArrayList mAccountInfos; @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.choose_type_and_account); + + // save some items we use frequently final AccountManager accountManager = AccountManager.get(this); + final Intent intent = getIntent(); + + // override the description text if supplied + final String descriptionOverride = + intent.getStringExtra(EXTRA_DESCRIPTION_TEXT_OVERRIDE); + if (!TextUtils.isEmpty(descriptionOverride)) { + ((TextView)findViewById(R.id.description)).setText(descriptionOverride); + } + + // If the selected account matches one in the list we will place a + // checkmark next to it. + final Account selectedAccount = + (Account)intent.getParcelableExtra(EXTRA_SELECTED_ACCOUNT); // build an efficiently queryable map of account types to authenticator descriptions final HashMap typeToAuthDescription = @@ -87,7 +131,7 @@ public class ChooseTypeAndAccountActivity extends Activity { // Read the validAccounts, if present, and add them to the setOfAllowableAccounts Set setOfAllowableAccounts = null; final ArrayList validAccounts = - getIntent().getParcelableArrayListExtra(EXTRA_ALLOWABLE_ACCOUNTS_ARRAYLIST); + intent.getParcelableArrayListExtra(EXTRA_ALLOWABLE_ACCOUNTS_ARRAYLIST); if (validAccounts != null) { setOfAllowableAccounts = new HashSet(validAccounts.size()); for (Parcelable parcelable : validAccounts) { @@ -98,7 +142,7 @@ public class ChooseTypeAndAccountActivity extends Activity { // Read the validAccountTypes, if present, and add them to the setOfAllowableAccountTypes Set setOfAllowableAccountTypes = null; final ArrayList validAccountTypes = - getIntent().getStringArrayListExtra(EXTRA_ALLOWABLE_ACCOUNT_TYPES_ARRAYLIST); + intent.getStringArrayListExtra(EXTRA_ALLOWABLE_ACCOUNT_TYPES_STRING_ARRAY); if (validAccountTypes != null) { setOfAllowableAccountTypes = new HashSet(validAccountTypes.size()); for (String type : validAccountTypes) { @@ -121,7 +165,8 @@ public class ChooseTypeAndAccountActivity extends Activity { continue; } mAccountInfos.add(new AccountInfo(account, - getDrawableForType(typeToAuthDescription, account.type))); + getDrawableForType(typeToAuthDescription, account.type), + account.equals(selectedAccount))); } // If there are no allowable accounts go directly to add account @@ -131,7 +176,8 @@ public class ChooseTypeAndAccountActivity extends Activity { } // if there is only one allowable account return it - if (mAccountInfos.size() == 1) { + if (!intent.getBooleanExtra(EXTRA_ALWAYS_PROMPT_FOR_ACCOUNT, false) + && mAccountInfos.size() == 1) { Account account = mAccountInfos.get(0).account; setResultAndFinish(account.name, account.type); return; @@ -143,7 +189,6 @@ public class ChooseTypeAndAccountActivity extends Activity { list.setAdapter(new AccountArrayAdapter(this, android.R.layout.simple_list_item_1, mAccountInfos)); list.setChoiceMode(ListView.CHOICE_MODE_SINGLE); - list.setTextFilterEnabled(false); list.setOnItemClickListener(new AdapterView.OnItemClickListener() { public void onItemClick(AdapterView parent, View v, int position, long id) { onListItemClick((ListView)parent, v, position, id); @@ -173,10 +218,12 @@ public class ChooseTypeAndAccountActivity extends Activity { return; } } + Log.d(TAG, "ChooseTypeAndAccountActivity.onActivityResult: canceled"); setResult(Activity.RESULT_CANCELED); finish(); } + private Drawable getDrawableForType( final HashMap typeToAuthDescription, String accountType) { @@ -212,31 +259,40 @@ public class ChooseTypeAndAccountActivity extends Activity { bundle.putString(AccountManager.KEY_ACCOUNT_NAME, accountName); bundle.putString(AccountManager.KEY_ACCOUNT_TYPE, accountType); setResult(Activity.RESULT_OK, new Intent().putExtras(bundle)); + Log.d(TAG, "ChooseTypeAndAccountActivity.setResultAndFinish: " + + "selected account " + accountName + ", " + accountType); finish(); } private void startChooseAccountTypeActivity() { final Intent intent = new Intent(this, ChooseAccountTypeActivity.class); - intent.putStringArrayListExtra(EXTRA_ALLOWABLE_ACCOUNT_TYPES_ARRAYLIST, - getIntent().getStringArrayListExtra(EXTRA_ALLOWABLE_ACCOUNT_TYPES_ARRAYLIST)); + intent.putStringArrayListExtra(EXTRA_ALLOWABLE_ACCOUNT_TYPES_STRING_ARRAY, + getIntent().getStringArrayListExtra(EXTRA_ALLOWABLE_ACCOUNT_TYPES_STRING_ARRAY)); intent.putExtra(EXTRA_ADD_ACCOUNT_OPTIONS_BUNDLE, - getIntent().getBundleExtra(EXTRA_ALLOWABLE_ACCOUNT_TYPES_ARRAYLIST)); + getIntent().getBundleExtra(EXTRA_ADD_ACCOUNT_OPTIONS_BUNDLE)); + intent.putExtra(EXTRA_ADD_ACCOUNT_REQUIRED_FEATURES_STRING_ARRAY, + getIntent().getStringArrayExtra(EXTRA_ADD_ACCOUNT_REQUIRED_FEATURES_STRING_ARRAY)); + intent.putExtra(EXTRA_ADD_ACCOUNT_AUTH_TOKEN_TYPE_STRING, + getIntent().getStringArrayExtra(EXTRA_ADD_ACCOUNT_AUTH_TOKEN_TYPE_STRING)); startActivityForResult(intent, 0); } private static class AccountInfo { final Account account; final Drawable drawable; + private final boolean checked; - AccountInfo(Account account, Drawable drawable) { + AccountInfo(Account account, Drawable drawable, boolean checked) { this.account = account; this.drawable = drawable; + this.checked = checked; } } private static class ViewHolder { ImageView icon; TextView text; + ImageView checkmark; } private static class AccountArrayAdapter extends ArrayAdapter { @@ -256,10 +312,11 @@ public class ChooseTypeAndAccountActivity extends Activity { ViewHolder holder; if (convertView == null) { - convertView = mLayoutInflater.inflate(R.layout.choose_account_row, null); + convertView = mLayoutInflater.inflate(R.layout.choose_selected_account_row, null); holder = new ViewHolder(); holder.text = (TextView) convertView.findViewById(R.id.account_row_text); holder.icon = (ImageView) convertView.findViewById(R.id.account_row_icon); + holder.checkmark = (ImageView) convertView.findViewById(R.id.account_row_checkmark); convertView.setTag(holder); } else { holder = (ViewHolder) convertView.getTag(); @@ -267,7 +324,9 @@ public class ChooseTypeAndAccountActivity extends Activity { holder.text.setText(mInfos.get(position).account.name); holder.icon.setImageDrawable(mInfos.get(position).drawable); - + final int displayCheckmark = + mInfos.get(position).checked ? View.VISIBLE : View.INVISIBLE; + holder.checkmark.setVisibility(displayCheckmark); return convertView; } } diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 80741eb05afa4..9755f227a63f1 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -1533,19 +1533,14 @@ - - - - diff --git a/core/res/res/drawable-hdpi/ic_checkmark_holo_light.png b/core/res/res/drawable-hdpi/ic_checkmark_holo_light.png new file mode 100644 index 0000000000000000000000000000000000000000..2c6719b796bc130546d080a42e4cf8298797e624 GIT binary patch literal 924 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}a}trX+877l!}s{b%+Ad7K3vk;OpT z1B~5HX4`=T%L*LRfizez!?|}o;XrLmJY5_^A`ZX3=D#8&RpR)^^FNEvUv*u$vRf>1 ztyV^8-Y5QDoi02fznEDATNDIad!}?rrT*tpTf`CU;x);ebzyn1c;;Kb7!Ey?mfQQL zx_-Yi(^&7>nKRYz@9Zp3oAdNf*mHyDfB)S}pZC0We*4B_Qrc3YD>gk?d#ldNt*bw3 z&)Ic-MongRK^+%fxEMBZc-5>)>^*VJt5oYPjt%F1ZYJMr**_y~&QdH>C(qmzo_EOF&-<#=p9yS?cBL2XcAnY2@AWbMQa+}dM~kLEF?#q?P9a5tkn4z8V;aB0Y~4|DFX znYJTy`OPp9s~?9d^G~Jr{VYkXv2NlL5ek3vdH$ivX*oHrf)CD5{UQAKVY5o}t}CL| ze^-BKk?h~5JL|{hdq(P?7fuGs$V`#Hw&dTIKtIynO4K14+BRNDRThbB6Hv|ZM9AgMc(|L1+J_+JSHHRm^~ zZm77HDjgy#l+Dxi{$|0tTRg2-)?}y2X8PtdKb$VRr)gW>j=Sd5zlU&YAJP3|5S3W+ zW_@p;>9vT{ujPsipH1=6KmHV$cvVYWBT7;dOH!?pi&B9UgOP!ufv%yEu7P2Qp}Cc@ zp_Pe=u7QP>fq_BUkH;t)a`RI%(<*UmaMX5)2WpT6*$|wcR#Ki=l*-_klAn~S;F+74 ao*I;zm{M7IGSvpCh{4m<&t;ucLK6UDSEf4v literal 0 HcmV?d00001 diff --git a/core/res/res/drawable-mdpi/ic_checkmark_holo_light.png b/core/res/res/drawable-mdpi/ic_checkmark_holo_light.png new file mode 100644 index 0000000000000000000000000000000000000000..744e964477bd31c148e1644d431a304b5229fed5 GIT binary patch literal 658 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE0wix1Z>k4UOiAAEE)4(M`_JqL@;D1TB8!2v z2N=7Z%(epwmK8Xr18D^?ZvQoBE&~JOEKe855Rc<;ubj=gk|1*Ihbd-DAF)me65Ob8YiHj_?m(A|-UW|C1lNX$urA#tyoX`+qx6mIW*u=&Gs^T` zZv1Lfx~Sj1|HbD%Kbx~b^uNs3gMH>jY90$ZU+90BWujkmqBt?ZX7k;^$mPxZSi4@C zil4RYU2$>0Lt}d0>@6u1_jLbixR*ck%e@umPR3_1H$O1FAZE z>#Uw`zH$0%#quN-!__bMJ+9-t^eA`2j-+Ga$#H)=%bzJ6p0mAgNAm0~bI*P}omL|n z{`hEm4$I2DQQxXF4s|IAtLRxio_%9;)}EToiAUsg*=>v-F5eX@KId!fo0o1CyPGE+ z$5URbRuPL%hTQy= z%(P0}8XUD9;(;0@K{f>ErbP0 Hl+XkKxegY@ literal 0 HcmV?d00001 diff --git a/core/res/res/drawable-xhdpi/ic_checkmark_holo_light.png b/core/res/res/drawable-xhdpi/ic_checkmark_holo_light.png new file mode 100644 index 0000000000000000000000000000000000000000..1607f35857df6796c7c8cf13b2c4c3b089cb988e GIT binary patch literal 1159 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I0wfs{c7_5;rX+877l!}s{b%+Ad7K3vk;OpT z1B~5HX4`=T%L*LRfwTh{zxw&27Bt1^gYrg`|Mt? zycS=%@a5kRyRNjaQfg@m^30mf?-%-jU zyQA^Wo9ioYXoz*}N#4F?>pte+4tY=S=Uh@V^t!kGcD?Ce*}LpTo8wnsT2X&~Mz)Fn zerC3!-S?zKYlT8p<)uEq&-s#Tc45K#sK?5+NujFlZ;Q5;zAZoC(DzSG_?Pi7PV48( z@)tL%{o?#9`Pb0;+2Z`!jWU0=9-DbDsq(41V}EGp%XHHTf6Ll;a*MC#-*{`s*`!cg zt+FexpL-j;KAI)&GxPnu^b6|^@)Q=^C+^-azG!~pf|zR64ToZbSaqJf2)9gASp5G+ z^4DLjLR(_iYzvjUkbh!|htd32wO@_GYYqFwtuX7RcR&92d#`r_kiM*B0VithIxcTDX0XT12Ij+gyq2c?o*#!eG& z$g177-rdSp`@qe;C*{k0zw6?@?@BhwtqMwyy{bMTBK?4*edjFyBFkSFcDt!+SWaDT zAO3+Y?OjXbiOr{&7T$QP^)7qc1*iSGi|tdd$agQ!k7VxcW_RjbZrdJl@;%$!P$Bc$ z^=|uZXa5y%i(R*NdeY|kw;ghMCO&@~F4}c>*`vC`yqJXtc=>M6yI7xjB{ea3r`~A? zze1Ib_q%7dcC*brsl&30DgXA=i}k4|mM*<;K6Sygkdxl?PU+lP^~iCf#^U+w{@+s8 z)9tO}W7ZX$_r>e*p$(UvR&MV}{d&LR#?hsh&gU=4dl>qA$;?(x=~=J#n?8DU>E(07 z3rUIduN!gi|8XyDWynd(=$Ht;zlYdfiSgag7WBHCxq4N|$x3HEo&GvTpsC-g=C0BE zG*`DSTCdiSxs;pztswVOrQo*LUr+ls8YiARB*)%bx8>;hw+qq@&$q3d) zooilKv44$rtY%f5&ZMKZ;!BvqUp@a*c12%n>;9Xk9RK!jhh~mU|9|ZHr9LT7Em#f% z^QdZxYeY#(Vo9o1a#1RfVlXl=G}JXP)-|#SF*L9;F}5-^(ls!*GBDU*6nF|nLvDUb zW?Cg~4d?VgTe~ HDWM4fT?rR= literal 0 HcmV?d00001 diff --git a/core/res/res/layout/choose_account_type.xml b/core/res/res/layout/choose_account_type.xml new file mode 100644 index 0000000000000..db96dc118b3a1 --- /dev/null +++ b/core/res/res/layout/choose_account_type.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + diff --git a/core/res/res/layout/choose_selected_account_row.xml b/core/res/res/layout/choose_selected_account_row.xml new file mode 100644 index 0000000000000..d88750dcc28b2 --- /dev/null +++ b/core/res/res/layout/choose_selected_account_row.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/core/res/res/layout/choose_type_and_account.xml b/core/res/res/layout/choose_type_and_account.xml index 8be01b42b7887..5a0512633402f 100644 --- a/core/res/res/layout/choose_type_and_account.xml +++ b/core/res/res/layout/choose_type_and_account.xml @@ -24,21 +24,44 @@ android:paddingLeft="16dip" android:paddingRight="16dip"> - + + + + + +