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

15
tests/robotests/src/android/net/NetworkBadging.java
View File

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

15
tests/robotests/src/android/net/wifi/WifiNetworkScoreCache.java
View File

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

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;