Tidy up QuickSettings

Change-Id: Ia9f311de5ff4a3ed78c786362c59ae3716cee61d

8 files changed, 14 insertions, 30 deletions

diff --git a/QuickSettings/AndroidManifest.xml b/QuickSettings/AndroidManifest.xml
index 570eeba8..ddd03537 100644
--- a/QuickSettings/AndroidManifest.xml
+++ b/QuickSettings/AndroidManifest.xml
@@ -17,9 +17,13 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.tv.quicksettings"
-    android:sharedUserId="android.uid.system" >
+    android:sharedUserId="android.uid.system"
+    android:versionCode="1"
+    android:versionName="1.0" >
 
-    <uses-sdk android:minSdkVersion="L" />
+    <uses-sdk
+        android:minSdkVersion="21"
+        android:targetSdkVersion="21" />
 
     <uses-permission android:name="android.permission.WRITE_SETTINGS" />
 
diff --git a/QuickSettings/res/layout/dialog_setting.xml b/QuickSettings/res/layout/dialog_setting.xml
index fcc14b61..8e5e1064 100644
--- a/QuickSettings/res/layout/dialog_setting.xml
+++ b/QuickSettings/res/layout/dialog_setting.xml
@@ -22,7 +22,7 @@
     android:focusable="true"
     android:focusableInTouchMode="true"
     android:fontFamily="sans-serif-condensed"
-    android:gravity="right|center_vertical"
+    android:gravity="end|center_vertical"
     android:textAllCaps="true"
     android:textColor="@color/text_focused_bright"
     android:textSize="@dimen/setting_text_title_size" />
diff --git a/QuickSettings/res/layout/side_quicksettings.xml b/QuickSettings/res/layout/side_quicksettings.xml
index d42665ac..07f8b571 100644
--- a/QuickSettings/res/layout/side_quicksettings.xml
+++ b/QuickSettings/res/layout/side_quicksettings.xml
@@ -21,7 +21,7 @@
     android:orientation="vertical"
     android:elevation="@dimen/panel_z"
     android:background="@color/side_panel_background"
-    android:layout_gravity="right"
+    android:layout_gravity="end"
     android:layout_width="@dimen/panel_width"
     android:layout_height="match_parent">
 
diff --git a/QuickSettings/src/com/android/tv/quicksettings/DialogAdapter.java b/QuickSettings/src/com/android/tv/quicksettings/DialogAdapter.java
index b17b0352..f03d91c5 100644
--- a/QuickSettings/src/com/android/tv/quicksettings/DialogAdapter.java
+++ b/QuickSettings/src/com/android/tv/quicksettings/DialogAdapter.java
@@ -13,7 +13,6 @@
  */
 package com.android.tv.quicksettings;
 
-import android.content.Intent;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
diff --git a/QuickSettings/src/com/android/tv/quicksettings/PanelAdapter.java b/QuickSettings/src/com/android/tv/quicksettings/PanelAdapter.java
index 58694711..7bb1dbff 100644
--- a/QuickSettings/src/com/android/tv/quicksettings/PanelAdapter.java
+++ b/QuickSettings/src/com/android/tv/quicksettings/PanelAdapter.java
@@ -13,10 +13,8 @@
  */
 package com.android.tv.quicksettings;
 
-import android.content.Intent;
 import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/QuickSettings/src/com/android/tv/quicksettings/QuickSettings.java b/QuickSettings/src/com/android/tv/quicksettings/QuickSettings.java
index cf63b439..274a74af 100644
--- a/QuickSettings/src/com/android/tv/quicksettings/QuickSettings.java
+++ b/QuickSettings/src/com/android/tv/quicksettings/QuickSettings.java
@@ -15,24 +15,16 @@ package com.android.tv.quicksettings;
 
 import android.app.Activity;
 import android.app.AlertDialog;
-import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.v17.leanback.widget.VerticalGridView;
-import android.text.TextUtils;
 import android.util.Log;
 import android.view.Gravity;
-import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
 import android.view.WindowManager;
-import android.widget.TextView;
-
-import com.android.tv.quicksettings.SettingsDialog;
 
 import java.util.ArrayList;
-import java.util.List;
 
 public class QuickSettings extends Activity {
 
@@ -51,7 +43,7 @@ public class QuickSettings extends Activity {
         super.onCreate(savedInstanceState);
 
         WindowManager.LayoutParams lp = getWindow().getAttributes();
-        lp.gravity = Gravity.RIGHT;
+        lp.gravity = Gravity.END;
         getWindow().setAttributes(lp);
 
         setContentView(R.layout.side_quicksettings);
@@ -140,7 +132,7 @@ public class QuickSettings extends Activity {
     }
 
     private ArrayList<Setting> getSettings() {
-        ArrayList<Setting> settings = new ArrayList<Setting>();
+        ArrayList<Setting> settings = new ArrayList<>();
 
         String[] presetSettingChoices = getResources().getStringArray(
                 R.array.setting_preset_choices);
diff --git a/QuickSettings/src/com/android/tv/quicksettings/Setting.java b/QuickSettings/src/com/android/tv/quicksettings/Setting.java
index b6dc1582..7b6588bd 100644
--- a/QuickSettings/src/com/android/tv/quicksettings/Setting.java
+++ b/QuickSettings/src/com/android/tv/quicksettings/Setting.java
@@ -13,8 +13,6 @@
  */
 package com.android.tv.quicksettings;
 
-import android.content.Intent;
-import android.net.Uri;
 import android.os.Parcel;
 import android.os.Parcelable;
 
@@ -33,7 +31,7 @@ public class Setting implements Parcelable {
     private int mSettingType;
 
     private int mMaxValue;
-    private List<String> mStringChoices = new ArrayList<String>();
+    private List<String> mStringChoices = new ArrayList<>();
 
     public Setting() {
     }
diff --git a/QuickSettings/src/com/android/tv/quicksettings/SettingsDialog.java b/QuickSettings/src/com/android/tv/quicksettings/SettingsDialog.java
index a4bfaa17..fa345622 100644
--- a/QuickSettings/src/com/android/tv/quicksettings/SettingsDialog.java
+++ b/QuickSettings/src/com/android/tv/quicksettings/SettingsDialog.java
@@ -13,23 +13,17 @@
  */
 package com.android.tv.quicksettings;
 
+import android.support.annotation.NonNull;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
-import android.os.Parcelable;
 import android.support.v17.leanback.widget.OnChildSelectedListener;
 import android.support.v17.leanback.widget.VerticalGridView;
-import android.support.v7.widget.RecyclerView;
 import android.util.Log;
-import android.view.animation.AlphaAnimation;
-import android.view.animation.Animation;
-import android.view.animation.AnimationSet;
-import android.view.animation.ScaleAnimation;
 import android.view.Gravity;
 import android.view.KeyEvent;
-import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
@@ -38,7 +32,6 @@ import android.widget.TextView;
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.List;
 
 public class SettingsDialog extends Activity {
 
@@ -56,7 +49,7 @@ public class SettingsDialog extends Activity {
     private SeekBar mSeekBar;
     private TextView mSettingValue;
     private DialogAdapter mAdapter;
-    private SettingSelectedListener mSettingSelectedListener = new SettingSelectedListener();
+    private final SettingSelectedListener mSettingSelectedListener = new SettingSelectedListener();
     private Setting mFocusedSetting;
     private ArrayList<Setting> mSettings;
 
@@ -163,7 +156,7 @@ public class SettingsDialog extends Activity {
     }
 
     @Override
-    public boolean onKeyUp(int keyCode, KeyEvent event) {
+    public boolean onKeyUp(int keyCode, @NonNull KeyEvent event) {
         if (mFocusedSetting == null) {
             return super.onKeyUp(keyCode, event);
         }