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

Align more prefs for icon space.

Browse Source 
- 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
This commit is contained in:
Fan Zhang
2016-12-20 11:59:23 -08:00
parent 829faf6c45
commit ded9fc9b07
24 changed files with 72 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
res/layout/preference_category_material_settings.xml
View File

@@ -40,13 +40,26 @@
android:maxHeight="18dp"/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="60dp"
android:orientation="vertical">
<TextView
android:id="@android:id/title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAppearance="@android:style/TextAppearance.Material.Body2"
android:textColor="?android:attr/textColorPrimary"
android:paddingStart="60dp"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"/>
<TextView
android:id="@android:id/summary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceListItemSecondary"
android:textColor="?android:attr/textColorSecondary"
android:ellipsize="end"
android:singleLine="true" />
</LinearLayout>
</FrameLayout>

2
res/layout/restricted_preference_dropdown.xml
View File

@@ -25,6 +25,6 @@
android:layout_height="wrap_content"
android:visibility="invisible" />
<include layout="@layout/preference_material" />
<include layout="@layout/preference_material_settings" />
</FrameLayout>

2
res/layout/storage_item.xml
View File

@@ -20,7 +20,7 @@
android:orientation="vertical"
android:minHeight="?android:attr/listPreferredItemHeightSmall"
android:gravity="center_vertical"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingStart="@dimen/preference_no_icon_padding_start"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:paddingTop="16dip"
android:paddingBottom="16dip"

2
res/layout/storage_summary.xml
View File

@@ -20,7 +20,7 @@
android:orientation="vertical"
android:minHeight="?android:attr/listPreferredItemHeightSmall"
android:gravity="center_vertical"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingStart="@dimen/preference_no_icon_padding_start"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:paddingTop="16dip"
android:paddingBottom="16dip"

40
res/layout/work_profile_category.xml
View File

@@ -1,40 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- 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.
-->
<!-- Layout used for "Work" preference group in Accounts. -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="16dip"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:paddingTop="16dip"
android:orientation="vertical">
<TextView
android:id="@android:id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="@android:style/TextAppearance.Material.Body2"
android:textColor="?android:attr/colorAccent" />
<TextView
android:id="@android:id/summary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceListItemSecondary"
android:textColor="?android:attr/textColorSecondary"
android:ellipsize="end"
android:singleLine="true" />
</LinearLayout>

2
res/xml/advanced_apps.xml
View File

@@ -92,7 +92,7 @@
<PreferenceCategory
android:title="@string/advanced_apps">
<PreferenceScreen
<Preference
android:key="special_access"
android:fragment="com.android.settings.applications.SpecialAccessSettings"
android:title="@string/special_access" />

12
res/xml/application_settings.xml
View File

@@ -26,26 +26,26 @@
android:summary="@string/applications_settings_summary"
android:key="applications_settings">
<PreferenceScreen
<Preference
android:fragment="com.android.settings.applications.ManageApplications"
android:title="@string/manageapplications_settings_title"
android:summary="@string/manageapplications_settings_summary">
</PreferenceScreen>
</Preference>
<PreferenceScreen
<Preference
android:fragment="com.android.settings.applications.ManageApplications"
android:title="@string/runningservices_settings_title"
android:summary="@string/runningservices_settings_summary">
<extra android:name="classname" android:value="com.android.settings.Settings$RunningServicesActivity" />
</PreferenceScreen>
</Preference>
<PreferenceScreen
<Preference
android:fragment="com.android.settings.applications.ManageApplications"
android:title="@string/storageuse_settings_title"
android:summary="@string/storageuse_settings_summary">
<extra android:name="classname"
android:value="com.android.settings.Settings$StorageUseActivity" />
</PreferenceScreen>
</Preference>
<CheckBoxPreference
android:key="toggle_advanced_settings"

6
res/xml/automatic_storage_management_settings.xml
View File

@@ -32,12 +32,10 @@
android:title="@string/downloads_backup_preference_title"
android:summary="@string/downloads_backup_text"/>
<com.android.settings.fuelgauge.WallOfTextPreference
<Preference
android:key="freed_bytes"
android:persistent="false"
android:selectable="false"
settings:allowDividerAbove="false"
settings:allowDividerBelow="true" />
android:selectable="false" />
<DropDownPreference
android:key="days"

9
res/xml/battery_saver_settings.xml
View File

@@ -15,7 +15,6 @@
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:title="@string/battery_saver"
android:key="battery_saver">
@@ -25,12 +24,4 @@
android:title="@string/battery_saver_turn_on_automatically_title"
android:summary="%s" />
<!-- Feature description text -->
<com.android.settings.fuelgauge.WallOfTextPreference
android:key="description"
android:summary="@*android:string/battery_saver_description"
android:persistent="false"
android:selectable="false"
settings:allowDividerAbove="true" />
</PreferenceScreen>

9
res/xml/data_saver.xml
View File

@@ -15,7 +15,6 @@
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:title="@string/data_saver_title">
<Preference
@@ -23,12 +22,4 @@
android:title="@string/unrestricted_data_saver"
android:fragment="com.android.settings.datausage.UnrestrictedDataAccess" />
<!-- Feature description text -->
<com.android.settings.fuelgauge.WallOfTextPreference
android:key="description"
android:summary="@*android:string/data_saver_description"
android:persistent="false"
android:selectable="false"
settings:allowDividerAbove="true" />
</PreferenceScreen>

10
res/xml/display_settings.xml
View File

@@ -19,12 +19,12 @@
android:title="@string/display_settings"
settings:keywords="@string/keywords_display">
<PreferenceScreen
<Preference
android:key="brightness"
android:title="@string/brightness"
settings:keywords="@string/keywords_display_brightness_level">
<intent android:action="android.intent.action.SHOW_BRIGHTNESS_DIALOG" />
</PreferenceScreen>
</Preference>
<SwitchPreference
android:key="auto_brightness"
@@ -70,7 +70,7 @@
android:title="@string/camera_gesture_title"
android:summary="@string/camera_gesture_desc" />
<PreferenceScreen
<Preference
android:key="screensaver"
android:title="@string/screensaver_settings_title"
android:fragment="com.android.settings.DreamSettings" />
@@ -89,7 +89,7 @@
android:title="@string/tap_to_wake"
android:summary="@string/tap_to_wake_summary" />
<PreferenceScreen
<Preference
android:key="font_size"
android:title="@string/title_font_size"
android:fragment="com.android.settings.accessibility.ToggleFontSizePreferenceFragment"
@@ -105,7 +105,7 @@
android:summary="%s"
android:title="@string/display_auto_rotate_title" />
<PreferenceScreen
<Preference
android:key="wifi_display"
android:title="@string/wifi_display_settings_title"
settings:keywords="@string/keywords_display_cast_screen"

10
res/xml/language_settings.xml
View File

@@ -18,7 +18,7 @@
android:key="language_keyboard_settings"
android:title="@string/language_keyboard_settings_title">
<PreferenceScreen
<Preference
android:key="phone_language"
android:title="@string/phone_language"
android:fragment="com.android.settings.localepicker.LocaleListEditor"
@@ -34,17 +34,17 @@
android:persistent="false"/>
<!-- User dictionary preference title and fragment will be set programmatically. -->
<PreferenceScreen
<Preference
android:key="key_user_dictionary_settings"
android:title="@string/user_dict_settings_title"
/>
<PreferenceCategory
android:title="@string/keyboard_and_input_methods_category">
<PreferenceScreen
<Preference
android:title="@string/virtual_keyboard_category"
android:fragment="com.android.settings.inputmethod.VirtualKeyboardFragment" />
<PreferenceScreen
<Preference
android:title="@string/physical_keyboard_title"
android:fragment="com.android.settings.inputmethod.PhysicalKeyboardFragment" />
</PreferenceCategory>
@@ -53,7 +53,7 @@
android:key="voice_category"
android:title="@string/voice_category" >
<PreferenceScreen
<Preference
android:key="tts_settings"
android:title="@string/tts_settings_title"
android:fragment="com.android.settings.tts.TextToSpeechSettings"

5
res/xml/night_display_settings.xml
View File

@@ -46,9 +46,4 @@
</PreferenceCategory>
<com.android.settings.fuelgauge.WallOfTextPreference
android:summary="@string/night_display_text"
android:selectable="false"
settings:allowDividerAbove="true" />
</PreferenceScreen>

10
res/xml/privacy_settings.xml
View File

@@ -19,24 +19,24 @@
android:title="@string/privacy_settings_title">
<!-- Backup settings -->
<PreferenceScreen
<Preference
android:key="backup_data"
android:title="@string/backup_data_title"
android:persistent="false"
android:fragment="com.android.settings.backup.ToggleBackupSettingFragment"/>
<PreferenceScreen
<Preference
android:key="configure_account"
android:title="@string/backup_configure_account_title"
android:persistent="false">
<!-- the Intent declared here is always overwritten by a real one -->
<intent android:action="dummy" />
</PreferenceScreen>
</Preference>
<PreferenceScreen
<Preference
android:key="data_management"
android:persistent="false">
</PreferenceScreen>
</Preference>
<SwitchPreference
android:key="auto_restore"

2
res/xml/security_settings_unencrypted.xml
View File

@@ -21,7 +21,7 @@
android:key="security_category"
android:title="@string/crypt_keeper_settings_title">
<PreferenceScreen
<Preference
android:key="encryption"
android:title="@string/crypt_keeper_encrypt_title"
android:fragment="com.android.settings.CryptKeeperSettings" />

30
res/xml/special_access.xml
View File

@@ -18,7 +18,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
<PreferenceScreen
<Preference
android:key="high_power_apps"
android:title="@string/high_power_apps"
android:fragment="com.android.settings.applications.ManageApplications"
@@ -26,19 +26,19 @@
<extra
android:name="classname"
android:value="com.android.settings.Settings$HighPowerApplicationsActivity" />
</PreferenceScreen>
</Preference>
<PreferenceScreen
<Preference
android:key="device_administrators"
android:title="@string/manage_device_admin"
android:fragment="com.android.settings.DeviceAdminSettings" />
<PreferenceScreen
<Preference
android:key="zen_access"
android:title="@string/manage_zen_access_title"
android:fragment="com.android.settings.notification.ZenAccessSettings" />
<PreferenceScreen
<Preference
android:key="system_alert_window"
android:title="@string/system_alert_window_settings"
android:fragment="com.android.settings.applications.ManageApplications"
@@ -46,9 +46,9 @@
<extra
android:name="classname"
android:value="com.android.settings.Settings$OverlaySettingsActivity" />
</PreferenceScreen>
</Preference>
<PreferenceScreen
<Preference
android:key="enabled_vr_listeners"
android:title="@string/vr_listeners_title"
android:fragment="com.android.settings.applications.VrListenerSettings"
@@ -56,9 +56,9 @@
<extra
android:name="classname"
android:value="com.android.settings.Settings$VrListenersSettingsActivity" />
</PreferenceScreen>
</Preference>
<PreferenceScreen
<Preference
android:key="write_settings_apps"
android:title="@string/write_settings"
android:fragment="com.android.settings.applications.ManageApplications"
@@ -66,24 +66,24 @@
<extra
android:name="classname"
android:value="com.android.settings.Settings$WriteSettingsActivity" />
</PreferenceScreen>
</Preference>
<PreferenceScreen
<Preference
android:key="notification_access"
android:title="@string/manage_notification_access_title"
android:fragment="com.android.settings.notification.NotificationAccessSettings" />
<PreferenceScreen
<Preference
android:key="premium_sms"
android:title="@string/premium_sms_access"
android:fragment="com.android.settings.applications.PremiumSmsAccess" />
<PreferenceScreen
<Preference
android:key="data_saver"
android:title="@string/unrestricted_data_saver"
android:fragment="com.android.settings.datausage.UnrestrictedDataAccess" />
<PreferenceScreen
<Preference
android:key="usage_access"
android:title="@string/usage_access"
android:fragment="com.android.settings.applications.ManageApplications"
@@ -91,5 +91,5 @@
<extra
android:name="classname"
android:value="com.android.settings.Settings$UsageAccessSettingsActivity" />
</PreferenceScreen>
</Preference>
</PreferenceScreen>

2
res/xml/virtual_keyboard_settings.xml
View File

@@ -16,7 +16,7 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
android:title="@string/virtual_keyboard_category">
<!-- Enabled input method list will be populated programmatically here. -->
<PreferenceScreen
<Preference
android:key="add_virtual_keyboard_screen"
android:title="@string/add_virtual_keyboard"
android:fragment="com.android.settings.inputmethod.AvailableVirtualKeyboardFragment" />

6
res/xml/zen_mode_settings.xml
View File

@@ -20,19 +20,19 @@
android:title="@string/zen_mode_settings_title" >
<!-- Priority only allows -->
<PreferenceScreen
<Preference
android:key="priority_settings"
android:title="@string/zen_mode_priority_settings_title"
android:fragment="com.android.settings.notification.ZenModePrioritySettings" />
<!-- Automated rules -->
<PreferenceScreen
<Preference
android:key="automation_settings"
android:title="@string/zen_mode_automation_settings_title"
android:fragment="com.android.settings.notification.ZenModeAutomationSettings" />
<!-- Visual interruptions -->
<PreferenceScreen
<Preference
android:key="visual_interruptions_settings"
android:title="@string/zen_mode_visual_interruptions_settings_title"
android:fragment="com.android.settings.notification.ZenModeVisualInterruptionSettings" />

38
src/com/android/settings/WallOfTextPreference.java
View File

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

2
src/com/android/settings/accounts/AccountPreferenceController.java
View File

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

2
src/com/android/settings/datausage/DataSaverSummary.java
View File

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

10
src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
View File

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

2
src/com/android/settings/display/NightDisplaySettings.java
View File

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

3
src/com/android/settings/fuelgauge/BatterySaverSettings.java
View File

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