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

Commit 795f135a authored by Fabrice Di Meglio's avatar Fabrice Di Meglio
Browse files

Fix bug #3338957 (Account Picker and Account type picker need love) 

- update UI to match design requirements

Change-Id: Idb5dbea876eb7170a8c1f077a99cfe168d41f1e1
parent d8b9d7cd

core/java/android/accounts/ChooseAccountActivity.java

+109 −11
Original line number Diff line number Diff line
@@ -15,23 +15,39 @@ 
 */

package android.accounts;



import android.app.ListActivity;

import android.app.Activity;

import android.content.Context;

import android.content.pm.PackageManager;

import android.graphics.drawable.Drawable;

import android.os.Bundle;

import android.os.Parcelable;

import android.util.Log;

import android.view.LayoutInflater;

import android.view.View;

import android.view.ViewGroup;

import android.widget.AdapterView;

import android.widget.ArrayAdapter;

import android.widget.ImageView;

import android.widget.ListView;

import android.view.View;

import android.util.Log;

import android.widget.TextView;

import com.android.internal.R;



import java.util.HashMap;



/**

 * @hide

 */

public class ChooseAccountActivity extends ListActivity {

public class ChooseAccountActivity extends Activity {



    private static final String TAG = "AccountManager";



    private Parcelable[] mAccounts = null;

    private AccountManagerResponse mAccountManagerResponse = null;

    private Bundle mResult;



    private HashMap<String, AuthenticatorDescription> mTypeToAuthDescription

            = new HashMap<String, AuthenticatorDescription>();



    @Override

    public void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);
@@ -47,16 +63,51 @@ public class ChooseAccountActivity extends ListActivity { 
            return;

        }



        String[] mAccountNames = new String[mAccounts.length];

        getAuthDescriptions();



        AccountInfo[] mAccountInfos = new AccountInfo[mAccounts.length];

        for (int i = 0; i < mAccounts.length; i++) {

            mAccountNames[i] = ((Account) mAccounts[i]).name;

            mAccountInfos[i] = new AccountInfo(((Account) mAccounts[i]).name,

                    getDrawableForType(((Account) mAccounts[i]).type));

        }



        // Use an existing ListAdapter that will map an array

        // of strings to TextViews

        setListAdapter(new ArrayAdapter<String>(this,

                android.R.layout.simple_list_item_1, mAccountNames));

        getListView().setTextFilterEnabled(true);

        setContentView(R.layout.choose_account);



        // Setup the list

        ListView list = (ListView) findViewById(android.R.id.list);

        // Use an existing ListAdapter that will map an array of strings to TextViews

        list.setAdapter(new AccountArrayAdapter(this,

                android.R.layout.simple_list_item_1, mAccountInfos));

        list.setChoiceMode(ListView.CHOICE_MODE_SINGLE);

        list.setTextFilterEnabled(true);

        list.setOnItemClickListener(new AdapterView.OnItemClickListener() {

            public void onItemClick(AdapterView<?> parent, View v, int position, long id) {

                onListItemClick((ListView)parent, v, position, id);

            }

        });

    }



    private void getAuthDescriptions() {

        for(AuthenticatorDescription desc : AccountManager.get(this).getAuthenticatorTypes()) {

            mTypeToAuthDescription.put(desc.type, desc);

        }

    }



    private Drawable getDrawableForType(String accountType) {

        Drawable icon = null;

        if(mTypeToAuthDescription.containsKey(accountType)) {

            try {

                AuthenticatorDescription desc = mTypeToAuthDescription.get(accountType);

                Context authContext = createPackageContext(desc.packageName, 0);

                icon = authContext.getResources().getDrawable(desc.iconId);

            } catch (PackageManager.NameNotFoundException e) {

                // Nothing we can do much here, just log

                if (Log.isLoggable(TAG, Log.WARN)) {

                    Log.w(TAG, "No icon for account type " + accountType);

                }

            }

        }

        return icon;

    }



    protected void onListItemClick(ListView l, View v, int position, long id) {
@@ -79,4 +130,51 @@ public class ChooseAccountActivity extends ListActivity { 
        }

        super.finish();

    }



    private static class AccountInfo {

        final String name;

        final Drawable drawable;



        AccountInfo(String name, Drawable drawable) {

            this.name = name;

            this.drawable = drawable;

        }

    }



    private static class ViewHolder {

        ImageView icon;

        TextView text;

    }



    private static class AccountArrayAdapter extends ArrayAdapter<AccountInfo> {

        private LayoutInflater mLayoutInflater;

        private AccountInfo[] mInfos;



        public AccountArrayAdapter(Context context, int textViewResourceId, AccountInfo[] infos) {

            super(context, textViewResourceId, infos);

            mInfos = infos;

            mLayoutInflater = (LayoutInflater) context.getSystemService(

                    Context.LAYOUT_INFLATER_SERVICE);

        }



        @Override

        public View getView(int position, View convertView, ViewGroup parent) {

            ViewHolder holder;



            if (convertView == null) {

                convertView = mLayoutInflater.inflate(R.layout.choose_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);

                convertView.setTag(holder);

            } else {

                holder = (ViewHolder) convertView.getTag();

            }



            holder.text.setText(mInfos[position].name);

            holder.icon.setImageDrawable(mInfos[position].drawable);



            return convertView;

        }

    }

}

core/res/AndroidManifest.xml

+3 −1
Original line number Diff line number Diff line
@@ -1341,7 +1341,9 @@ 


        <activity android:name="android.accounts.ChooseAccountActivity"

                android:excludeFromRecents="true"

                android:exported="true">

                android:exported="true"

                android:theme="@android:style/Theme.Holo.Dialog"

                android:label="@string/choose_account_label">

        </activity>



        <activity android:name="android.accounts.GrantCredentialsPermissionActivity"

core/res/res/layout/choose_account.xml

0 → 100644
+35 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/* //device/apps/common/assets/res/layout/list_content.xml

**

** Copyright 2011, The Android Open Source Project

**

** Licensed under the Apache License, Version 2.0 (the "License");

** you may not use this file except in compliance with the License.

** You may obtain a copy of the License at

**

**     http://www.apache.org/licenses/LICENSE-2.0

**

** Unless required by applicable law or agreed to in writing, software

** distributed under the License is distributed on an "AS IS" BASIS,

** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

** See the License for the specific language governing permissions and

** limitations under the License.

*/

-->

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical"

    android:paddingLeft="16dip"

    android:paddingRight="16dip">



    <ListView xmlns:android="http://schemas.android.com/apk/res/android"

        android:id="@android:id/list"

        android:layout_width="match_parent"

        android:layout_height="0dip"

        android:layout_weight="1"

        android:drawSelectorOnTop="false"

        android:scrollbarAlwaysDrawVerticalTrack="true" />



</LinearLayout>

core/res/res/layout/choose_account_row.xml

0 → 100644
+38 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

 * Copyright (C) 2011 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

-->



<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:paddingLeft="16dip"

    android:paddingRight="16dip"

    android:orientation="horizontal" >



   <ImageView android:id="@+id/account_row_icon"

        android:layout_width="wrap_content"

        android:layout_height="fill_parent"

        android:paddingRight="8dip" />



    <TextView xmlns:android="http://schemas.android.com/apk/res/android"

        android:id="@+id/account_row_text"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:textAppearance="?android:attr/textAppearanceMedium"

        android:gravity="center_vertical"

        android:minHeight="?android:attr/listPreferredItemHeight" />



</LinearLayout>
 
 No newline at end of file

core/res/res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -2684,4 +2684,7 @@ 
    <string name="vpn_notification_title_disconnected"><xliff:g id="profilename" example="Home PPTP">%s</xliff:g> VPN disconnected</string>

    <!-- Message of the VPN service notification: Hint to reconnect VPN [CHAR LIMIT=NONE] -->

    <string name="vpn_notification_hint_disconnected">Touch to reconnect to a VPN.</string>



    <!-- Choose Account Activity label -->

    <string name="choose_account_label">Select an account</string>

</resources>