diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 10b91cbed06..d841058e187 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -943,8 +943,6 @@ android:value="com.android.settings.category.ia.system" /> - - + - + - - - + + diff --git a/res/xml/security_settings_pattern_sub.xml b/res/xml/security_settings_pattern_sub.xml index dcc1b64cf27..f0a7c9b82b9 100644 --- a/res/xml/security_settings_pattern_sub.xml +++ b/res/xml/security_settings_pattern_sub.xml @@ -15,29 +15,28 @@ ~ limitations under the License --> - + - + - + - - - + + diff --git a/res/xml/security_settings_pin_sub.xml b/res/xml/security_settings_pin_sub.xml index 25d00bc5d26..46c49994357 100644 --- a/res/xml/security_settings_pin_sub.xml +++ b/res/xml/security_settings_pin_sub.xml @@ -15,25 +15,24 @@ ~ limitations under the License --> - + - + - - - + + diff --git a/res/xml/security_settings_slide_sub.xml b/res/xml/security_settings_slide_sub.xml index 1efb370a1f9..88eba8b1a3b 100644 --- a/res/xml/security_settings_slide_sub.xml +++ b/res/xml/security_settings_slide_sub.xml @@ -15,13 +15,13 @@ ~ limitations under the License --> - + - + diff --git a/src/com/android/settings/DeviceInfoSettings.java b/src/com/android/settings/DeviceInfoSettings.java index b1c9e2cc8b0..109fb0ed314 100644 --- a/src/com/android/settings/DeviceInfoSettings.java +++ b/src/com/android/settings/DeviceInfoSettings.java @@ -26,6 +26,7 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.core.PreferenceController; import com.android.settings.core.lifecycle.Lifecycle; import com.android.settings.dashboard.DashboardFragment; +import com.android.settings.dashboard.SummaryLoader; import com.android.settings.deviceinfo.AdditionalSystemUpdatePreferenceController; import com.android.settings.deviceinfo.BasebandVersionPreferenceController; import com.android.settings.deviceinfo.BuildNumberPreferenceController; @@ -86,6 +87,31 @@ public class DeviceInfoSettings extends DashboardFragment implements Indexable { getLifecycle()); } + private static class SummaryProvider implements SummaryLoader.SummaryProvider { + + private final SummaryLoader mSummaryLoader; + + public SummaryProvider(SummaryLoader summaryLoader) { + mSummaryLoader = summaryLoader; + } + + @Override + public void setListening(boolean listening) { + if (listening) { + mSummaryLoader.setSummary(this, DeviceModelPreferenceController.getDeviceModel()); + } + } + } + + public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY + = new SummaryLoader.SummaryProviderFactory() { + @Override + public SummaryLoader.SummaryProvider createSummaryProvider(Activity activity, + SummaryLoader summaryLoader) { + return new SummaryProvider(summaryLoader); + } + }; + private static List buildPreferenceControllers(Context context, Activity activity, Fragment fragment, Lifecycle lifecycle) { final List controllers = new ArrayList<>(); diff --git a/src/com/android/settings/SingleLineSummaryPreference.java b/src/com/android/settings/SingleLineSummaryPreference.java deleted file mode 100644 index 822b0e6bdaa..00000000000 --- a/src/com/android/settings/SingleLineSummaryPreference.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (C) 2015 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 com.android.settings; - -import android.content.Context; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceViewHolder; -import android.text.TextUtils.TruncateAt; -import android.util.AttributeSet; -import android.widget.TextView; - -import com.android.settingslib.RestrictedPreference; - -public class SingleLineSummaryPreference extends RestrictedPreference { - - public SingleLineSummaryPreference(Context context, AttributeSet attrs) { - super(context, attrs); - } - - @Override - public void onBindViewHolder(PreferenceViewHolder view) { - super.onBindViewHolder(view); - - final TextView summaryView = (TextView) view.findViewById( - com.android.internal.R.id.summary); - summaryView.setSingleLine(); - summaryView.setEllipsize(TruncateAt.END); - } - -} diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java index eaadf134667..5d3bf41bac8 100644 --- a/src/com/android/settings/accessibility/AccessibilitySettings.java +++ b/src/com/android/settings/accessibility/AccessibilitySettings.java @@ -49,13 +49,13 @@ import com.android.internal.view.RotationPolicy; import com.android.internal.view.RotationPolicy.RotationPolicyListener; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; -import com.android.settings.SingleLineSummaryPreference; import com.android.settings.Utils; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; import com.android.settings.search.SearchIndexableRaw; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; +import com.android.settingslib.RestrictedPreference; import com.android.settingslib.accessibility.AccessibilityUtils; import java.util.ArrayList; @@ -524,8 +524,8 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements for (int i = 0, count = installedServices.size(); i < count; ++i) { AccessibilityServiceInfo info = installedServices.get(i); - SingleLineSummaryPreference preference = - new SingleLineSummaryPreference(downloadedServicesCategory.getContext(), null); + RestrictedPreference preference = + new RestrictedPreference(downloadedServicesCategory.getContext()); String title = info.getResolveInfo().loadLabel(getPackageManager()).toString(); Drawable icon = info.getResolveInfo().loadIcon(getPackageManager()); diff --git a/src/com/android/settings/deviceinfo/DeviceModelPreferenceController.java b/src/com/android/settings/deviceinfo/DeviceModelPreferenceController.java index a2c43023610..ac3870a3180 100644 --- a/src/com/android/settings/deviceinfo/DeviceModelPreferenceController.java +++ b/src/com/android/settings/deviceinfo/DeviceModelPreferenceController.java @@ -46,7 +46,7 @@ public class DeviceModelPreferenceController extends PreferenceController { super.displayPreference(screen); final Preference pref = screen.findPreference(KEY_DEVICE_MODEL); if (pref != null) { - pref.setSummary(Build.MODEL + DeviceInfoUtils.getMsvSuffix()); + pref.setSummary(getDeviceModel()); } } @@ -64,4 +64,8 @@ public class DeviceModelPreferenceController extends PreferenceController { fragment.show(mHost.getFragmentManager(), HardwareInfoDialogFragment.TAG); return true; } + + public static String getDeviceModel() { + return Build.MODEL + DeviceInfoUtils.getMsvSuffix(); + } } diff --git a/src/com/android/settings/deviceinfo/HardwareInfoDialogFragment.java b/src/com/android/settings/deviceinfo/HardwareInfoDialogFragment.java index d68b47ac53c..60082c73a6d 100644 --- a/src/com/android/settings/deviceinfo/HardwareInfoDialogFragment.java +++ b/src/com/android/settings/deviceinfo/HardwareInfoDialogFragment.java @@ -18,7 +18,6 @@ package com.android.settings.deviceinfo; import android.app.AlertDialog; import android.app.Dialog; -import android.os.Build; import android.os.Bundle; import android.os.SystemProperties; import android.support.annotation.VisibleForTesting; @@ -30,7 +29,6 @@ import android.widget.TextView; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; -import com.android.settingslib.DeviceInfoUtils; public class HardwareInfoDialogFragment extends InstrumentedDialogFragment { @@ -55,7 +53,7 @@ public class HardwareInfoDialogFragment extends InstrumentedDialogFragment { .inflate(R.layout.dialog_hardware_info, null /* parent */); // Model setText(content, R.id.model_label, R.id.model_value, - Build.MODEL + DeviceInfoUtils.getMsvSuffix()); + DeviceModelPreferenceController.getDeviceModel()); // Hardware rev setText(content, R.id.hardware_rev_label, R.id.hardware_rev_value, SystemProperties.get("ro.boot.hardware.revision")); diff --git a/tests/robotests/src/com/android/settings/DeviceInfoSettingsTest.java b/tests/robotests/src/com/android/settings/DeviceInfoSettingsTest.java index ea889a50d5b..c43ad3c2dca 100644 --- a/tests/robotests/src/com/android/settings/DeviceInfoSettingsTest.java +++ b/tests/robotests/src/com/android/settings/DeviceInfoSettingsTest.java @@ -16,10 +16,20 @@ package com.android.settings; +import static com.google.common.truth.Truth.assertThat; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + import android.content.Context; +import android.os.Build; import android.os.UserManager; import android.support.v7.preference.PreferenceScreen; +import com.android.settings.dashboard.SummaryLoader; +import com.android.settingslib.DeviceInfoUtils; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -28,11 +38,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.annotation.Config; -import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.when; - @RunWith(SettingsRobolectricTestRunner.class) @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) public class DeviceInfoSettingsTest { @@ -43,6 +48,8 @@ public class DeviceInfoSettingsTest { private PreferenceScreen mScreen; @Mock private UserManager mUserManager; + @Mock + private SummaryLoader mSummaryLoader; private DeviceInfoSettings mSettings; @@ -58,4 +65,14 @@ public class DeviceInfoSettingsTest { public void getPrefXml_shouldReturnDeviceInfoXml() { assertThat(mSettings.getPreferenceScreenResId()).isEqualTo(R.xml.device_info_settings); } + + @Test + public void getSummary_shouldReturnDeviceModel() { + final SummaryLoader.SummaryProvider mProvider = DeviceInfoSettings.SUMMARY_PROVIDER_FACTORY + .createSummaryProvider(null, mSummaryLoader); + + mProvider.setListening(true); + + verify(mSummaryLoader).setSummary(mProvider, Build.MODEL + DeviceInfoUtils.getMsvSuffix()); + } }