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

Code clean up

Browse Source 
- Remove unused DashboardTilePreference class
- Use FooterPreference in ManageAssist fragment
- reformat manage_assist xml file

Bug: 35203386
Test: visual
Change-Id: If3dbbd0fb1977d6f3c7dbf4544d71f5e6e801327
This commit is contained in:
Fan Zhang
2017-02-09 11:34:48 -08:00
parent 3fca717d3b
commit b39805e0d4
3 changed files with 12 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
res/xml/manage_assist.xml
View File

@@ -16,15 +16,13 @@
--> -->
<PreferenceScreen <PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto" android:title="@string/assist_and_voice_input_title">
android:key="manage_assist">
<com.android.settings.applications.DefaultAssistPreference <com.android.settings.applications.DefaultAssistPreference
android:key="default_assist" android:key="default_assist"
android:title="@string/default_assist_title" android:title="@string/default_assist_title"
android:summary="@string/default_assist_none" android:summary="@string/default_assist_none"/>
/>
<SwitchPreference <SwitchPreference
android:key="context" android:key="context"
@@ -38,19 +36,12 @@
android:summary="@string/assist_access_screenshot_summary"/> android:summary="@string/assist_access_screenshot_summary"/>
<SwitchPreference <SwitchPreference
android:key="flash" android:key="flash"
android:title="@string/assist_flash_title" android:title="@string/assist_flash_title"
android:summary="@string/assist_flash_summary" android:summary="@string/assist_flash_summary"/>
/>
<com.android.settings.voice.VoiceInputListPreference <com.android.settings.voice.VoiceInputListPreference
android:key="voice_input_settings" android:key="voice_input_settings"
android:title="@string/voice_input_settings_title" android:title="@string/voice_input_settings_title"/>
/>
<com.android.settings.DividerPreference
android:summary="@string/assist_footer"
android:selectable="false"
settings:allowDividerAbove="true" />
</PreferenceScreen> </PreferenceScreen>

3
src/com/android/settings/applications/ManageAssist.java
View File

@@ -68,7 +68,8 @@ public class ManageAssist extends SettingsPreferenceFragment
mFlashPref = (SwitchPreference) findPreference(KEY_FLASH); mFlashPref = (SwitchPreference) findPreference(KEY_FLASH);
mFlashPref.setOnPreferenceChangeListener(this); mFlashPref.setOnPreferenceChangeListener(this);
mFooterPreferenceMixin.createFooterPreference()
.setTitle(R.string.assist_footer);
mVoiceInputPref = (VoiceInputListPreference) findPreference(KEY_VOICE_INPUT); mVoiceInputPref = (VoiceInputListPreference) findPreference(KEY_VOICE_INPUT);
updateUi(); updateUi();
} }

45
src/com/android/settings/dashboard/DashboardTilePreference.java
View File

@@ -1,45 +0,0 @@
/**
* Copyright (C) 2016 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.dashboard;
import android.content.Context;
import android.util.AttributeSet;
import com.android.settings.DividerPreference;
import com.android.settings.R;
/**
* A {@code Preference} styled as a dashboard tile.
*/
public class DashboardTilePreference extends DividerPreference {
public DashboardTilePreference(Context context, AttributeSet attrs) {
super(context, attrs);
init();
}
public DashboardTilePreference(Context context) {
super(context);
init();
}
private void init() {
setLayoutResource(R.layout.dashboard_tile);
setDividerAllowedAbove(false);
setDividerAllowedBelow(false);
}
}