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

Commit 176478c2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Make icon size are the same in factory reset account list."

parents 5b4b9de3 6b2bb39c

res/layout/master_clear_account.xml

+18 −5
Original line number Diff line number Diff line
@@ -14,10 +14,23 @@ 
     limitations under the License.

-->



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

<LinearLayout

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:gravity="center_vertical"

    android:orientation="horizontal"

    android:paddingStart="16dp"

    android:paddingEnd="16dp">

    <ImageView

        android:id="@android:id/icon"

        android:layout_width="56dp"

        android:layout_height="56dp"

        android:paddingEnd="8dp"/>

    <TextView

        android:id="@android:id/title"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

    android:textSize="18sp"

    android:drawablePadding="5dip"

    android:gravity="center_vertical" />

        android:textSize="18sp"/>

</LinearLayout>

src/com/android/settings/MasterClear.java

+4 −4
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ import android.view.View; 
import android.view.ViewGroup;

import android.widget.Button;

import android.widget.CheckBox;

import android.widget.ImageView;

import android.widget.LinearLayout;

import android.widget.TextView;
@@ -265,10 +266,9 @@ public class MasterClear extends OptionsMenuFragment { 
                    icon = context.getPackageManager().getDefaultActivityIcon();

                }



                TextView child = (TextView)inflater.inflate(R.layout.master_clear_account,

                        contents, false);

                child.setText(account.name);

                child.setCompoundDrawablesWithIntrinsicBounds(icon, null, null, null);

                View child = inflater.inflate(R.layout.master_clear_account, contents, false);

                ((ImageView) child.findViewById(android.R.id.icon)).setImageDrawable(icon);

                ((TextView) child.findViewById(android.R.id.title)).setText(account.name);

                contents.addView(child);

            }

        }