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

Merge "Update account sync settings title." into oc-dev am: a031636725

Browse Source 
am: c669438450

Change-Id: I5a163d5e3902c04f1006a15e4a330f55f6af0ef9
This commit is contained in:
Fan Zhang
2017-04-25 22:19:10 +00:00
committed by android-build-merger
parent bf922da309 c669438450
commit bd3cbf44ac
3 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,14 +17,10 @@
package com.android.settings.accounts;
import android.accounts.AuthenticatorDescription;
import android.app.Activity;
import android.content.ContentResolver;
import android.content.Context;
import android.content.SyncStatusObserver;
import android.content.pm.PackageManager;
import android.content.res.Resources;
import android.content.res.Resources.Theme;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.os.Handler;
@@ -32,12 +28,10 @@ import android.os.UserHandle;
import android.os.UserManager;
import android.support.v7.preference.PreferenceScreen;
import android.text.format.DateFormat;
import android.text.format.DateUtils;
import android.util.Log;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.Utils;
import com.android.settings.utils.LocalClassLoaderContextThemeWrapper;
import com.android.settingslib.accounts.AuthenticatorHelper;
import java.util.ArrayList;

6
src/com/android/settings/accounts/AccountSyncPreferenceController.java
View File

@@ -25,6 +25,7 @@ import android.os.UserHandle;
import android.support.v7.preference.Preference;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.PreferenceController;
@@ -53,8 +54,9 @@ public class AccountSyncPreferenceController extends PreferenceController {
final Bundle args = new Bundle();
args.putParcelable(AccountSyncSettings.ACCOUNT_KEY, mAccount);
args.putParcelable(EXTRA_USER, mUserHandle);
Utils.startWithFragment(mContext, AccountSyncSettings.class.getName(), args, null, 0, -1,
mAccount.name, MetricsProto.MetricsEvent.ACCOUNT);
Utils.startWithFragment(mContext, AccountSyncSettings.class.getName(), args, null, 0,
R.string.account_sync_title, null, MetricsProto.MetricsEvent.ACCOUNT);
return true;
}