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

Depend on support lib preferences

Browse Source 
Bug: 24576551
Change-Id: Ic6190bacd3f7582c9bbc8de972da4612bd92421e
This commit is contained in:
Jason Monk
2015-09-10 15:52:51 -04:00
parent 136ed7b6b2
commit 39b467482d
308 changed files with 2684 additions and 1762 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/print/PrintJobSettingsFragment.java
View File

@@ -19,12 +19,12 @@ package com.android.settings.print;
import android.content.Context;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.preference.Preference;
import android.print.PrintJob;
import android.print.PrintJobId;
import android.print.PrintJobInfo;
import android.print.PrintManager;
import android.print.PrintManager.PrintJobStateChangeListener;
import android.support.v7.preference.Preference;
import android.text.TextUtils;
import android.text.format.DateUtils;
import android.view.Menu;
@@ -235,10 +235,8 @@ public class PrintJobSettingsFragment extends SettingsPreferenceFragment {
getPreferenceScreen().addPreference(mMessagePreference);
}
mMessagePreference.setSummary(stateReason);
getListView().setDivider(null);
} else {
getPreferenceScreen().removePreference(mMessagePreference);
getListView().setDivider(mListDivider);
}
getActivity().invalidateOptionsMenu();

26
src/com/android/settings/print/PrintServiceSettingsFragment.java
View File

@@ -63,15 +63,14 @@ import com.android.internal.logging.MetricsLogger;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.widget.SwitchBar;
import com.android.settings.widget.ToggleSwitch;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import com.android.settings.widget.SwitchBar;
import com.android.settings.widget.ToggleSwitch;
/**
* Fragment with print service settings.
*/
@@ -177,6 +176,8 @@ public class PrintServiceSettingsFragment extends SettingsPreferenceFragment
super.onViewCreated(view, savedInstanceState);
initComponents();
updateUiForArguments();
getView().findViewById(R.id.list_container).setVisibility(View.GONE);
getBackupListView().setVisibility(View.VISIBLE);
}
@Override
@@ -242,10 +243,13 @@ public class PrintServiceSettingsFragment extends SettingsPreferenceFragment
}
}
private ListView getBackupListView() {
return (ListView) getView().findViewById(R.id.backup_list);
}
private void updateEmptyView() {
ListView listView = getListView();
ViewGroup contentRoot = (ViewGroup) listView.getParent();
View emptyView = listView.getEmptyView();
ViewGroup contentRoot = (ViewGroup) getListView().getParent();
View emptyView = getEmptyView();
if (!mToggleSwitch.isChecked()) {
if (emptyView != null && emptyView.getId() != R.id.empty_print_state) {
contentRoot.removeView(emptyView);
@@ -259,7 +263,7 @@ public class PrintServiceSettingsFragment extends SettingsPreferenceFragment
TextView textView = (TextView) emptyView.findViewById(R.id.message);
textView.setText(R.string.print_service_disabled);
contentRoot.addView(emptyView);
listView.setEmptyView(emptyView);
getBackupListView().setEmptyView(emptyView);
}
} else if (mPrintersAdapter.getUnfilteredCount() <= 0) {
if (emptyView != null
@@ -271,7 +275,7 @@ public class PrintServiceSettingsFragment extends SettingsPreferenceFragment
emptyView = getActivity().getLayoutInflater().inflate(
R.layout.empty_printers_list_service_enabled, contentRoot, false);
contentRoot.addView(emptyView);
listView.setEmptyView(emptyView);
getBackupListView().setEmptyView(emptyView);
}
} else if (mPrintersAdapter.getCount() <= 0) {
if (emptyView != null && emptyView.getId() != R.id.empty_print_state) {
@@ -286,7 +290,7 @@ public class PrintServiceSettingsFragment extends SettingsPreferenceFragment
TextView textView = (TextView) emptyView.findViewById(R.id.message);
textView.setText(R.string.print_no_printers_found);
contentRoot.addView(emptyView);
listView.setEmptyView(emptyView);
getBackupListView().setEmptyView(emptyView);
}
}
}
@@ -333,8 +337,8 @@ public class PrintServiceSettingsFragment extends SettingsPreferenceFragment
}
});
getListView().setSelector(new ColorDrawable(Color.TRANSPARENT));
getListView().setAdapter(mPrintersAdapter);
getBackupListView().setSelector(new ColorDrawable(Color.TRANSPARENT));
getBackupListView().setAdapter(mPrintersAdapter);
}

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

@@ -34,9 +34,6 @@ import android.os.Handler;
import android.os.Message;
import android.os.UserHandle;
import android.os.UserManager;
import android.preference.Preference;
import android.preference.PreferenceCategory;
import android.preference.PreferenceScreen;
import android.print.PrintJob;
import android.print.PrintJobId;
import android.print.PrintJobInfo;
@@ -45,6 +42,9 @@ import android.print.PrintManager.PrintJobStateChangeListener;
import android.printservice.PrintServiceInfo;
import android.provider.SearchIndexableResource;
import android.provider.Settings;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceCategory;
import android.support.v7.preference.PreferenceScreen;
import android.text.TextUtils;
import android.text.format.DateUtils;
import android.util.Log;
@@ -188,7 +188,7 @@ public class PrintSettingsFragment extends SettingsPreferenceFragment
}
contentRoot.addView(emptyView);
getListView().setEmptyView(emptyView);
setEmptyView(emptyView);
final UserManager um = (UserManager) getSystemService(Context.USER_SERVICE);
mProfileSpinnerAdapter = Utils.createUserSpinnerAdapter(um, getActivity());
@@ -302,7 +302,7 @@ public class PrintSettingsFragment extends SettingsPreferenceFragment
if (addNewServiceIntent == null) {
return null;
}
Preference preference = new Preference(getContext());
Preference preference = new Preference(getPrefContext());
preference.setTitle(R.string.print_menu_item_add_service);
preference.setIcon(R.drawable.ic_menu_add);
preference.setOrder(ORDER_LAST);
@@ -329,7 +329,7 @@ public class PrintSettingsFragment extends SettingsPreferenceFragment
getArguments().remove(EXTRA_PRINT_SERVICE_COMPONENT_NAME);
Preference prereference = findPreference(componentName);
if (prereference != null) {
prereference.performClick(getPreferenceScreen());
prereference.performClick();
}
}
}

3
src/com/android/settings/print/PrintSettingsUtils.java
View File

@@ -22,7 +22,8 @@ import android.provider.Settings;
import android.text.TextUtils;
import android.text.TextUtils.SimpleStringSplitter;
import java.util.ArrayList;import java.util.List;
import java.util.ArrayList;
import java.util.List;
/**
* Helper methods for reading and writing to print settings.