PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic 'FrictionIcons'

Browse Source 
* 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.
This commit is contained in:
TreeHugger Robot
2017-03-17 23:06:09 +00:00
committed by Android (Google) Code Review
parent c5def491ee 830e47a2d5
commit edec9f1795
7 changed files with 36 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;