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

Commit 16a9b14f authored by Amith Yamasani's avatar Amith Yamasani Committed by Android (Google) Code Review
Browse files

Merge "Don't append list of accounts every time we return to this screen."

parents 2407efcf 3f45de55

res/layout/master_clear.xml

+4 −1
Original line number Original line Diff line number Diff line
@@ -51,7 +51,10 @@ 
                    android:layout_width="wrap_content"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_height="wrap_content"

                    android:orientation="vertical"

                    android:orientation="vertical"

                    android:visibility="gone" />

                    android:visibility="gone">

                <!-- Do not add any children here as they will be removed in the MasterClear.java

                    code. A list of accounts will be inserted programmatically. -->

            </LinearLayout>

            <TextView android:id="@+id/erase_external_option_text"

            <TextView android:id="@+id/erase_external_option_text"

                android:layout_width="match_parent"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_height="wrap_content"

src/com/android/settings/MasterClear.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -175,6 +175,7 @@ public class MasterClear extends Fragment { 
    private void loadAccountList() {

    private void loadAccountList() {

        View accountsLabel = mContentView.findViewById(R.id.accounts_label);

        View accountsLabel = mContentView.findViewById(R.id.accounts_label);

        LinearLayout contents = (LinearLayout)mContentView.findViewById(R.id.accounts);

        LinearLayout contents = (LinearLayout)mContentView.findViewById(R.id.accounts);

        contents.removeAllViews();





        Context context = getActivity();

        Context context = getActivity();