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

Commit 2ed0f999 authored by Fan Zhang's avatar Fan Zhang
Browse files

Rename app_details to entity_header 

Bug: 37669238
Test: rerun robotests
Change-Id: Iab2cdf83d8b35ce3d45b0c413cad8614d44d5ed3
parent 867c68e7

res/xml/installed_app_details_ia.xml→res/xml/installed_app_details.xml

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 


    <com.android.settings.applications.LayoutPreference

        android:key="header_view"

        android:layout="@layout/app_details"

        android:layout="@layout/settings_entity_header"

        android:selectable="false"

        android:order="-10000"/>

res/xml/power_usage_detail_ia.xml→res/xml/power_usage_detail.xml

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 


    <com.android.settings.applications.LayoutPreference

        android:key="header_view"

        android:layout="@layout/app_details"

        android:layout="@layout/settings_entity_header"

        android:selectable="false"

        android:order="-10000"/>

src/com/android/settings/accounts/AccountDetailDashboardFragment.java

+2 −2
Original line number Diff line number Diff line
@@ -48,10 +48,10 @@ public class AccountDetailDashboardFragment extends DashboardFragment { 
    public static final String KEY_ACCOUNT_HEADER = "account_header";

    public static final String KEY_USER_HANDLE = "user_handle";



    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)

    @VisibleForTesting

    Account mAccount;

    private String mAccountLabel;

    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)

    @VisibleForTesting

    String mAccountType;

    private AccountSyncPreferenceController mAccountSynController;

    private RemoveAccountPreferenceController mRemoveAccountController;

src/com/android/settings/applications/AppHeaderController.java

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ public class AppHeaderController { 
            mAppHeader = appHeader;

        } else {

            mAppHeader = LayoutInflater.from(fragment.getContext())

                    .inflate(R.layout.app_details, null /* root */);

                    .inflate(R.layout.settings_entity_header, null /* root */);

        }

    }