Permissions Settings UI updates

Changes:
    - Moved non-system permission groups to the end of the list
    - Updated "disabled" look to match non-center looked
    - Fixed state string alpha to match other alphas when not centered
    - Minor code clean ups

BUG: 24132393
BUG: 24132470
BUG: 24131983
Change-Id: I65a64d59e6fff8e0cbdaaa3da4e4a79987d6e624

1 files changed, 8 insertions, 15 deletions

diff --git a/src/com/android/packageinstaller/permission/ui/wear/TitledSettingsFragment.java b/src/com/android/packageinstaller/permission/ui/wear/TitledSettingsFragment.java
index a738decd..64f42d0d 100644
--- a/src/com/android/packageinstaller/permission/ui/wear/TitledSettingsFragment.java
+++ b/src/com/android/packageinstaller/permission/ui/wear/TitledSettingsFragment.java
@@ -48,10 +48,9 @@ public abstract class TitledSettingsFragment extends Fragment implements
     protected TextView mHeader;
     protected WearableListView mWheel;
 
-    private static boolean sInitialized;
-    private static int sCharLimitShortTitle;
-    private static int sCharLimitLine;
-    private static int mChinOffset;
+    private int mCharLimitShortTitle;
+    private int mCharLimitLine;
+    private int mChinOffset;
 
     private TextWatcher mHeaderTextWatcher = new TextWatcher() {
         @Override
@@ -64,7 +63,6 @@ public abstract class TitledSettingsFragment extends Fragment implements
         public void afterTextChanged(Editable editable) {
             adjustHeaderSize();
         }
-
     };
 
     private void adjustHeaderTranslation() {
@@ -88,11 +86,8 @@ public abstract class TitledSettingsFragment extends Fragment implements
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        if (!sInitialized) {
-            sCharLimitShortTitle = getResources().getInteger(R.integer.short_title_length);
-            sCharLimitLine = getResources().getInteger(R.integer.char_limit_per_line);
-            sInitialized = true;
-        }
+        mCharLimitShortTitle = getResources().getInteger(R.integer.short_title_length);
+        mCharLimitLine = getResources().getInteger(R.integer.char_limit_per_line);
     }
 
     @Override
@@ -142,7 +137,7 @@ public abstract class TitledSettingsFragment extends Fragment implements
         positionOnCircular(getContext(), mHeader, mWheel);
     }
 
-    public static void positionOnCircular(Context context, View header, final ViewGroup wheel) {
+    public void positionOnCircular(Context context, View header, final ViewGroup wheel) {
         if (ViewUtils.getIsCircular(context)) {
             FrameLayout.LayoutParams params =
                     (FrameLayout.LayoutParams) header.getLayoutParams();
@@ -196,7 +191,7 @@ public abstract class TitledSettingsFragment extends Fragment implements
     private void adjustHeaderSize() {
         int length = mHeader.length();
 
-        if (length <= sCharLimitShortTitle) {
+        if (length <= mCharLimitShortTitle) {
             mHeader.setTextSize(TypedValue.COMPLEX_UNIT_PX,
                     getResources().getDimensionPixelSize(
                             R.dimen.setting_short_header_text_size));
@@ -206,7 +201,7 @@ public abstract class TitledSettingsFragment extends Fragment implements
                             R.dimen.setting_long_header_text_size));
         }
 
-        boolean singleLine = length <= sCharLimitLine;
+        boolean singleLine = length <= mCharLimitLine;
 
         float height = getResources().getDimension(R.dimen.settings_header_base_height);
         if (!singleLine) {
@@ -236,6 +231,4 @@ public abstract class TitledSettingsFragment extends Fragment implements
         }
         mHeader.setLayoutParams(params);
     }
-
-
 }