commit ddb7544cfc9f5263d719c9d2760451e9316d3bde
author roger xue <rogerxue@google.com> Wed Mar 29 09:27:04 2017 -0700
committer roger xue <rogerxue@google.com> Mon Apr 03 16:35:30 2017 -0700
tree 2fec5cc8adc433d19a1fafdeab6956fe248d18df
parent 1a32af89b5ea43a49fac8b44ac89ef83c2b4e0d6

- refactor application setting to use paged list view
- refactor sound setting to use paged list view
- removed unused UI classes
- ui changes according to spec

Test: manually verified
Change-Id: Iace0f88ed627621682d0e6c0cb0c07badc466076

src/com/android/car/settings/system/AboutSettingsActivity.java

diff --git a/src/com/android/car/settings/system/AboutSettingsActivity.java b/src/com/android/car/settings/system/AboutSettingsActivity.java
index a2ea9ba..8f630f7 100644
--- a/src/com/android/car/settings/system/AboutSettingsActivity.java
+++ b/src/com/android/car/settings/system/AboutSettingsActivity.java
@@ -19,9 +19,11 @@
 import android.os.Build;
 
 import com.android.car.settings.common.ListSettingsActivity;
+import com.android.car.settings.common.NoDividerItemDecoration;
 import com.android.car.settings.common.SimpleTextLineItem;
 import com.android.car.settings.common.TypedPagedListAdapter;
 import com.android.car.settings.R;
+import com.android.car.view.PagedListView;
 import com.android.settingslib.DeviceInfoUtils;
 
 import java.util.ArrayList;
@@ -47,4 +49,9 @@
                 getText(R.string.build_number), Build.DISPLAY));
         return lineItems;
     }
+
+    @Override
+    public PagedListView.Decoration getDecoration() {
+        return new NoDividerItemDecoration(this);
+    }
 }

src/com/android/car/settings/system/AboutSystemLineItem.java

diff --git a/src/com/android/car/settings/system/AboutSystemLineItem.java b/src/com/android/car/settings/system/AboutSystemLineItem.java
index 0334540..2d240de 100644
--- a/src/com/android/car/settings/system/AboutSystemLineItem.java
+++ b/src/com/android/car/settings/system/AboutSystemLineItem.java
@@ -19,8 +19,10 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
+import android.widget.ImageView;
 
 import com.android.car.settings.R;
+import com.android.car.settings.common.AnimationUtil;
 import com.android.car.settings.common.IconTextLineItem;
 
 
@@ -32,7 +34,7 @@
     private final Context mContext;
 
     public AboutSystemLineItem(Context context) {
-        super(context.getString(R.string.about_settings), R.drawable.ic_settings_about);
+        super(context.getString(R.string.about_settings));
         mContext = context;
     }
 
@@ -49,6 +51,11 @@
     @Override
     public void onClick() {
         Intent intent = new Intent(mContext, AboutSettingsActivity.class);
-        mContext.startActivity(intent);
+        mContext.startActivity(intent, AnimationUtil.slideInFromRightOption(mContext).toBundle());
+    }
+
+    @Override
+    public void setIcon(ImageView iconView) {
+        iconView.setImageResource(R.drawable.ic_settings_about);
     }
 }

src/com/android/car/settings/system/LegalInfoLineItem.java

diff --git a/src/com/android/car/settings/system/LegalInfoLineItem.java b/src/com/android/car/settings/system/LegalInfoLineItem.java
index 663d16b..d5cb484 100644
--- a/src/com/android/car/settings/system/LegalInfoLineItem.java
+++ b/src/com/android/car/settings/system/LegalInfoLineItem.java
@@ -17,6 +17,7 @@
 package com.android.car.settings.system;
 
 import android.content.Context;
+import android.widget.ImageView;
 
 import com.android.car.settings.R;
 import com.android.car.settings.common.IconTextLineItem;
@@ -30,7 +31,7 @@
     private final Context mContext;
 
     public LegalInfoLineItem(Context context) {
-        super(context.getString(R.string.legal_information), R.drawable.ic_settings_about);
+        super(context.getString(R.string.legal_information));
         mContext = context;
     }
 
@@ -48,4 +49,9 @@
     public void onClick() {
         // TODO: link to a legal info page.
     }
+
+    @Override
+    public void setIcon(ImageView iconView) {
+        iconView.setImageResource(R.drawable.ic_settings_about);
+    }
 }

src/com/android/car/settings/system/SystemUpdatesLineItem.java

diff --git a/src/com/android/car/settings/system/SystemUpdatesLineItem.java b/src/com/android/car/settings/system/SystemUpdatesLineItem.java
index 034b9df..f97dc24 100644
--- a/src/com/android/car/settings/system/SystemUpdatesLineItem.java
+++ b/src/com/android/car/settings/system/SystemUpdatesLineItem.java
@@ -17,6 +17,7 @@
 package com.android.car.settings.system;
 
 import android.content.Context;
+import android.widget.ImageView;
 
 import com.android.car.settings.R;
 import com.android.car.settings.common.IconTextLineItem;
@@ -31,8 +32,7 @@
     private final Context mContext;
 
     public SystemUpdatesLineItem(Context context) {
-        super(context.getString(
-                R.string.system_update_settings_list_item_title), R.drawable.ic_system_update);
+        super(context.getString(R.string.system_update_settings_list_item_title));
         mContext = context;
     }
 
@@ -50,4 +50,9 @@
     public void onClick() {
         // TODO: trigger system OTA flow
     }
+
+    @Override
+    public void setIcon(ImageView iconView) {
+        iconView.setImageResource(R.drawable.ic_system_update);
+    }
 }