Merge "Add Accounts & privacy settings in LatinIME" (a7c5dcde) · Commits · e / os / android_packages_inputmethods_LatinIME

java/res/values/strings.xml

+13 −0

Original line number	Diff line number	Diff line
		@@ -38,6 +38,8 @@

		<!-- Settings screen title for preferences [CHAR LIMIT=33]-->
		<string name="settings_screen_preferences">Preferences</string>
		<!-- Settings screen title for accounts and privacy preferences [CHAR LIMIT=33]-->
		<string name="settings_screen_accounts">Accounts & privacy</string>
		<!-- Settings screen title for appearance & layouts preferences [CHAR LIMIT=33] -->
		<string name="settings_screen_appearance">Appearance & layouts</string>
		<!-- Settings screen title for multilingual options [CHAR_LIMIT=33] -->
		@@ -177,6 +179,17 @@
		<!-- Title of the item to change the keyboard theme [CHAR LIMIT=20]-->
		<string name="keyboard_layout">Keyboard theme</string>

		<!-- Title of the preference item for switching accounts [CHAR LIMIT=30] -->
		<string name="switch_accounts">Switch accounts</string>

		<!-- Summary of the preference item for switching accounts when no accounts
		are selected [CHAR LIMIT=65] -->
		<string name="no_accounts_selected">No accounts selected</string>

		<!-- Summary of the preference item for switching accounts when an account
		is selected [CHAR LIMIT=65] -->
		<string name="account_selected">Currently using <xliff:g id="EMAIL_ADDRESS" example="someone@example.com">%1$s</xliff:g></string>

		<!-- Description for English (UK) keyboard subtype [CHAR LIMIT=25]
		(UK) should be an abbreviation of United Kingdom to fit in the CHAR LIMIT. -->
		<string name="subtype_en_GB">English (UK)</string>

java/res/xml/prefs.xml

+4 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,10 @@
		android:fragment="com.android.inputmethod.latin.settings.PreferencesSettingsFragment"
		android:title="@string/settings_screen_preferences"
		android:key="screen_preferences" />
		<PreferenceScreen
		android:fragment="com.android.inputmethod.latin.settings.AccountsSettingsFragment"
		android:title="@string/settings_screen_accounts"
		android:key="screen_accounts" />
		<PreferenceScreen
		android:fragment="com.android.inputmethod.latin.settings.AppearanceSettingsFragment"
		android:title="@string/settings_screen_appearance"

java/res/xml/prefs_screen_accounts.xml

0 → 100644

+37 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2014 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.
		-->

		<PreferenceScreen
		xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
		android:title="@string/settings_screen_accounts">

		<!-- This preference is a dummy view of the underlying preference.
		This isn't persisted and the summary/title is refreshed by the fragment
		after inspecting the underlying account preference. -->
		<Preference
		android:key="account_switcher"
		android:persistent="false"
		android:title="@string/switch_accounts"
		android:summary="@string/no_accounts_selected" />

		<!-- title will be set programmatically to embed application name -->
		<CheckBoxPreference
		android:key="pref_enable_metrics_logging"
		android:summary="@string/enable_metrics_logging_summary"
		android:defaultValue="true"
		android:persistent="true" />
		</PreferenceScreen>

java/src/com/android/inputmethod/latin/settings/AccountsSettingsFragment.java

0 → 100644

+82 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2014 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.inputmethod.latin.settings;

		import android.content.Context;
		import android.content.SharedPreferences;
		import android.content.res.Resources;
		import android.os.Bundle;
		import android.preference.Preference;

		import com.android.inputmethod.latin.R;
		import com.android.inputmethod.latin.SubtypeSwitcher;
		import com.android.inputmethod.latin.define.ProductionFlags;

		/**
		* "Accounts & Privacy" settings sub screen.
		*
		* This settings sub screen handles the following preferences:
		* - TODO: Account selection/management for IME
		* - TODO: Sync preferences
		* - TODO: Privacy preferences
		*/
		public final class AccountsSettingsFragment extends SubScreenFragment {
		@Override
		public void onCreate(final Bundle icicle) {
		super.onCreate(icicle);
		addPreferencesFromResource(R.xml.prefs_screen_accounts);

		final Resources res = getResources();
		final Context context = getActivity();

		// When we are called from the Settings application but we are not already running, some
		// singleton and utility classes may not have been initialized. We have to call
		// initialization method of these classes here. See {@link LatinIME#onCreate()}.
		SubtypeSwitcher.init(context);

		if (ProductionFlags.IS_METRICS_LOGGING_SUPPORTED) {
		final Preference enableMetricsLogging =
		findPreference(Settings.PREF_ENABLE_METRICS_LOGGING);
		if (enableMetricsLogging != null) {
		final String enableMetricsLoggingTitle = res.getString(
		R.string.enable_metrics_logging, getApplicationName());
		enableMetricsLogging.setTitle(enableMetricsLoggingTitle);
		}
		} else {
		removePreference(Settings.PREF_ENABLE_METRICS_LOGGING);
		}
		}

		@Override
		public void onResume() {
		super.onResume();
		refreshAccountSelection();
		}

		@Override
		public void onSharedPreferenceChanged(final SharedPreferences prefs, final String key) {
		// TODO: Look at the preference that changed before refreshing the view.
		refreshAccountSelection();
		}

		private void refreshAccountSelection() {
		// TODO: Fetch the currently selected account.
		// Set the summary for the account preference.
		// Depending on the account selection, enable/disable preferences that
		// depend on an account.
		}
		}

java/src/com/android/inputmethod/latin/settings/AdvancedSettingsFragment.java

+5 −3

Original line number	Diff line number	Diff line
		@@ -93,14 +93,16 @@ public final class AdvancedSettingsFragment extends SubScreenFragment {
		removePreference(Settings.PREF_SHOW_SETUP_WIZARD_ICON);
		}

		// If metrics logging isn't supported, or account sign in is enabled
		// don't show the logging preference.
		// TODO: Eventually when we enable account sign in by default,
		// we'll remove logging preference from here.
		if (ProductionFlags.IS_METRICS_LOGGING_SUPPORTED) {
		final Preference enableMetricsLogging =
		findPreference(Settings.PREF_ENABLE_METRICS_LOGGING);
		if (enableMetricsLogging != null) {
		final int applicationLabelRes = context.getApplicationInfo().labelRes;
		final String applicationName = res.getString(applicationLabelRes);
		final String enableMetricsLoggingTitle = res.getString(
		R.string.enable_metrics_logging, applicationName);
		R.string.enable_metrics_logging, getApplicationName());
		enableMetricsLogging.setTitle(enableMetricsLoggingTitle);
		}
		} else {