Merge "[Panlingual] Add a description for per app language." into tm-dev

src/com/android/settings/applications/appinfo/AppLocaleDetails.java

@@ -146,6 +146,7 @@ public class AppLocaleDetails extends SettingsPreferenceFragment {
                 .setUid(mApplicationInfo.uid)
                 .setHasAppInfoLink(true)
                 .setButtonActions(ActionType.ACTION_NONE, ActionType.ACTION_NONE)
+                .setOrder(10)
                 .done(activity, getPrefContext());
         getPreferenceScreen().addPreference(pref);
     }

src/com/android/settings/widget/EntityHeaderController.java

@@ -74,6 +74,7 @@ public class EntityHeaderController {
     private Lifecycle mLifecycle;
     private RecyclerView mRecyclerView;
     private Drawable mIcon;
+    private int mPrefOrder = -1000;
     private String mIconContentDescription;
     private CharSequence mLabel;
     private CharSequence mSummary;
@@ -214,12 +215,18 @@ public class EntityHeaderController {
     }
 
     public EntityHeaderController setIsInstantApp(boolean isInstantApp) {
-        this.mIsInstantApp = isInstantApp;
+        mIsInstantApp = isInstantApp;
         return this;
     }
 
     public EntityHeaderController setEditListener(View.OnClickListener listener) {
-        this.mEditOnClickListener = listener;
+        mEditOnClickListener = listener;
+        return this;
+    }
+
+    /** Sets this preference order. */
+    public EntityHeaderController setOrder(int order) {
+        mPrefOrder = order;
         return this;
     }
 
@@ -229,7 +236,7 @@ public class EntityHeaderController {
     public LayoutPreference done(Activity activity, Context uiContext) {
         final LayoutPreference pref = new LayoutPreference(uiContext, done(activity));
         // Makes sure it's the first preference onscreen.
-        pref.setOrder(-1000);
+        pref.setOrder(mPrefOrder);
         pref.setSelectable(false);
         pref.setKey(PREF_KEY_APP_HEADER);
         pref.setAllowDividerBelow(true);