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

Merge "Enable highlighting of Print services"

Browse Source
This commit is contained in:
Fabrice Di Meglio
2014-04-21 16:30:06 +00:00
committed by Android (Google) Code Review
parent 4a35051565 c853a4282d
commit 4ee29d0308
2 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/com/android/settings/SettingsPreferenceFragment.java
View File

@@ -23,6 +23,7 @@ import android.content.ContentResolver;
import android.content.Context;
import android.content.DialogInterface;
import android.content.pm.PackageManager;
import android.database.DataSetObserver;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.preference.Preference;
@@ -47,7 +48,7 @@ public class SettingsPreferenceFragment extends PreferenceFragment implements Di
private static final String TAG = "SettingsPreferenceFragment";
private static final int MENU_HELP = Menu.FIRST + 100;
private static final int DELAY_HIGHLIGHT_DURATION_MILLIS = 300;
private static final int DELAY_HIGHLIGHT_DURATION_MILLIS = 400;
private static final String SAVE_HIGHLIGHTED_KEY = "android:preference_highlighted";
@@ -61,6 +62,18 @@ public class SettingsPreferenceFragment extends PreferenceFragment implements Di
private String mPreferenceKey;
private boolean mPreferenceHighlighted = false;
private DataSetObserver mDataSetObserver = new DataSetObserver() {
@Override
public void onChanged() {
highlightPreferenceIfNeeded();
}
@Override
public void onInvalidated() {
highlightPreferenceIfNeeded();
}
};
@Override
public void onCreate(Bundle icicle) {
super.onCreate(icicle);
@@ -99,11 +112,18 @@ public class SettingsPreferenceFragment extends PreferenceFragment implements Di
@Override
protected void onBindPreferences() {
highlightPreferenceIfNeeded();
getPreferenceScreen().getRootAdapter().registerDataSetObserver(mDataSetObserver);
}
@Override
public void onDestroy() {
super.onDestroy();
getPreferenceScreen().getRootAdapter().unregisterDataSetObserver(mDataSetObserver);
}
public void highlightPreferenceIfNeeded() {
if (!mPreferenceHighlighted &&!TextUtils.isEmpty(mPreferenceKey)) {
if (isAdded() && !mPreferenceHighlighted &&!TextUtils.isEmpty(mPreferenceKey)) {
highlightPreference(mPreferenceKey);
}
}

6
src/com/android/settings/print/PrintSettingsFragment.java
View File

@@ -565,7 +565,13 @@ public class PrintSettingsFragment extends SettingsPreferenceFragment
final int serviceCount = services.size();
for (int i = 0; i < serviceCount; i++) {
PrintServiceInfo service = services.get(i);
ComponentName componentName = new ComponentName(
service.getResolveInfo().serviceInfo.packageName,
service.getResolveInfo().serviceInfo.name);
SearchIndexableRaw indexable = new SearchIndexableRaw(context);
indexable.key = componentName.flattenToString();
indexable.title = service.getResolveInfo().loadLabel(packageManager).toString();
indexable.summaryOn = context.getString(R.string.print_feature_state_on);
indexable.summaryOff = context.getString(R.string.print_feature_state_off);