diff options
author | Fan Zhang <zhfan@google.com> | 2016-12-20 11:59:23 -0800 |
---|---|---|
committer | Fan Zhang <zhfan@google.com> | 2016-12-20 13:24:31 -0800 |
commit | ded9fc9b0726bae0e7500fa98e6876b6d003d279 (patch) | |
tree | 369d9734c7dc452e4d8e6018e3b8b7407b28fcc5 /src/com | |
parent | 829faf6c45ade19e75d09d627425de8d3dc13119 (diff) | |
download | packages_apps_Settings-ded9fc9b0726bae0e7500fa98e6876b6d003d279.tar.gz packages_apps_Settings-ded9fc9b0726bae0e7500fa98e6876b6d003d279.tar.bz2 packages_apps_Settings-ded9fc9b0726bae0e7500fa98e6876b6d003d279.zip |
Align more prefs for icon space.
- Extend preference_category to support summary text
- Removed work_profile_category, used by account list
- align prefs in storage settings
- Use Preference instead of PrefScreen in xmls
- Use proper footer preference in NightDisplaySettings, BatterySaver,
DataSaver, AutomaticStorageManage
- Remove WallOfTextPreference
Bug: 33775510
Test: visual
Change-Id: I28156b857ff5acac8746c42384dc03d5997ebd9d
Diffstat (limited to 'src/com')
6 files changed, 7 insertions, 50 deletions
diff --git a/src/com/android/settings/WallOfTextPreference.java b/src/com/android/settings/WallOfTextPreference.java deleted file mode 100644 index 4cc2f673e1..0000000000 --- a/src/com/android/settings/WallOfTextPreference.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (C) 2014 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.fuelgauge; - -import android.content.Context; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceViewHolder; -import android.util.AttributeSet; -import android.widget.TextView; -import com.android.settings.DividerPreference; - -public class WallOfTextPreference extends DividerPreference { - - public WallOfTextPreference(Context context, AttributeSet attrs) { - super(context, attrs); - } - - @Override - public void onBindViewHolder(PreferenceViewHolder view) { - super.onBindViewHolder(view); - final TextView summary = (TextView) view.findViewById(android.R.id.summary); - summary.setMaxLines(20); - } -} diff --git a/src/com/android/settings/accounts/AccountPreferenceController.java b/src/com/android/settings/accounts/AccountPreferenceController.java index 219dd3a003..723a1ec9cc 100644 --- a/src/com/android/settings/accounts/AccountPreferenceController.java +++ b/src/com/android/settings/accounts/AccountPreferenceController.java @@ -271,7 +271,6 @@ public class AccountPreferenceController extends PreferenceController } else { List<UserInfo> profiles = mUm.getProfiles(UserHandle.myUserId()); final int profilesCount = profiles.size(); - final boolean addCategory = profilesCount > 1; for (int i = 0; i < profilesCount; i++) { updateProfileUi(profiles.get(i)); } @@ -298,7 +297,6 @@ public class AccountPreferenceController extends PreferenceController preferenceGroup.setContentDescription( mContext.getString(R.string.account_settings)); } else if (userInfo.isManagedProfile()) { - preferenceGroup.setLayoutResource(R.layout.work_profile_category); preferenceGroup.setTitle(R.string.category_work); String workGroupSummary = getWorkGroupSummary(context, userInfo); preferenceGroup.setSummary(workGroupSummary); diff --git a/src/com/android/settings/datausage/DataSaverSummary.java b/src/com/android/settings/datausage/DataSaverSummary.java index b0304fc1d6..b424fa2c1a 100644 --- a/src/com/android/settings/datausage/DataSaverSummary.java +++ b/src/com/android/settings/datausage/DataSaverSummary.java @@ -54,6 +54,8 @@ public class DataSaverSummary extends SettingsPreferenceFragment super.onCreate(icicle); addPreferencesFromResource(R.xml.data_saver); + mFooterPreferenceMixin.createFooterPreference() + .setTitle(com.android.internal.R.string.data_saver_description); mUnrestrictedAccess = findPreference(KEY_UNRESTRICTED_ACCESS); mApplicationsState = ApplicationsState.getInstance( (Application) getContext().getApplicationContext()); diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java index b0685cfa77..e63a1df11c 100644 --- a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java +++ b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java @@ -18,7 +18,6 @@ package com.android.settings.deviceinfo; import android.app.AlertDialog; import android.app.Dialog; -import android.app.DialogFragment; import android.app.Fragment; import android.content.ActivityNotFoundException; import android.content.Context; @@ -37,7 +36,6 @@ import android.os.storage.StorageManager; import android.os.storage.VolumeInfo; import android.os.storage.VolumeRecord; import android.provider.DocumentsContract; -import android.provider.Settings; import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceCategory; import android.support.v7.preference.PreferenceGroup; @@ -65,9 +63,9 @@ import com.android.settings.deviceinfo.StorageSettings.MountTask; import com.android.settingslib.deviceinfo.StorageMeasurement; import com.android.settingslib.deviceinfo.StorageMeasurement.MeasurementDetails; import com.android.settingslib.deviceinfo.StorageMeasurement.MeasurementReceiver; + import com.google.android.collect.Lists; -import java.io.File; import java.util.HashMap; import java.util.List; import java.util.Objects; @@ -107,9 +105,6 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment { R.string.storage_detail_other, }; - private static final int DELETION_HELPER_SETTINGS = 1; - private static final int DELETION_HELPER_CLEAR = 1; - private StorageManager mStorageManager; private UserManager mUserManager; @@ -285,8 +280,7 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment { if (mHeaderPoolIndex < mHeaderPreferencePool.size()) { category = mHeaderPreferencePool.get(mHeaderPoolIndex); } else { - category = new PreferenceCategory(getPrefContext(), null, - com.android.internal.R.attr.preferenceCategoryStyle); + category = new PreferenceCategory(getPrefContext()); mHeaderPreferencePool.add(category); } category.setTitle(title); diff --git a/src/com/android/settings/display/NightDisplaySettings.java b/src/com/android/settings/display/NightDisplaySettings.java index 1ff4297d3d..619c0d4d1c 100644 --- a/src/com/android/settings/display/NightDisplaySettings.java +++ b/src/com/android/settings/display/NightDisplaySettings.java @@ -73,7 +73,7 @@ public class NightDisplaySettings extends SettingsPreferenceFragment // Load the preferences from xml. addPreferencesFromResource(R.xml.night_display_settings); - + mFooterPreferenceMixin.createFooterPreference().setTitle(R.string.night_display_text); mAutoModePreference = (DropDownPreference) findPreference(KEY_NIGHT_DISPLAY_AUTO_MODE); mStartTimePreference = findPreference(KEY_NIGHT_DISPLAY_START_TIME); mEndTimePreference = findPreference(KEY_NIGHT_DISPLAY_END_TIME); diff --git a/src/com/android/settings/fuelgauge/BatterySaverSettings.java b/src/com/android/settings/fuelgauge/BatterySaverSettings.java index 4dc8f87a0c..6b7ddf9569 100644 --- a/src/com/android/settings/fuelgauge/BatterySaverSettings.java +++ b/src/com/android/settings/fuelgauge/BatterySaverSettings.java @@ -78,7 +78,8 @@ public class BatterySaverSettings extends SettingsPreferenceFragment } mCreated = true; addPreferencesFromResource(R.xml.battery_saver_settings); - + mFooterPreferenceMixin.createFooterPreference() + .setTitle(com.android.internal.R.string.battery_saver_description); mContext = getActivity(); mSwitchBar = ((SettingsActivity) mContext).getSwitchBar(); mSwitch = mSwitchBar.getSwitch(); |