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

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

@@ -30,7 +30,7 @@ import android.os.Bundle;
import android.os.Handler;
import android.os.UserHandle;
import android.os.UserManager;
import android.preference.PreferenceScreen;
import android.support.v7.preference.PreferenceScreen;
import android.text.format.DateFormat;
import android.util.Log;
import android.view.ContextThemeWrapper;

24
src/com/android/settings/accounts/AccountSettings.java
View File

@@ -35,19 +35,19 @@ import android.content.pm.UserInfo;
import android.content.res.Resources;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.os.Process;
import android.os.UserHandle;
import android.os.UserManager;
import android.os.Process;
import android.provider.SearchIndexableResource;
import android.support.v7.preference.Preference;
import android.support.v7.preference.Preference.OnPreferenceClickListener;
import android.support.v7.preference.PreferenceGroup;
import android.support.v7.preference.PreferenceScreen;
import android.util.Log;
import android.util.SparseArray;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.preference.Preference;
import android.preference.Preference.OnPreferenceClickListener;
import android.provider.SearchIndexableResource;
import android.preference.PreferenceGroup;
import android.preference.PreferenceScreen;
import com.android.internal.logging.MetricsLogger;
import com.android.settings.AccessiblePreferenceCategory;
@@ -133,7 +133,7 @@ public class AccountSettings extends SettingsPreferenceFragment
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
mUm = (UserManager) getSystemService(Context.USER_SERVICE);
mProfileNotAvailablePreference = new Preference(getActivity());
mProfileNotAvailablePreference = new Preference(getPrefContext());
mAuthorities = getActivity().getIntent().getStringArrayExtra(EXTRA_AUTHORITIES);
if (mAuthorities != null) {
mAuthoritiesCount = mAuthorities.length;
@@ -277,7 +277,7 @@ public class AccountSettings extends SettingsPreferenceFragment
final ProfileData profileData = new ProfileData();
profileData.userInfo = userInfo;
if (addCategory) {
profileData.preferenceGroup = new AccessiblePreferenceCategory(context);
profileData.preferenceGroup = new AccessiblePreferenceCategory(getPrefContext());
if (userInfo.isManagedProfile()) {
profileData.preferenceGroup.setLayoutResource(R.layout.work_profile_category);
profileData.preferenceGroup.setTitle(R.string.category_work);
@@ -308,7 +308,7 @@ public class AccountSettings extends SettingsPreferenceFragment
}
private Preference newAddAccountPreference(Context context) {
Preference preference = new Preference(context);
Preference preference = new Preference(getPrefContext());
preference.setTitle(R.string.add_account_label);
preference.setIcon(R.drawable.ic_menu_add);
preference.setOnPreferenceClickListener(this);
@@ -317,7 +317,7 @@ public class AccountSettings extends SettingsPreferenceFragment
}
private Preference newRemoveWorkProfilePreference(Context context) {
Preference preference = new Preference(context);
Preference preference = new Preference(getPrefContext());
preference.setTitle(R.string.remove_managed_profile_label);
preference.setIcon(R.drawable.ic_menu_delete);
preference.setOnPreferenceClickListener(this);
@@ -419,7 +419,7 @@ public class AccountSettings extends SettingsPreferenceFragment
accounts[0]);
fragmentArguments.putParcelable(EXTRA_USER, userHandle);
accountTypePreferences.add(new AccountPreference(getActivity(), label,
accountTypePreferences.add(new AccountPreference(getPrefContext(), label,
titleResPackageName, titleResId, AccountSyncSettings.class.getName(),
fragmentArguments,
helper.getDrawableForType(getActivity(), accountType)));
@@ -430,7 +430,7 @@ public class AccountSettings extends SettingsPreferenceFragment
label.toString());
fragmentArguments.putParcelable(EXTRA_USER, userHandle);
accountTypePreferences.add(new AccountPreference(getActivity(), label,
accountTypePreferences.add(new AccountPreference(getPrefContext(), label,
titleResPackageName, titleResId, ManageAccountsSettings.class.getName(),
fragmentArguments,
helper.getDrawableForType(getActivity(), accountType)));

14
src/com/android/settings/accounts/AccountSyncSettings.java
View File

@@ -16,9 +16,6 @@
package com.android.settings.accounts;
import com.android.internal.logging.MetricsLogger;
import com.google.android.collect.Lists;
import android.accounts.Account;
import android.accounts.AccountManager;
import android.accounts.AccountManagerCallback;
@@ -40,8 +37,7 @@ import android.os.Binder;
import android.os.Bundle;
import android.os.UserHandle;
import android.os.UserManager;
import android.preference.Preference;
import android.preference.PreferenceScreen;
import android.support.v7.preference.Preference;
import android.text.TextUtils;
import android.util.Log;
import android.view.LayoutInflater;
@@ -54,8 +50,10 @@ import android.widget.ImageView;
import android.widget.ListView;
import android.widget.TextView;
import com.android.internal.logging.MetricsLogger;
import com.android.settings.R;
import com.android.settings.Utils;
import com.google.android.collect.Lists;
import java.io.IOException;
import java.util.ArrayList;
@@ -232,7 +230,7 @@ public class AccountSyncSettings extends AccountPreferenceBase {
private void addSyncStateSwitch(Account account, String authority) {
SyncStateSwitchPreference item =
new SyncStateSwitchPreference(getActivity(), account, authority);
new SyncStateSwitchPreference(getPrefContext(), account, authority);
item.setPersistent(false);
final ProviderInfo providerInfo = getPackageManager().resolveContentProviderAsUser(
authority, 0, mUserHandle.getIdentifier());
@@ -302,7 +300,7 @@ public class AccountSyncSettings extends AccountPreferenceBase {
}
@Override
public boolean onPreferenceTreeClick(PreferenceScreen preferences, Preference preference) {
public boolean onPreferenceTreeClick(Preference preference) {
if (preference instanceof SyncStateSwitchPreference) {
SyncStateSwitchPreference syncPref = (SyncStateSwitchPreference) preference;
String authority = syncPref.getAuthority();
@@ -328,7 +326,7 @@ public class AccountSyncSettings extends AccountPreferenceBase {
}
return true;
} else {
return super.onPreferenceTreeClick(preferences, preference);
return super.onPreferenceTreeClick(preference);
}
}

4
src/com/android/settings/accounts/AuthenticatorHelper.java
View File

@@ -16,8 +16,6 @@
package com.android.settings.accounts;
import com.google.android.collect.Maps;
import android.accounts.Account;
import android.accounts.AccountManager;
import android.accounts.AuthenticatorDescription;
@@ -35,6 +33,8 @@ import android.os.UserHandle;
import android.os.UserManager;
import android.util.Log;
import com.google.android.collect.Maps;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;

13
src/com/android/settings/accounts/ChooseAccountActivity.java
View File

@@ -28,10 +28,8 @@ import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.os.UserHandle;
import android.os.UserManager;
import android.preference.Preference;
import android.preference.PreferenceActivity;
import android.preference.PreferenceGroup;
import android.preference.PreferenceScreen;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceGroup;
import android.util.Log;
import com.android.internal.logging.MetricsLogger;
@@ -39,7 +37,6 @@ import com.android.internal.util.CharSequences;
import com.android.settings.InstrumentedPreferenceActivity;
import com.android.settings.R;
import com.android.settings.Utils;
import com.google.android.collect.Maps;
import java.util.ArrayList;
@@ -171,8 +168,8 @@ public class ChooseAccountActivity extends InstrumentedPreferenceActivity {
mAddAccountGroup.removeAll();
for (ProviderEntry pref : mProviderList) {
Drawable drawable = getDrawableForType(pref.type);
ProviderPreference p =
new ProviderPreference(this, pref.type, drawable, pref.name);
ProviderPreference p = new ProviderPreference(getPreferenceScreen().getContext(),
pref.type, drawable, pref.name);
mAddAccountGroup.addPreference(p);
}
} else {
@@ -260,7 +257,7 @@ public class ChooseAccountActivity extends InstrumentedPreferenceActivity {
}
@Override
public boolean onPreferenceTreeClick(PreferenceScreen preferences, Preference preference) {
public boolean onPreferenceTreeClick(Preference preference) {
if (preference instanceof ProviderPreference) {
ProviderPreference pref = (ProviderPreference) preference;
if (Log.isLoggable(TAG, Log.VERBOSE)) {

10
src/com/android/settings/accounts/ManageAccountsSettings.java
View File

@@ -34,9 +34,9 @@ import android.content.pm.ResolveInfo;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.os.UserHandle;
import android.preference.Preference;
import android.preference.Preference.OnPreferenceClickListener;
import android.preference.PreferenceScreen;
import android.support.v7.preference.Preference;
import android.support.v7.preference.Preference.OnPreferenceClickListener;
import android.support.v7.preference.PreferenceScreen;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.Menu;
@@ -155,7 +155,7 @@ public class ManageAccountsSettings extends AccountPreferenceBase
}
@Override
public boolean onPreferenceTreeClick(PreferenceScreen preferences, Preference preference) {
public boolean onPreferenceTreeClick(Preference preference) {
if (preference instanceof AccountPreference) {
startAccountSettings((AccountPreference) preference);
} else {
@@ -385,7 +385,7 @@ public class ManageAccountsSettings extends AccountPreferenceBase
if (showAccount) {
final Drawable icon = getDrawableForType(account.type);
final AccountPreference preference =
new AccountPreference(getActivity(), account, icon, auths, false);
new AccountPreference(getPrefContext(), account, icon, auths, false);
getPreferenceScreen().addPreference(preference);
if (mFirstAccount == null) {
mFirstAccount = account;

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

@@ -18,7 +18,7 @@ package com.android.settings.accounts;
import android.content.Context;
import android.graphics.drawable.Drawable;
import android.preference.Preference;
import android.support.v7.preference.Preference;
/**
* ProviderPreference is used to display an image to the left of a provider name.

8
src/com/android/settings/accounts/SyncStateSwitchPreference.java
View File

@@ -19,11 +19,11 @@ package com.android.settings.accounts;
import android.accounts.Account;
import android.app.ActivityManager;
import android.content.Context;
import android.preference.SwitchPreference;
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.PreferenceViewHolder;
import android.util.AttributeSet;
import android.util.Log;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import com.android.settings.R;
@@ -56,8 +56,8 @@ public class SyncStateSwitchPreference extends SwitchPreference {
}
@Override
public void onBindView(View view) {
super.onBindView(view);
public void onBindViewHolder(PreferenceViewHolder view) {
super.onBindViewHolder(view);
final AnimatedImageView syncActiveView = (AnimatedImageView) view.findViewById(
R.id.sync_active);
final View syncFailedView = view.findViewById(R.id.sync_failed);