Merge changes from topic 'FrictionIcons'

* changes:
  Revert picker icon sizes to 24dp.
  Comment changes from ag/1991360.
  Clean up wifi_friction icon unused states.
  Fix list item spacing for preferences.

res/drawable/wifi_friction.xml

@@ -18,10 +18,5 @@
         xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
     <item
         settings:state_encrypted="true"
-        settings:state_saved="true"
-        android:drawable="@drawable/ic_friction_lock_closed"/>
-    <item
-        settings:state_encrypted="true"
-        settings:state_saved="false"
         android:drawable="@drawable/ic_friction_lock_closed"/>
 </selector>

res/layout/preference_material_settings.xml

@@ -20,7 +20,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:minHeight="?android:attr/listPreferredItemHeightSmall"
     android:gravity="center_vertical"
     android:paddingStart="?android:attr/listPreferredItemPaddingStart"
     android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
@@ -49,13 +49,14 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:paddingTop="16dp"
+        android:paddingTop="12dp"
-        android:paddingBottom="16dp">
+        android:paddingBottom="12dp">
 
         <TextView
             android:id="@android:id/title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:minHeight="24dp"
             android:singleLine="true"
             android:textAppearance="?android:attr/textAppearanceListItem"
             android:ellipsize="marquee"/>
@@ -64,6 +65,7 @@
             android:id="@android:id/summary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:minHeight="24dp"
             android:layout_below="@android:id/title"
             android:layout_alignStart="@android:id/title"
             android:textAppearance="?android:attr/textAppearanceListItemSecondary"

res/values/dimens.xml

@@ -200,7 +200,6 @@
 
     <!-- WiFi Preferences -->
     <dimen name="wifi_divider_height">1px</dimen>
-    <dimen name="wifi_picker_icon_size">32dp</dimen>
 
     <!-- Color picker -->
     <dimen name="color_swatch_size">16dp</dimen>

src/com/android/settings/wifi/LongPressAccessPointPreference.java

@@ -47,11 +47,5 @@ public class LongPressAccessPointPreference extends AccessPointPreference {
             view.itemView.setTag(this);
             view.itemView.setLongClickable(true);
         }
-
-        ImageView iconImageView = (ImageView) view.findViewById(com.android.internal.R.id.icon);
-        int imageSize = getContext().getResources().getDimensionPixelSize(
-                R.dimen.wifi_picker_icon_size);
-        iconImageView.setMinimumHeight(imageSize);
-        iconImageView.setMinimumWidth(imageSize);
     }
 }

tests/robotests/src/android/net/NetworkBadging.java

@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package android.net;
 
 import android.annotation.IntDef;

tests/robotests/src/android/net/wifi/WifiNetworkScoreCache.java

@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package android.net.wifi;
 
 /**

tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java

@@ -56,11 +56,6 @@ public class WifiDetailPreferenceControllerTest {
     private static final int RSSI = -55;
     private static final String SECURITY = "None";
 
-    private Context mContext = RuntimeEnvironment.application;
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Drawable mockWifiIcon;
-
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private PreferenceScreen mockScreen;
 
@@ -80,6 +75,7 @@ public class WifiDetailPreferenceControllerTest {
     @Mock private WifiDetailPreference mockDnsPref;
     @Mock private PreferenceCategory mockIpv6AddressCategory;
 
+    private Context mContext = RuntimeEnvironment.application;
     private Lifecycle mLifecycle;
     private WifiDetailPreferenceController mController;