From 774b6b7573c0f2ca71d234fc8ac86a5be82b72eb Mon Sep 17 00:00:00 2001 From: jeffreyhuang Date: Fri, 20 Oct 2017 13:00:36 -0700 Subject: [PATCH 1/7] Reduce padding so that view is no longer hidden Change-Id: Iaf9bdea162a8c7422914c141625885873fe1b878 Fixes: 63583041 Test: Manual using settings app --- res/layout/search_panel.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/layout/search_panel.xml b/res/layout/search_panel.xml index 48a1d4ce1e5..42fbefba0d5 100644 --- a/res/layout/search_panel.xml +++ b/res/layout/search_panel.xml @@ -76,7 +76,7 @@ android:id="@+id/no_results_layout" android:layout_width="match_parent" android:layout_height="match_parent" - android:paddingTop="96dp" + android:paddingTop="35dp" android:orientation="vertical" android:visibility="gone"> From dd8e66fa202f9b351c7be174c81df63adb1767e2 Mon Sep 17 00:00:00 2001 From: Rajeev Kumar Date: Fri, 20 Oct 2017 12:44:17 -0700 Subject: [PATCH 2/7] Remove SearchIndexProvider from DataPlanUsageSummary fragment. This change will prevent showing Data plan usage in the settings search. Data plan usage feature has been punted to next release and we do not want to show this to user in current release. Bug: 68022715 Test: make RunSettingsRoboTests -j40 Change-Id: I56b71796e3c426122434ca9e86c1a2db691849cf DO NOT MERGE --- .../datausage/DataPlanUsageSummary.java | 50 +----------------- .../search/SearchIndexableResources.java | 2 - .../grandfather_not_implementing_indexable | 1 + .../datausage/DataPlanUsageSummaryTest.java | 52 ------------------- 4 files changed, 2 insertions(+), 103 deletions(-) diff --git a/src/com/android/settings/datausage/DataPlanUsageSummary.java b/src/com/android/settings/datausage/DataPlanUsageSummary.java index 1905deb96ff..912db0a3877 100644 --- a/src/com/android/settings/datausage/DataPlanUsageSummary.java +++ b/src/com/android/settings/datausage/DataPlanUsageSummary.java @@ -27,7 +27,6 @@ import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiManager; import android.os.Bundle; import android.os.UserManager; -import android.provider.SearchIndexableResource; import android.provider.Settings; import android.support.annotation.VisibleForTesting; import android.support.v7.preference.Preference; @@ -44,14 +43,12 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.dashboard.SummaryLoader; -import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settings.search.Indexable; import com.android.settingslib.NetworkPolicyEditor; import com.android.settingslib.net.DataUsageController; import java.util.ArrayList; import java.util.List; -public class DataPlanUsageSummary extends DataUsageBase implements Indexable { +public class DataPlanUsageSummary extends DataUsageBase { public static final String KEY_DATA_PLAN_USAGE = "data_plan_usage"; @@ -353,50 +350,5 @@ public class DataPlanUsageSummary extends DataUsageBase implements Indexable { public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY = SummaryProvider::new; - - /** - * For search - */ - public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider() { - - @Override - public List getXmlResourcesToIndex(Context context, - boolean enabled) { - List resources = new ArrayList<>(); - SearchIndexableResource resource = new SearchIndexableResource(context); - resource.xmlResId = R.xml.data_usage; - resources.add(resource); - - resource = new SearchIndexableResource(context); - resource.xmlResId = R.xml.data_plan_usage_cell_data_preference_screen; - resources.add(resource); - - resource = new SearchIndexableResource(context); - resource.xmlResId = R.xml.data_usage_wifi; - resources.add(resource); - - return resources; - } - - @Override - public List getNonIndexableKeys(Context context) { - List keys = super.getNonIndexableKeys(context); - - if (!DataUsageUtils.hasMobileData(context)) { - keys.add(KEY_MOBILE_USAGE_TITLE); - keys.add(KEY_MOBILE_DATA_USAGE_TOGGLE); - } - - if (!DataUsageUtils.hasWifiRadio(context)) { - keys.add(KEY_WIFI_DATA_USAGE); - keys.add(KEY_NETWORK_RESTRICTIONS); - } - - keys.add(KEY_WIFI_USAGE_TITLE); - - return keys; - } - }; } diff --git a/src/com/android/settings/search/SearchIndexableResources.java b/src/com/android/settings/search/SearchIndexableResources.java index b9e944ec049..3b12e200a89 100644 --- a/src/com/android/settings/search/SearchIndexableResources.java +++ b/src/com/android/settings/search/SearchIndexableResources.java @@ -41,7 +41,6 @@ import com.android.settings.backup.BackupSettingsActivity; import com.android.settings.backup.BackupSettingsFragment; import com.android.settings.bluetooth.BluetoothSettings; import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment; -import com.android.settings.datausage.DataPlanUsageSummary; import com.android.settings.datausage.DataUsageMeteredSettings; import com.android.settings.datausage.DataUsageSummary; import com.android.settings.deletionhelper.AutomaticStorageManagerSettings; @@ -135,7 +134,6 @@ public final class SearchIndexableResources { R.drawable.ic_settings_wireless); addIndex(BluetoothSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_bluetooth); addIndex(SimSettings.class, NO_DATA_RES_ID, R.drawable.ic_sim_sd); - addIndex(DataPlanUsageSummary.class, NO_DATA_RES_ID, R.drawable.ic_settings_data_usage); addIndex(DataUsageSummary.class, NO_DATA_RES_ID, R.drawable.ic_settings_data_usage); addIndex(DataUsageMeteredSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_data_usage); addIndex(ScreenZoomSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_display); diff --git a/tests/robotests/assets/grandfather_not_implementing_indexable b/tests/robotests/assets/grandfather_not_implementing_indexable index e8a32ecad56..1a978cdb421 100644 --- a/tests/robotests/assets/grandfather_not_implementing_indexable +++ b/tests/robotests/assets/grandfather_not_implementing_indexable @@ -23,6 +23,7 @@ com.android.settings.inputmethod.UserDictionaryList com.android.settings.datausage.DataSaverSummary com.android.settings.notification.ChannelNotificationSettings com.android.settings.datausage.AppDataUsage +com.android.settings.datausage.DataPlanUsageSummary com.android.settings.accessibility.FontSizePreferenceFragmentForSetupWizard com.android.settings.applications.ManageDomainUrls com.android.settings.applications.WriteSettingsDetails diff --git a/tests/robotests/src/com/android/settings/datausage/DataPlanUsageSummaryTest.java b/tests/robotests/src/com/android/settings/datausage/DataPlanUsageSummaryTest.java index 30c77365e53..748c3173793 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataPlanUsageSummaryTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataPlanUsageSummaryTest.java @@ -33,18 +33,13 @@ import android.net.wifi.WifiManager; import com.android.settings.R; import com.android.settings.TestConfig; import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.XmlTestUtils; -import com.android.settings.testutils.shadow.ShadowConnectivityManager; -import com.android.settings.testutils.shadow.ShadowDataUsageUtils; import com.android.settingslib.NetworkPolicyEditor; import java.util.ArrayList; -import java.util.List; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; @@ -129,53 +124,6 @@ public class DataPlanUsageSummaryTest { assertThat(mDataUsageSummary.isMetered(mWifiConfiguration)).isFalse(); } - @Test - @Config(shadows = ShadowDataUsageUtils.class) - public void testNonIndexableKeys_existInXmlLayout() { - final Context context = RuntimeEnvironment.application; - ShadowDataUsageUtils.IS_WIFI_SUPPORTED = true; - ShadowDataUsageUtils.IS_MOBILE_DATA_SUPPORTED = true; - final List niks = DataPlanUsageSummary.SEARCH_INDEX_DATA_PROVIDER - .getNonIndexableKeys(context); - final List keys = new ArrayList<>(); - - keys.addAll(XmlTestUtils.getKeysFromPreferenceXml(context, R.xml.data_usage_wifi)); - keys.addAll(XmlTestUtils.getKeysFromPreferenceXml(context, R.xml.data_usage)); - keys.addAll(XmlTestUtils.getKeysFromPreferenceXml(context, - R.xml.data_plan_usage_cell_data_preference_screen)); - - assertThat(keys).containsAllIn(niks); - } - - @Test - @Config(shadows = ShadowDataUsageUtils.class) - public void testNonIndexableKeys_hasMobileData_hasWifi_allNonIndexableKeysAdded() { - ShadowDataUsageUtils.IS_WIFI_SUPPORTED = false; - ShadowDataUsageUtils.IS_MOBILE_DATA_SUPPORTED = false; - List keys = DataPlanUsageSummary.SEARCH_INDEX_DATA_PROVIDER - .getNonIndexableKeys(mContext); - - // Mobile data keys - assertThat(keys).contains(DataPlanUsageSummary.KEY_MOBILE_USAGE_TITLE); - assertThat(keys).contains(DataPlanUsageSummary.KEY_MOBILE_DATA_USAGE_TOGGLE); - - // Wifi keys - assertThat(keys).contains(DataPlanUsageSummary.KEY_WIFI_DATA_USAGE); - assertThat(keys).contains(DataPlanUsageSummary.KEY_NETWORK_RESTRICTIONS); - assertThat(keys).contains(DataPlanUsageSummary.KEY_WIFI_USAGE_TITLE); - } - - @Test - @Config(shadows = ShadowDataUsageUtils.class) - public void testNonIndexableKeys_noMobile_noWifi_limitedNonIndexableKeys() { - ShadowDataUsageUtils.IS_WIFI_SUPPORTED = true; - ShadowDataUsageUtils.IS_MOBILE_DATA_SUPPORTED = true; - List keys = DataPlanUsageSummary.SEARCH_INDEX_DATA_PROVIDER - .getNonIndexableKeys(mContext); - - assertThat(keys).containsExactly(DataPlanUsageSummary.KEY_WIFI_USAGE_TITLE); - } - private void initTest() { mDataUsageSummary = new DataPlanUsageSummary(); mPolicyEditor = mock(NetworkPolicyEditor.class); From 7206a2998da38aee70c9258fef372909e767319a Mon Sep 17 00:00:00 2001 From: tiansiming Date: Tue, 24 Oct 2017 17:19:27 +0800 Subject: [PATCH 3/7] Fix wrong position of cursor in OwnerInfoSettings Bug:N/A Test:Settings -> Security -> right settings icon of Screen lock -> Lock screen message. The cursor shows at the forefront of this EditText. Change-Id: I86fe1bdbe78f700053e38b0cba4a5c8365af946e Signed-off-by: tiansiming --- src/com/android/settings/OwnerInfoSettings.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/com/android/settings/OwnerInfoSettings.java b/src/com/android/settings/OwnerInfoSettings.java index 18cfb8e35f8..3128dfe6ab8 100644 --- a/src/com/android/settings/OwnerInfoSettings.java +++ b/src/com/android/settings/OwnerInfoSettings.java @@ -67,6 +67,7 @@ public class OwnerInfoSettings extends InstrumentedDialogFragment implements OnC mOwnerInfo = (EditText) mView.findViewById(R.id.owner_info_edit_text); if (!TextUtils.isEmpty(info)) { mOwnerInfo.setText(info); + mOwnerInfo.setSelection(info.length()); } } From 89b8e5c1032ec48792111434f04cbde4b38f3707 Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Mon, 23 Oct 2017 15:21:09 -0700 Subject: [PATCH 4/7] Deprecate resId field in SearchIndexableResources Change-Id: Ie69a68beae51e35c7bc861cd124d8195c1ed39dd Bug: 37741509 Test: robotests --- .../fuelgauge/BatterySaverSettings.java | 25 ++- .../settings/location/LocationSettings.java | 20 ++- .../settings/location/ScanningSettings.java | 31 +++- .../notification/ZenModeBehaviorSettings.java | 23 ++- .../notification/ZenModeSettings.java | 18 ++- .../ZenModeVisualInterruptionSettings.java | 23 ++- .../search/SearchIndexableResources.java | 146 +++++++++--------- .../search/indexing/IndexDataConverter.java | 6 +- .../grandfather_not_implementing_indexable | 6 - .../fuelgauge/BatterySaverSettingsTest.java | 13 ++ .../location/ScanningSettingsTest.java | 58 +++++++ .../notification/ZenModeSettingsTest.java | 14 ++ .../search/SearchIndexableResourcesTest.java | 18 +-- 13 files changed, 294 insertions(+), 107 deletions(-) create mode 100644 tests/robotests/src/com/android/settings/location/ScanningSettingsTest.java diff --git a/src/com/android/settings/fuelgauge/BatterySaverSettings.java b/src/com/android/settings/fuelgauge/BatterySaverSettings.java index 88dab494355..f00b9520bba 100644 --- a/src/com/android/settings/fuelgauge/BatterySaverSettings.java +++ b/src/com/android/settings/fuelgauge/BatterySaverSettings.java @@ -25,6 +25,7 @@ import android.os.AsyncTask; import android.os.Bundle; import android.os.Handler; import android.os.PowerManager; +import android.provider.SearchIndexableResource; import android.provider.Settings.Global; import android.support.annotation.VisibleForTesting; import android.util.Log; @@ -38,10 +39,16 @@ import com.android.settings.Utils; import com.android.settings.dashboard.conditional.BatterySaverCondition; import com.android.settings.dashboard.conditional.ConditionManager; import com.android.settings.notification.SettingPref; +import com.android.settings.search.BaseSearchIndexProvider; +import com.android.settings.search.Indexable; import com.android.settings.widget.SwitchBar; +import java.util.Arrays; +import java.util.List; + public class BatterySaverSettings extends SettingsPreferenceFragment - implements SwitchBar.OnSwitchChangeListener, BatterySaverReceiver.BatterySaverListener { + implements SwitchBar.OnSwitchChangeListener, BatterySaverReceiver.BatterySaverListener, + Indexable { private static final String TAG = "BatterySaverSettings"; private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG); private static final String KEY_TURN_ON_AUTOMATICALLY = "turn_on_automatically"; @@ -89,7 +96,7 @@ public class BatterySaverSettings extends SettingsPreferenceFragment protected String getCaption(Resources res, int value) { if (value > 0 && value < 100) { return res.getString(R.string.battery_saver_turn_on_automatically_pct, - Utils.formatPercentage(value)); + Utils.formatPercentage(value)); } return res.getString(R.string.battery_saver_turn_on_automatically_never); } @@ -219,4 +226,18 @@ public class BatterySaverSettings extends SettingsPreferenceFragment } } } + + /** + * For Search. + */ + public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + new BaseSearchIndexProvider() { + @Override + public List getXmlResourcesToIndex( + Context context, boolean enabled) { + final SearchIndexableResource sir = new SearchIndexableResource(context); + sir.xmlResId = R.xml.battery_saver_settings; + return Arrays.asList(sir); + } + }; } diff --git a/src/com/android/settings/location/LocationSettings.java b/src/com/android/settings/location/LocationSettings.java index d66b3105d2d..39d5f6d214a 100644 --- a/src/com/android/settings/location/LocationSettings.java +++ b/src/com/android/settings/location/LocationSettings.java @@ -27,6 +27,7 @@ import android.location.SettingInjectorService; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; +import android.provider.SearchIndexableResource; import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceCategory; import android.support.v7.preference.PreferenceGroup; @@ -40,6 +41,8 @@ import com.android.settings.SettingsActivity; import com.android.settings.Utils; import com.android.settings.applications.InstalledAppDetails; import com.android.settings.dashboard.SummaryLoader; +import com.android.settings.search.BaseSearchIndexProvider; +import com.android.settings.search.Indexable; import com.android.settings.widget.SwitchBar; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedPreference; @@ -47,6 +50,7 @@ import com.android.settingslib.RestrictedSwitchPreference; import com.android.settingslib.location.RecentLocationApps; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.Comparator; import java.util.List; @@ -77,7 +81,7 @@ import java.util.List; * implementation. */ public class LocationSettings extends LocationSettingsBase - implements SwitchBar.OnSwitchChangeListener { + implements SwitchBar.OnSwitchChangeListener, Indexable { private static final String TAG = "LocationSettings"; @@ -455,4 +459,18 @@ public class LocationSettings extends LocationSettingsBase return new SummaryProvider(activity, summaryLoader); } }; + + /** + * For Search. + */ + public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + new BaseSearchIndexProvider() { + @Override + public List getXmlResourcesToIndex( + Context context, boolean enabled) { + final SearchIndexableResource sir = new SearchIndexableResource(context); + sir.xmlResId = R.xml.location_settings; + return Arrays.asList(sir); + } + }; } diff --git a/src/com/android/settings/location/ScanningSettings.java b/src/com/android/settings/location/ScanningSettings.java index fd5a7fd663d..5c34b62b6a4 100644 --- a/src/com/android/settings/location/ScanningSettings.java +++ b/src/com/android/settings/location/ScanningSettings.java @@ -16,6 +16,8 @@ package com.android.settings.location; +import android.content.Context; +import android.provider.SearchIndexableResource; import android.provider.Settings.Global; import android.support.v14.preference.SwitchPreference; import android.support.v7.preference.Preference; @@ -24,11 +26,16 @@ import android.support.v7.preference.PreferenceScreen; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; +import com.android.settings.search.BaseSearchIndexProvider; +import com.android.settings.search.Indexable; + +import java.util.Arrays; +import java.util.List; /** * A page that configures the background scanning settings for Wi-Fi and Bluetooth. */ -public class ScanningSettings extends SettingsPreferenceFragment { +public class ScanningSettings extends SettingsPreferenceFragment implements Indexable { private static final String KEY_WIFI_SCAN_ALWAYS_AVAILABLE = "wifi_always_scanning"; private static final String KEY_BLUETOOTH_SCAN_ALWAYS_AVAILABLE = "bluetooth_always_scanning"; @@ -56,13 +63,13 @@ public class ScanningSettings extends SettingsPreferenceFragment { private void initPreferences() { final SwitchPreference wifiScanAlwaysAvailable = - (SwitchPreference) findPreference(KEY_WIFI_SCAN_ALWAYS_AVAILABLE); + (SwitchPreference) findPreference(KEY_WIFI_SCAN_ALWAYS_AVAILABLE); wifiScanAlwaysAvailable.setChecked(Global.getInt(getContentResolver(), - Global.WIFI_SCAN_ALWAYS_AVAILABLE, 0) == 1); + Global.WIFI_SCAN_ALWAYS_AVAILABLE, 0) == 1); final SwitchPreference bleScanAlwaysAvailable = - (SwitchPreference) findPreference(KEY_BLUETOOTH_SCAN_ALWAYS_AVAILABLE); + (SwitchPreference) findPreference(KEY_BLUETOOTH_SCAN_ALWAYS_AVAILABLE); bleScanAlwaysAvailable.setChecked(Global.getInt(getContentResolver(), - Global.BLE_SCAN_ALWAYS_AVAILABLE, 0) == 1); + Global.BLE_SCAN_ALWAYS_AVAILABLE, 0) == 1); } @Override @@ -81,4 +88,18 @@ public class ScanningSettings extends SettingsPreferenceFragment { } return true; } + + /** + * For Search. + */ + public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + new BaseSearchIndexProvider() { + @Override + public List getXmlResourcesToIndex( + Context context, boolean enabled) { + final SearchIndexableResource sir = new SearchIndexableResource(context); + sir.xmlResId = R.xml.location_scanning; + return Arrays.asList(sir); + } + }; } diff --git a/src/com/android/settings/notification/ZenModeBehaviorSettings.java b/src/com/android/settings/notification/ZenModeBehaviorSettings.java index 1b5e69f8697..d03b0158860 100644 --- a/src/com/android/settings/notification/ZenModeBehaviorSettings.java +++ b/src/com/android/settings/notification/ZenModeBehaviorSettings.java @@ -18,7 +18,9 @@ package com.android.settings.notification; import android.app.NotificationManager; import android.app.NotificationManager.Policy; +import android.content.Context; import android.os.Bundle; +import android.provider.SearchIndexableResource; import android.provider.Settings; import android.service.notification.ZenModeConfig; import android.support.v14.preference.SwitchPreference; @@ -30,8 +32,13 @@ import android.util.Log; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; +import com.android.settings.search.BaseSearchIndexProvider; +import com.android.settings.search.Indexable; -public class ZenModeBehaviorSettings extends ZenModeSettingsBase { +import java.util.Arrays; +import java.util.List; + +public class ZenModeBehaviorSettings extends ZenModeSettingsBase implements Indexable { private static final String KEY_ALARMS = "zen_mode_alarms"; private static final String KEY_MEDIA = "zen_mode_media"; private static final String KEY_REMINDERS = "zen_mode_reminders"; @@ -303,4 +310,18 @@ public class ZenModeBehaviorSettings extends ZenModeSettingsBase { NotificationManager.from(mContext).setNotificationPolicy(mPolicy); } + /** + * For Search. + */ + public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + new BaseSearchIndexProvider() { + @Override + public List getXmlResourcesToIndex( + Context context, boolean enabled) { + final SearchIndexableResource sir = new SearchIndexableResource(context); + sir.xmlResId = R.xml.zen_mode_behavior_settings; + return Arrays.asList(sir); + } + }; + } diff --git a/src/com/android/settings/notification/ZenModeSettings.java b/src/com/android/settings/notification/ZenModeSettings.java index f112c1b9b26..7f9a7c34940 100644 --- a/src/com/android/settings/notification/ZenModeSettings.java +++ b/src/com/android/settings/notification/ZenModeSettings.java @@ -29,6 +29,7 @@ import android.content.pm.PackageManager; import android.content.pm.ServiceInfo; import android.content.res.Resources; import android.os.Bundle; +import android.provider.SearchIndexableResource; import android.provider.Settings; import android.service.notification.ConditionProviderService; import android.service.notification.ZenModeConfig; @@ -41,6 +42,8 @@ import android.view.View; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; +import com.android.settings.search.BaseSearchIndexProvider; +import com.android.settings.search.Indexable; import com.android.settings.utils.ManagedServiceSettings; import com.android.settings.utils.ZenServiceListing; import com.android.settingslib.TwoTargetPreference; @@ -52,7 +55,7 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; -public class ZenModeSettings extends ZenModeSettingsBase { +public class ZenModeSettings extends ZenModeSettingsBase implements Indexable { public static final String KEY_VISUAL_SETTINGS = "zen_mode_visual_interruptions_settings"; private static final String KEY_BEHAVIOR_SETTINGS = "zen_mode_behavior_settings"; @@ -499,4 +502,17 @@ public class ZenModeSettings extends ZenModeSettingsBase { return type + rule.getName().toString(); } }; + /** + * For Search. + */ + public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + new BaseSearchIndexProvider() { + @Override + public List getXmlResourcesToIndex( + Context context, boolean enabled) { + final SearchIndexableResource sir = new SearchIndexableResource(context); + sir.xmlResId = R.xml.zen_mode_settings; + return Arrays.asList(sir); + } + }; } diff --git a/src/com/android/settings/notification/ZenModeVisualInterruptionSettings.java b/src/com/android/settings/notification/ZenModeVisualInterruptionSettings.java index aa2784804c6..474992c1c91 100644 --- a/src/com/android/settings/notification/ZenModeVisualInterruptionSettings.java +++ b/src/com/android/settings/notification/ZenModeVisualInterruptionSettings.java @@ -18,7 +18,9 @@ package com.android.settings.notification; import android.app.NotificationManager; import android.app.NotificationManager.Policy; +import android.content.Context; import android.os.Bundle; +import android.provider.SearchIndexableResource; import android.support.v14.preference.SwitchPreference; import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceScreen; @@ -26,8 +28,13 @@ import android.util.Log; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; +import com.android.settings.search.BaseSearchIndexProvider; +import com.android.settings.search.Indexable; -public class ZenModeVisualInterruptionSettings extends ZenModeSettingsBase { +import java.util.Arrays; +import java.util.List; + +public class ZenModeVisualInterruptionSettings extends ZenModeSettingsBase implements Indexable { private static final String KEY_SCREEN_OFF = "screenOff"; private static final String KEY_SCREEN_ON = "screenOn"; @@ -122,4 +129,18 @@ public class ZenModeVisualInterruptionSettings extends ZenModeSettingsBase { suppressedVisualEffects); NotificationManager.from(mContext).setNotificationPolicy(mPolicy); } + + /** + * For Search. + */ + public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + new BaseSearchIndexProvider() { + @Override + public List getXmlResourcesToIndex( + Context context, boolean enabled) { + final SearchIndexableResource sir = new SearchIndexableResource(context); + sir.xmlResId = R.xml.zen_mode_visual_interruptions_settings; + return Arrays.asList(sir); + } + }; } diff --git a/src/com/android/settings/search/SearchIndexableResources.java b/src/com/android/settings/search/SearchIndexableResources.java index 94dbe6606de..7252e2d492b 100644 --- a/src/com/android/settings/search/SearchIndexableResources.java +++ b/src/com/android/settings/search/SearchIndexableResources.java @@ -26,7 +26,6 @@ import com.android.settings.DeviceInfoSettings; import com.android.settings.DisplaySettings; import com.android.settings.EncryptionAndCredential; import com.android.settings.LegalSettings; -import com.android.settings.R; import com.android.settings.ScreenPinningSettings; import com.android.settings.SecuritySettings; import com.android.settings.accessibility.AccessibilitySettings; @@ -108,15 +107,15 @@ public final class SearchIndexableResources { static final HashMap sResMap = new HashMap<>(); @VisibleForTesting - static void addIndex(Class indexClass, @XmlRes int xmlResId) { - addIndex(indexClass, xmlResId, null /* targetAction */); + static void addIndex(Class indexClass) { + addIndex(indexClass, null /* targetAction */); } @VisibleForTesting - static void addIndex(Class indexClass, @XmlRes int xmlResId, String targetAction) { + static void addIndex(Class indexClass, String targetAction) { String className = indexClass.getName(); - SearchIndexableResource resource = new SearchIndexableResource(0, xmlResId, className, - NO_RES_ID); + SearchIndexableResource resource = new SearchIndexableResource( + 0 /* rank */, NO_RES_ID, className, NO_RES_ID); if (!TextUtils.isEmpty(targetAction)) { resource.intentAction = targetAction; @@ -127,74 +126,73 @@ public final class SearchIndexableResources { } static { - addIndex(WifiSettings.class, NO_RES_ID); - addIndex(NetworkDashboardFragment.class, NO_RES_ID); - addIndex(ConfigureWifiSettings.class, NO_RES_ID); - addIndex(SavedAccessPointsWifiSettings.class, NO_RES_ID); - addIndex(BluetoothSettings.class, NO_RES_ID); - addIndex(SimSettings.class, NO_RES_ID); - addIndex(DataUsageSummary.class, NO_RES_ID); - addIndex(DataUsageMeteredSettings.class, NO_RES_ID); - addIndex(ScreenZoomSettings.class, NO_RES_ID); - addIndex(DisplaySettings.class, NO_RES_ID, "android.settings.DISPLAY_SETTINGS"); - addIndex(AmbientDisplaySettings.class, NO_RES_ID); - addIndex(WallpaperTypeSettings.class, NO_RES_ID); - addIndex(AppAndNotificationDashboardFragment.class, NO_RES_ID); - addIndex(SoundSettings.class, NO_RES_ID, "android.settings.SOUND_SETTINGS"); - addIndex(ZenModeSettings.class, R.xml.zen_mode_settings); - addIndex(StorageSettings.class, NO_RES_ID); - addIndex(PowerUsageAdvanced.class, NO_RES_ID); - addIndex(DefaultAppSettings.class, NO_RES_ID); - addIndex(ManageAssist.class, NO_RES_ID); - addIndex(SpecialAccessSettings.class, NO_RES_ID); - addIndex(UserSettings.class, NO_RES_ID); - addIndex(AssistGestureSettings.class, NO_RES_ID); - addIndex(PickupGestureSettings.class, NO_RES_ID); - addIndex(DoubleTapScreenSettings.class, NO_RES_ID); - addIndex(DoubleTapPowerSettings.class, NO_RES_ID); - addIndex(DoubleTwistGestureSettings.class, NO_RES_ID); - addIndex(SwipeToNotificationSettings.class, NO_RES_ID); - addIndex(GestureSettings.class, NO_RES_ID); - addIndex(LanguageAndInputSettings.class, NO_RES_ID); - addIndex(LocationSettings.class, R.xml.location_settings); - addIndex(ScanningSettings.class, R.xml.location_scanning); - addIndex(SecuritySettings.class, NO_RES_ID); - addIndex(EncryptionAndCredential.class, NO_RES_ID); - addIndex(ScreenPinningSettings.class, NO_RES_ID); - addIndex(UserAndAccountDashboardFragment.class, NO_RES_ID); - addIndex(VirtualKeyboardFragment.class, NO_RES_ID); - addIndex(AvailableVirtualKeyboardFragment.class, NO_RES_ID); - addIndex(PhysicalKeyboardFragment.class, NO_RES_ID); - addIndex(BackupSettingsActivity.class, NO_RES_ID); - addIndex(BackupSettingsFragment.class, NO_RES_ID); - addIndex(DateTimeSettings.class, NO_RES_ID); - addIndex(AccessibilitySettings.class, NO_RES_ID); - addIndex(PrintSettingsFragment.class, NO_RES_ID); - addIndex(DevelopmentSettingsDashboardFragment.class, NO_RES_ID); - addIndex(DeviceInfoSettings.class, NO_RES_ID); - addIndex(Status.class, NO_RES_ID); - addIndex(LegalSettings.class, NO_RES_ID); - addIndex(SystemDashboardFragment.class, NO_RES_ID); - addIndex(ResetDashboardFragment.class, NO_RES_ID); - addIndex(StorageDashboardFragment.class, NO_RES_ID); - addIndex(ConnectedDeviceDashboardFragment.class, NO_RES_ID); - addIndex(EnterprisePrivacySettings.class, NO_RES_ID); - addIndex(PaymentSettings.class, NO_RES_ID); - addIndex(TextToSpeechSettings.class, NO_RES_ID); - addIndex(TtsEnginePreferenceFragment.class, NO_RES_ID); - addIndex(MagnificationPreferenceFragment.class, NO_RES_ID); - addIndex(AccessibilityShortcutPreferenceFragment.class, NO_RES_ID); - addIndex(ChannelImportanceSettings.class, NO_RES_ID); - addIndex(DreamSettings.class, NO_RES_ID); - addIndex(SupportDashboardActivity.class, NO_RES_ID); - addIndex(AutomaticStorageManagerSettings.class, NO_RES_ID); - addIndex(ConfigureNotificationSettings.class, R.xml.configure_notification_settings); - addIndex(ZenModeBehaviorSettings.class, R.xml.zen_mode_behavior_settings); - addIndex(PowerUsageSummary.class, R.xml.power_usage_summary); - addIndex(BatterySaverSettings.class, R.xml.battery_saver_settings); - addIndex(LockscreenDashboardFragment.class, R.xml.security_lockscreen_settings); - addIndex(ZenModeVisualInterruptionSettings.class, - R.xml.zen_mode_visual_interruptions_settings); + addIndex(WifiSettings.class); + addIndex(NetworkDashboardFragment.class); + addIndex(ConfigureWifiSettings.class); + addIndex(SavedAccessPointsWifiSettings.class); + addIndex(BluetoothSettings.class); + addIndex(SimSettings.class); + addIndex(DataUsageSummary.class); + addIndex(DataUsageMeteredSettings.class); + addIndex(ScreenZoomSettings.class); + addIndex(DisplaySettings.class, "android.settings.DISPLAY_SETTINGS"); + addIndex(AmbientDisplaySettings.class); + addIndex(WallpaperTypeSettings.class); + addIndex(AppAndNotificationDashboardFragment.class); + addIndex(SoundSettings.class, "android.settings.SOUND_SETTINGS"); + addIndex(ZenModeSettings.class); + addIndex(StorageSettings.class); + addIndex(PowerUsageAdvanced.class); + addIndex(DefaultAppSettings.class); + addIndex(ManageAssist.class); + addIndex(SpecialAccessSettings.class); + addIndex(UserSettings.class); + addIndex(AssistGestureSettings.class); + addIndex(PickupGestureSettings.class); + addIndex(DoubleTapScreenSettings.class); + addIndex(DoubleTapPowerSettings.class); + addIndex(DoubleTwistGestureSettings.class); + addIndex(SwipeToNotificationSettings.class); + addIndex(GestureSettings.class); + addIndex(LanguageAndInputSettings.class); + addIndex(LocationSettings.class); + addIndex(ScanningSettings.class); + addIndex(SecuritySettings.class); + addIndex(EncryptionAndCredential.class); + addIndex(ScreenPinningSettings.class); + addIndex(UserAndAccountDashboardFragment.class); + addIndex(VirtualKeyboardFragment.class); + addIndex(AvailableVirtualKeyboardFragment.class); + addIndex(PhysicalKeyboardFragment.class); + addIndex(BackupSettingsActivity.class); + addIndex(BackupSettingsFragment.class); + addIndex(DateTimeSettings.class); + addIndex(AccessibilitySettings.class); + addIndex(PrintSettingsFragment.class); + addIndex(DevelopmentSettingsDashboardFragment.class); + addIndex(DeviceInfoSettings.class); + addIndex(Status.class); + addIndex(LegalSettings.class); + addIndex(SystemDashboardFragment.class); + addIndex(ResetDashboardFragment.class); + addIndex(StorageDashboardFragment.class); + addIndex(ConnectedDeviceDashboardFragment.class); + addIndex(EnterprisePrivacySettings.class); + addIndex(PaymentSettings.class); + addIndex(TextToSpeechSettings.class); + addIndex(TtsEnginePreferenceFragment.class); + addIndex(MagnificationPreferenceFragment.class); + addIndex(AccessibilityShortcutPreferenceFragment.class); + addIndex(ChannelImportanceSettings.class); + addIndex(DreamSettings.class); + addIndex(SupportDashboardActivity.class); + addIndex(AutomaticStorageManagerSettings.class); + addIndex(ConfigureNotificationSettings.class); + addIndex(PowerUsageSummary.class); + addIndex(BatterySaverSettings.class); + addIndex(LockscreenDashboardFragment.class); + addIndex(ZenModeBehaviorSettings.class); + addIndex(ZenModeVisualInterruptionSettings.class); } private SearchIndexableResources() { diff --git a/src/com/android/settings/search/indexing/IndexDataConverter.java b/src/com/android/settings/search/indexing/IndexDataConverter.java index 8010db9bfc0..2b875c3f112 100644 --- a/src/com/android/settings/search/indexing/IndexDataConverter.java +++ b/src/com/android/settings/search/indexing/IndexDataConverter.java @@ -30,7 +30,6 @@ import android.util.Log; import android.util.Xml; import com.android.settings.core.PreferenceControllerMixin; - import com.android.settings.search.DatabaseIndexingUtils; import com.android.settings.search.Indexable; import com.android.settings.search.ResultPayload; @@ -44,7 +43,6 @@ import java.io.IOException; import java.util.ArrayList; import java.util.HashSet; import java.util.List; -import java.util.Locale; import java.util.Map; import java.util.Set; @@ -310,8 +308,8 @@ public class IndexDataConverter { } catch (XmlPullParserException e) { Log.w(LOG_TAG, "XML Error parsing PreferenceScreen: ", e); } catch (IOException e) { - Log.w(LOG_TAG, "IO Error parsing PreferenceScreen: " , e); - } catch (Resources.NotFoundException e ) { + Log.w(LOG_TAG, "IO Error parsing PreferenceScreen: ", e); + } catch (Resources.NotFoundException e) { Log.w(LOG_TAG, "Resoucre not found error parsing PreferenceScreen: ", e); } finally { if (parser != null) parser.close(); diff --git a/tests/robotests/assets/grandfather_not_implementing_indexable b/tests/robotests/assets/grandfather_not_implementing_indexable index fa9235063e0..091ba1242f4 100644 --- a/tests/robotests/assets/grandfather_not_implementing_indexable +++ b/tests/robotests/assets/grandfather_not_implementing_indexable @@ -1,5 +1,4 @@ com.android.settings.location.LocationMode -com.android.settings.notification.ZenModeVisualInterruptionSettings com.android.settings.accessibility.ToggleScreenMagnificationPreferenceFragment com.android.settings.deviceinfo.SimStatus com.android.settings.deviceinfo.PrivateVolumeForget @@ -27,15 +26,12 @@ com.android.settings.datausage.DataPlanUsageSummary com.android.settings.accessibility.FontSizePreferenceFragmentForSetupWizard com.android.settings.applications.ManageDomainUrls com.android.settings.applications.WriteSettingsDetails -com.android.settings.location.LocationSettings com.android.settings.applications.ProcessStatsSummary com.android.settings.users.RestrictedProfileSettings com.android.settings.accounts.ChooseAccountActivity com.android.settings.accounts.ManagedProfileSettings com.android.settings.accessibility.ToggleAutoclickPreferenceFragment com.android.settings.applications.AppLaunchSettings -com.android.settings.fuelgauge.BatterySaverSettings -com.android.settings.location.ScanningSettings com.android.settings.applications.ProcessStatsUi com.android.settings.notification.ZenModeScheduleRuleSettings com.android.settings.datausage.BillingCycleSettings @@ -69,8 +65,6 @@ com.android.settings.applications.PremiumSmsAccess com.android.settings.applications.UsageAccessDetails com.android.settings.applications.AppStorageSettings com.android.settings.notification.NotificationAccessSettings -com.android.settings.notification.ZenModeSettings -com.android.settings.notification.ZenModeBehaviorSettings com.android.settings.accessibility.ToggleDaltonizerPreferenceFragment com.android.settings.localepicker.LocaleListEditor com.android.settings.applications.ExternalSourcesDetails diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverSettingsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverSettingsTest.java index 1e173a2ba52..0e32f6bd16f 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverSettingsTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverSettingsTest.java @@ -18,7 +18,9 @@ package com.android.settings.fuelgauge; import static com.google.common.truth.Truth.assertThat; import android.content.Context; +import android.provider.SearchIndexableResource; +import com.android.settings.R; import com.android.settings.TestConfig; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.SwitchBar; @@ -30,6 +32,8 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; +import java.util.List; + @RunWith(SettingsRobolectricTestRunner.class) @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) public class BatterySaverSettingsTest { @@ -58,4 +62,13 @@ public class BatterySaverSettingsTest { assertThat(mBatterySaverSettings.mSwitchBar.isEnabled()).isTrue(); } + + @Test + public void searchProvider_shouldIndexDefaultXml() { + final List sir = mBatterySaverSettings.SEARCH_INDEX_DATA_PROVIDER + .getXmlResourcesToIndex(mContext, true /* enabled */); + + assertThat(sir).hasSize(1); + assertThat(sir.get(0).xmlResId).isEqualTo(R.xml.battery_saver_settings); + } } diff --git a/tests/robotests/src/com/android/settings/location/ScanningSettingsTest.java b/tests/robotests/src/com/android/settings/location/ScanningSettingsTest.java new file mode 100644 index 00000000000..47b81bf93a6 --- /dev/null +++ b/tests/robotests/src/com/android/settings/location/ScanningSettingsTest.java @@ -0,0 +1,58 @@ +/* + * Copyright (C) 2017 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.settings.location; + +import static com.google.common.truth.Truth.assertThat; + +import android.content.Context; +import android.provider.SearchIndexableResource; + +import com.android.settings.R; +import com.android.settings.TestConfig; +import com.android.settings.testutils.SettingsRobolectricTestRunner; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.robolectric.RuntimeEnvironment; +import org.robolectric.annotation.Config; + +import java.util.List; + +@RunWith(SettingsRobolectricTestRunner.class) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +public class ScanningSettingsTest { + + private Context mContext; + private ScanningSettings mSettings; + + + @Before + public void setUp() { + mContext = RuntimeEnvironment.application; + mSettings = new ScanningSettings(); + } + + @Test + public void searchProvider_shouldIndexDefaultXml() { + final List sir = mSettings.SEARCH_INDEX_DATA_PROVIDER + .getXmlResourcesToIndex(mContext, true /* enabled */); + + assertThat(sir).hasSize(1); + assertThat(sir.get(0).xmlResId).isEqualTo(R.xml.location_scanning); + } +} diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java index 1135d7c1b16..fa2c6b9a2e0 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java @@ -22,6 +22,7 @@ import static junit.framework.Assert.assertTrue; import android.app.NotificationManager; import android.content.Context; +import android.provider.SearchIndexableResource; import android.provider.Settings; import com.android.settings.R; @@ -34,16 +35,20 @@ import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; +import java.util.List; + @RunWith(SettingsRobolectricTestRunner.class) @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) public class ZenModeSettingsTest { private ZenModeSettings.SummaryBuilder mBuilder; private Context mContext; + private ZenModeSettings mSettings; @Before public void setUp() { mContext = RuntimeEnvironment.application.getApplicationContext(); + mSettings = new ZenModeSettings(); mBuilder = new ZenModeSettings.SummaryBuilder(mContext); } @@ -72,4 +77,13 @@ public class ZenModeSettingsTest { && result.indexOf(reminders) < result.indexOf(events)); } + @Test + public void searchProvider_shouldIndexDefaultXml() { + final List sir = mSettings.SEARCH_INDEX_DATA_PROVIDER + .getXmlResourcesToIndex(mContext, true /* enabled */); + + assertThat(sir).hasSize(1); + assertThat(sir.get(0).xmlResId).isEqualTo(R.xml.zen_mode_settings); + } + } diff --git a/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java b/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java index 16debdf4337..0e3ce502c2f 100644 --- a/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java +++ b/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java @@ -18,18 +18,15 @@ package com.android.settings.search; import static android.provider.SearchIndexablesContract.COLUMN_INDEX_NON_INDEXABLE_KEYS_KEY_VALUE; import static com.android.settings.search.SearchIndexableResources.NO_RES_ID; - import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.spy; -import android.annotation.XmlRes; import android.database.Cursor; import android.provider.SearchIndexableResource; - import android.text.TextUtils; -import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; + import com.android.settings.TestConfig; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.wifi.WifiSettings; import org.junit.After; @@ -45,9 +42,6 @@ import java.util.Map; @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) public class SearchIndexableResourcesTest { - @XmlRes - private static final int XML_RES_ID = R.xml.physical_keyboard_settings; - Map sResMapCopy; @Before @@ -69,13 +63,13 @@ public class SearchIndexableResourcesTest { assertThat(SearchIndexableResources.getResourceByName("java.lang.String")).isNull(); final int beforeCount = SearchIndexableResources.values().size(); - SearchIndexableResources.addIndex(java.lang.String.class, XML_RES_ID); + SearchIndexableResources.addIndex(java.lang.String.class); final SearchIndexableResource index = SearchIndexableResources .getResourceByName("java.lang.String"); assertThat(index).isNotNull(); assertThat(index.className).isEqualTo("java.lang.String"); - assertThat(index.xmlResId).isEqualTo(XML_RES_ID); + assertThat(index.xmlResId).isEqualTo(NO_RES_ID); assertThat(index.iconResId).isEqualTo(NO_RES_ID); final int afterCount = SearchIndexableResources.values().size(); assertThat(afterCount).isEqualTo(beforeCount + 1); @@ -95,13 +89,13 @@ public class SearchIndexableResourcesTest { @Test public void testNonIndexableKeys_GetsKeyFromProvider() { SearchIndexableResources.sResMap.clear(); - SearchIndexableResources.addIndex(FakeIndexProvider.class, 0); + SearchIndexableResources.addIndex(FakeIndexProvider.class); SettingsSearchIndexablesProvider provider = spy(new SettingsSearchIndexablesProvider()); Cursor cursor = provider.queryNonIndexableKeys(null); boolean hasTestKey = false; - while(cursor.moveToNext()) { + while (cursor.moveToNext()) { String key = cursor.getString(COLUMN_INDEX_NON_INDEXABLE_KEYS_KEY_VALUE); if (TextUtils.equals(key, FakeIndexProvider.KEY)) { hasTestKey = true; From 66ecad49ba283aef5389876f1be6ffd52fb74030 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Tue, 24 Oct 2017 10:24:03 -0700 Subject: [PATCH 5/7] Import translations. DO NOT MERGE Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import Bug: 68159303 Change-Id: Ia8f0496b1f43d4072ad97b97d8ff7efa1fb19170 --- res/values-af/strings.xml | 5 ++++- res/values-am/strings.xml | 5 ++++- res/values-ar/strings.xml | 5 ++++- res/values-az/strings.xml | 5 ++++- res/values-b+sr+Latn/strings.xml | 5 ++++- res/values-be/strings.xml | 5 ++++- res/values-bg/strings.xml | 5 ++++- res/values-bn/strings.xml | 11 +++++++---- res/values-bs/strings.xml | 9 ++++++--- res/values-ca/strings.xml | 33 +++++++++++++++++--------------- res/values-cs/strings.xml | 5 ++++- res/values-da/strings.xml | 9 ++++++--- res/values-de/strings.xml | 5 ++++- res/values-el/strings.xml | 5 ++++- res/values-en-rAU/strings.xml | 5 ++++- res/values-en-rCA/strings.xml | 5 ++++- res/values-en-rGB/strings.xml | 5 ++++- res/values-en-rIN/strings.xml | 5 ++++- res/values-en-rXC/strings.xml | 5 ++++- res/values-es-rUS/strings.xml | 5 ++++- res/values-es/strings.xml | 5 ++++- res/values-et/strings.xml | 5 ++++- res/values-eu/strings.xml | 7 +++++-- res/values-fa/strings.xml | 5 ++++- res/values-fi/strings.xml | 5 ++++- res/values-fr-rCA/strings.xml | 5 ++++- res/values-fr/strings.xml | 5 ++++- res/values-gl/strings.xml | 5 ++++- res/values-gu/strings.xml | 5 ++++- res/values-hi/strings.xml | 7 +++++-- res/values-hr/strings.xml | 5 ++++- res/values-hu/strings.xml | 5 ++++- res/values-hy/strings.xml | 5 ++++- res/values-in/strings.xml | 5 ++++- res/values-is/strings.xml | 5 ++++- res/values-it/strings.xml | 7 +++++-- res/values-iw/strings.xml | 5 ++++- res/values-ja/strings.xml | 7 +++++-- res/values-ka/strings.xml | 5 ++++- res/values-kk/strings.xml | 5 ++++- res/values-km/strings.xml | 5 ++++- res/values-kn/strings.xml | 5 ++++- res/values-ko/strings.xml | 5 ++++- res/values-ky/strings.xml | 7 +++++-- res/values-lo/strings.xml | 9 ++++++--- res/values-lt/strings.xml | 5 ++++- res/values-lv/strings.xml | 5 ++++- res/values-mk/strings.xml | 7 +++++-- res/values-ml/strings.xml | 5 ++++- res/values-mn/strings.xml | 5 ++++- res/values-mr/strings.xml | 5 ++++- res/values-ms/strings.xml | 5 ++++- res/values-my/strings.xml | 5 ++++- res/values-nb/strings.xml | 5 ++++- res/values-ne/strings.xml | 7 +++++-- res/values-nl/strings.xml | 5 ++++- res/values-pa/strings.xml | 5 ++++- res/values-pl/strings.xml | 5 ++++- res/values-pt-rBR/strings.xml | 5 ++++- res/values-pt-rPT/strings.xml | 5 ++++- res/values-pt/strings.xml | 5 ++++- res/values-ro/strings.xml | 5 ++++- res/values-ru/strings.xml | 7 +++++-- res/values-si/strings.xml | 5 ++++- res/values-sk/strings.xml | 5 ++++- res/values-sl/strings.xml | 5 ++++- res/values-sq/strings.xml | 5 ++++- res/values-sr/strings.xml | 5 ++++- res/values-sv/strings.xml | 7 +++++-- res/values-sw/strings.xml | 17 +++++++++------- res/values-ta/strings.xml | 9 ++++++--- res/values-te/strings.xml | 5 ++++- res/values-th/strings.xml | 5 ++++- res/values-tl/strings.xml | 5 ++++- res/values-tr/strings.xml | 5 ++++- res/values-uk/strings.xml | 5 ++++- res/values-ur/strings.xml | 5 ++++- res/values-uz/strings.xml | 13 ++++++++----- res/values-vi/strings.xml | 5 ++++- res/values-zh-rCN/strings.xml | 7 +++++-- res/values-zh-rHK/strings.xml | 5 ++++- res/values-zh-rTW/strings.xml | 7 +++++-- res/values-zu/strings.xml | 5 ++++- 83 files changed, 378 insertions(+), 129 deletions(-) diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml index 0bcb0a1d00b..7af1d22e45d 100644 --- a/res/values-af/strings.xml +++ b/res/values-af/strings.xml @@ -1003,7 +1003,10 @@ "Maak geskiedenis skoon" "Skerm" "Outodraai skerm" - "Helder kleure" + "Kleure" + "Natuurlik" + "Gemaksimeer" + "Kleure" "Wissel oriëntasie outomaties wanneer tablet gedraai word" "Verwissel outomaties van oriëntasie wanneer foon draai" "Wissel oriëntasie outomaties wanneer tablet gedraai word" diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml index 37d8fbc8654..bdaf732e25c 100644 --- a/res/values-am/strings.xml +++ b/res/values-am/strings.xml @@ -1003,7 +1003,10 @@ "ታሪክን አጽዳ" "አሳይ" "ማያ በራስ ሰር አሽከርክር" - "ፈካ ያሉ ቀለማት" + "ቀለማት" + "ተፈጥሯዊ" + "ተጨምሯል" + "ቀለም የሞላ" "ጡባዊ ሲሽከረከርየገፅ አቀማመጥ በራስሰርቀይር" "ስልክ ስታሽከረክር በራስሰር ገፅ አቀማመጡን ቀይር" "ጡባዊ ሲሽከረከርየገፅ አቀማመጥ በራስሰርቀይር" diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml index 0fe26f781db..0af158bf3c7 100644 --- a/res/values-ar/strings.xml +++ b/res/values-ar/strings.xml @@ -1051,7 +1051,10 @@ "محو السجلّ" "الشاشة" "التدوير التلقائي للشاشة" - "ألوان ساطعة" + "الألوان" + "طبيعي" + "مُحسن" + "مُشبع" "تبديل الاتجاه تلقائيًا عند تدوير الجهاز اللوحي" "تبديل الاتجاه تلقائيًا عند تدوير الهاتف" "تبديل الاتجاه تلقائيًا عند تدوير الجهاز اللوحي" diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml index a3159737b8a..346f00f010a 100644 --- a/res/values-az/strings.xml +++ b/res/values-az/strings.xml @@ -1003,7 +1003,10 @@ "Tarixçəni təmizləyin" "Göstər" "Avtodönüşlü ekran" - "Canlı rənglər" + "Rənglər" + "Təbii" + "Artan" + "Dolğun" "Planşetin pozisiyasından asılı olaraq orientasiyanı dəyiş" "Telefonun pozisiyasından asılı olaraq orientasiyanı dəyiş" "Planşetin pozisiyasından asılı olaraq orientasiyanı dəyiş" diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml index a95d94b2ae0..7c7b22c3c30 100644 --- a/res/values-b+sr+Latn/strings.xml +++ b/res/values-b+sr+Latn/strings.xml @@ -1015,7 +1015,10 @@ "Obriši istoriju" "Ekran" "Automatsko rotiranje ekrana" - "Živopisne boje" + "Boje" + "Prirodne" + "Pojačane" + "Zasićene" "Promeni položaj automatski prilikom rotiranja tableta" "Automatska promena položaja prilikom rotacije telefona" "Promeni položaj automatski prilikom rotiranja tableta" diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml index 7efe1999b7b..5d178ee888a 100644 --- a/res/values-be/strings.xml +++ b/res/values-be/strings.xml @@ -1028,7 +1028,10 @@ "Ачысціць гісторыю" "Дысплэй" "Аўтаматычны паварот экрана" - "Насычаныя колеры" + "Колеры" + "Натуральны" + "Узмоцнены" + "Насычаны" "Аўтаматычна змяняць арыентацыю экрана пры павароце планшэта" "Аўтаматычна змяняць арыентацыю экрана пры павароце тэлефона" "Аўтаматычна змяняць арыентацыю экрана пры павароце планшэта" diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml index a18b6785a2a..39482337a62 100644 --- a/res/values-bg/strings.xml +++ b/res/values-bg/strings.xml @@ -1003,7 +1003,10 @@ "Изчистване на историята" "Дисплей" "Авт. завъртане на екрана" - "Ярки цветове" + "Цветове" + "Естествени" + "Подсилени" + "Наситени" "Автоматично превключване на ориентацията при завъртане на таблета" "Автоматично превключване на ориентацията при завъртане на телефона" "Автоматично превключване на ориентацията при завъртане на таблета" diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml index 2605dec3a0f..7595e433c44 100644 --- a/res/values-bn/strings.xml +++ b/res/values-bn/strings.xml @@ -1003,7 +1003,10 @@ "ইতিহাস সাফ করুন" "প্রদর্শন" "স্বতঃ ঘূর্ণায়মান স্ক্রিন" - "উজ্জ্বল রঙ" + "রঙ" + "স্বাভাবিক" + "বুস্ট করা" + "স্যাচুরেশন বাড়ানো" "যখন ট্যাবলেট ঘোরানো হবে তখন স্থিতিবিন্যাস স্বয়ংক্রিয়ভাবে পরিবর্তন করুন" "যখন ফোন ঘোরানো হবে তখন স্থিতি বিন্যাস স্বয়ংক্রিয়ভাবে পরিবর্তন করুন" "যখন ট্যাবলেট ঘোরানো হবে তখন স্থিতিবিন্যাস স্বয়ংক্রিয়ভাবে পরিবর্তন করুন" @@ -2640,9 +2643,9 @@ "ডিফল্ট ব্যবহার করুন" "সবসময়" "অন্য কোনো অর্থপ্রদান অ্যাপ্লিকেশান খুলে থাকার সময় ব্যতিত" - "ট্যাপ করে অর্থপ্রদান করুন টার্মিন্যালে, এর মাধ্যমে অর্থ প্রদান করুন:" - "টার্মিনালে অর্থপ্রদানের পদ্ধতি" - "একটি অর্থপ্রদানের অ্যাপ্লিকেশান সেট আপ করুন৷ তারপরে যোগাযোগহীন চিহ্ন সহ কোনো টার্মিনালের উপর শুধু আপনার ফোনের পিছনের দিকটি ধরুন৷" + "ট্যাপ করে অর্থপ্রদান করুন টার্মিন্যালে, এর মাধ্যমে পেমেন্ট করুন:" + "টার্মিনালে পেমেন্টের পদ্ধতি" + "একটি পেমেন্টের অ্যাপ্লিকেশান সেট আপ করুন৷ তারপরে যোগাযোগহীন চিহ্ন সহ কোনো টার্মিনালের উপর শুধু আপনার ফোনের পিছনের দিকটি ধরুন৷" "বুঝেছি" "আরো..." "আপনার পছন্দ হিসেবে সেট করুন?" diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml index 460a21b45b1..36eb82a4825 100644 --- a/res/values-bs/strings.xml +++ b/res/values-bs/strings.xml @@ -1015,7 +1015,10 @@ "Obriši historiju" "Prikaz" "Automatsko rotiranje ekrana" - "Izražene boje" + "Boje" + "Prirodne" + "Poboljšane" + "Zasićene" "Automatski promijeni orijentaciju prilikom rotiranja tableta" "Automatski promijeni orijentaciju prilikom rotiranja telefona" "Automatski promijeni orijentaciju prilikom rotiranja tableta" @@ -1409,8 +1412,8 @@ "Paket mobilne usluge" "Aplikacija za SMS" "Promijeniti aplikaciju za SMS?" - "Želite li koristiti aplikaciju %1$s umjesto aplikacije %2$s kao aplikaciju za SMS?" - "Koristiti %s kao vašu SMS aplikaciju?" + "Koristiti %1$s umjesto aplikacije %2$s kao aplikaciju za SMS?" + "Koristiti %s kao aplikaciju za SMS?" "Ocjenjivač mreže" "Ništa" "Promijeniti Wi-Fi asistenta?" diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index fa0fc563d16..87a88eb3c50 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -136,14 +136,14 @@ "%1$s vol desactivar el Bluetooth" "Una aplicació vol activar el Bluetooth" "Una aplicació vol desactivar el Bluetooth" - "%1$s vol que la tauleta sigui visible per a altres dispositius amb Bluetooth durant %2$d segons." - "%1$s vol que el telèfon sigui visible per a altres dispositius amb Bluetooth durant %2$d segons." - "Una aplicació vol que la tauleta sigui visible per a altres dispositius amb Bluetooth durant %1$d segons." - "Una aplicació vol que el telèfon sigui visible per a altres dispositius amb Bluetooth durant %1$d segons." - "%1$s vol que la tauleta sigui visible per a altres dispositius amb Bluetooth. Pots canviar aquesta opció més endavant a la configuració del Bluetooth." - "%1$s vol que el telèfon sigui visible per a altres dispositius amb Bluetooth. Pots canviar aquesta opció més endavant a la configuració del Bluetooth." - "Una aplicació vol que la tauleta sigui visible per a altres dispositius amb Bluetooth. Pots canviar aquesta opció més endavant a la configuració del Bluetooth." - "Una aplicació vol que el telèfon sigui visible per a altres dispositius amb Bluetooth. Pots canviar aquesta opció més endavant a la configuració del Bluetooth." + "%1$s vol que la tauleta sigui visible per a altres dispositius Bluetooth durant %2$d segons." + "%1$s vol que el telèfon sigui visible per a altres dispositius Bluetooth durant %2$d segons." + "Una aplicació vol que la tauleta sigui visible per a altres dispositius Bluetooth durant %1$d segons." + "Una aplicació vol que el telèfon sigui visible per a altres dispositius Bluetooth durant %1$d segons." + "%1$s vol que la tauleta sigui visible per a altres dispositius Bluetooth. Pots canviar aquesta opció més endavant a la configuració del Bluetooth." + "%1$s vol que el telèfon sigui visible per a altres dispositius Bluetooth. Pots canviar aquesta opció més endavant a la configuració del Bluetooth." + "Una aplicació vol que la tauleta sigui visible per a altres dispositius Bluetooth. Pots canviar aquesta opció més endavant a la configuració del Bluetooth." + "Una aplicació vol que el telèfon sigui visible per a altres dispositius Bluetooth. Pots canviar aquesta opció més endavant a la configuració del Bluetooth." "%1$s vol activar el Bluetooth i que la tauleta sigui visible per a altres dispositius durant %2$d segons." "%1$s vol activar el Bluetooth i que el telèfon sigui visible per a altres dispositius durant %2$d segons." "Una aplicació vol activar el Bluetooth i que la tauleta sigui visible per a altres dispositius durant %1$d segons." @@ -1003,7 +1003,10 @@ "Esborra l\'historial" "Pantalla" "Gira pantalla automàticament" - "Colors vius" + "Colors" + "Natural" + "Intens" + "Saturat" "Canvia l\'orientació automàticament en girar la tauleta" "Canvia l\'orientació automàticament en girar el telèfon" "Canvia l\'orientació automàticament en girar la tauleta" @@ -1395,8 +1398,8 @@ "Xarxa mòbil" "Pla mòbil" "Aplicació d\'SMS" - "Vols canviar l\'aplicació per a SMS?" - "Vols fer servir %1$s en lloc de %2$s com a aplicació per als SMS?" + "Vols canviar l\'aplicació d\'SMS?" + "Vols fer servir %1$s en lloc de %2$s com a aplicació d\'SMS?" "Vols fer servir %s com a aplicació per als SMS?" "Proveïdor de valoració de xarxes" "Cap" @@ -2441,8 +2444,8 @@ "Aplicacions i usuaris eliminats" "%1$s rebuts, %2$s enviats" "%2$s: ús aproximat de %1$s" - "%2$s: ús aproximat de %1$s, segons mesura la tauleta. És possible que l\'operador faci un recompte diferent de la utilització." - "%2$s: ús aproximat de %1$s, segons el telèfon. És possible que l\'operador faci un càlcul diferent de l\'ús de les dades." + "%2$s: %1$s, ús aproximat segons la tauleta. L\'operador pot fer un càlcul diferent." + "%2$s: %1$s, ús aproximat segons el telèfon. L\'operador pot fer un càlcul diferent." "Restriccions de xarxa" "Quan les dades en segon pla es restringeixen, les xarxes amb límit de dades es tracten igual que les xarxes mòbils. Pot ser que les aplicacions mostrin un advertiment abans d\'utilitzar aquestes xarxes per baixar fitxers grans." "Xarxes mòbils" @@ -3021,7 +3024,7 @@ "Totes les trucades" "Contactes seleccionats" "Trucades repetides" - "Si una mateixa persona truca dues vegades en un període de %d minuts, permet la segona trucada" + "Si una mateixa persona truca dues vegades en menys de %d minuts, permet la segona trucada" "Activa automàticam." "Mai" "Cada nit" @@ -3370,7 +3373,7 @@ "La Wi-Fi, el Bluetooth i la xarxa mòbil estan desactivats. No pots fer trucades telefòniques ni connectar-te a Internet." "No molestis activat (%1$s)" "Estalvi de bateria activat" - "El rendiment ha disminuït. Els Serveis d\'ubicació i les dades en segon pla s\'han desactivat." + "El rendiment ha disminuït. Els serveis d\'ubicació i les dades en segon pla s\'han desactivat." "Dades mòbils desactivades" "Internet només està disponible per Wi-Fi" "Economitzador de dades activat" diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index a8f251ea9ce..029a7fbc793 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -1027,7 +1027,10 @@ "Vymazat historii" "Obrazovka" "Autom. otočení obrazovky" - "Živé barvy" + "Barvy" + "Přirozené" + "Zesílené" + "Syté" "Při otáčení tabletu automaticky přepínat orientaci" "Při otáčení telefonu automaticky přepínat orientaci" "Při otáčení tabletu automaticky přepínat orientaci" diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index 36dff880689..6bd335c0dd3 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -1003,7 +1003,10 @@ "Ryd historik" "Skærm" "Roter skærm automatisk" - "Levende farver" + "Farver" + "Naturlig" + "Forstærket" + "Mættet" "Skift automatisk retning, når tabletcomputeren drejes" "Skift automatisk retning, når telefonen drejes" "Skift automatisk retning, når tabletcomputeren drejes" @@ -1070,7 +1073,7 @@ "Indstillinger" "Automatisk lysstyrke" "Løft enheden for at vække den" - "Inaktiv skærm" + "Aktiv låseskærm" "Altid aktiveret/øget batteriforbrug" "Nye underretninger" "Hvornår skal den vises" @@ -2915,7 +2918,7 @@ "Ingen installerede apps har anmodet om adgang til underretninger." "Tillad adgang til underretninger for %1$s?" - "%1$s kan læse alle underretninger, herunder personlige oplysninger såsom navne på kontaktpersoner og teksten i de meddelelser, du modtager. Underretningslytteren kan også afvise underretninger eller udløse handlingsknapper, de indeholder. \n\nDette gør det også muligt for appen at slå Forstyr ikke til eller fra og ændre relaterede indstillinger." + "%1$s kan læse alle underretninger, herunder personlige oplysninger såsom navne på kontaktpersoner og teksten i de meddelelser, du modtager. Underretningslytteren kan også afvise underretninger eller aktivere handlingsknapper, de indeholder. \n\nDette gør det også muligt for appen at slå Forstyr ikke til eller fra og ændre relaterede indstillinger." "Hvis du slår adgang til underretninger fra for %1$s, slås adgangen til Forstyr ikke muligvis også fra." "Slå fra" "Annuller" diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index ce52448ca1f..0b90ccdaf9c 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -1003,7 +1003,10 @@ "Verlauf löschen" "Display" "Display automatisch drehen" - "Kräftige Farben" + "Farben" + "Natürlich" + "Verstärkt" + "Gesättigt" "Ausrichtung beim Drehen des Tablets automatisch ändern" "Ausrichtung beim Drehen des Telefons automatisch ändern" "Ausrichtung beim Drehen des Tablets automatisch ändern" diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index 45bb031f997..6bb177d374b 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -1003,7 +1003,10 @@ "Διαγραφή ιστορικού" "Προβολή" "Αυτόματη περιστροφή οθόνης" - "Έντονα χρώματα" + "Χρώματα" + "Φυσικό" + "Ενισχυμένο" + "Κορεσμένο" "Αυτόματη εναλλαγή προσανατολισμού κατά την περιστροφή του tablet" "Αυτόματη εναλλαγή προσανατολισμού κατά την περιστροφή του τηλεφώνου" "Αυτόματη εναλλαγή προσανατολισμού κατά την περιστροφή του tablet" diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml index 78a51025bcf..0284c41e5e0 100644 --- a/res/values-en-rAU/strings.xml +++ b/res/values-en-rAU/strings.xml @@ -1003,7 +1003,10 @@ "Clear history" "Display" "Auto-rotate screen" - "Vivid colours" + "Colours" + "Natural" + "Boosted" + "Saturated" "Switch orientation automatically when rotating tablet" "Switch orientation automatically when rotating phone" "Switch orientation automatically when rotating tablet" diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml index 227d3c5fbcb..a77c2ed3bee 100644 --- a/res/values-en-rCA/strings.xml +++ b/res/values-en-rCA/strings.xml @@ -1003,7 +1003,10 @@ "Clear history" "Display" "Auto-rotate screen" - "Vivid colours" + "Colours" + "Natural" + "Boosted" + "Saturated" "Switch orientation automatically when rotating tablet" "Switch orientation automatically when rotating phone" "Switch orientation automatically when rotating tablet" diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml index 78a51025bcf..0284c41e5e0 100644 --- a/res/values-en-rGB/strings.xml +++ b/res/values-en-rGB/strings.xml @@ -1003,7 +1003,10 @@ "Clear history" "Display" "Auto-rotate screen" - "Vivid colours" + "Colours" + "Natural" + "Boosted" + "Saturated" "Switch orientation automatically when rotating tablet" "Switch orientation automatically when rotating phone" "Switch orientation automatically when rotating tablet" diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml index 78a51025bcf..0284c41e5e0 100644 --- a/res/values-en-rIN/strings.xml +++ b/res/values-en-rIN/strings.xml @@ -1003,7 +1003,10 @@ "Clear history" "Display" "Auto-rotate screen" - "Vivid colours" + "Colours" + "Natural" + "Boosted" + "Saturated" "Switch orientation automatically when rotating tablet" "Switch orientation automatically when rotating phone" "Switch orientation automatically when rotating tablet" diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml index 663f88ac9b3..98562c92ffe 100644 --- a/res/values-en-rXC/strings.xml +++ b/res/values-en-rXC/strings.xml @@ -1002,7 +1002,10 @@ "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‎‎‏‏‏‏‎‏‏‎‎‎‎‏‏‏‎‎‎‏‎‏‏‏‎‏‏‏‎‎‏‏‏‎‏‎‎‎‎‏‏‏‏‏‎‏‏‏‏‏‎‏‏‎‎‏‎Clear history‎‏‎‎‏‎" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‏‎‎‎‏‏‎‎‏‎‎‏‎‎‎‏‎‏‏‎‎‎‎‏‎‎‎‏‏‏‏‏‏‎‏‏‏‎‎‏‎‏‏‏‏‎‏‏‏‏‎‏‏‏‏‎‎Display‎‏‎‎‏‎" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‎‎‎‎‎‎‎‏‎‎‏‎‏‏‎‎‏‎‏‏‏‎‎‏‎‏‎‏‎‎‎‎‏‏‎‏‎‎‎‏‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‏‎Auto-rotate screen‎‏‎‎‏‎" - "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‏‏‎‏‏‎‎‎‎‎‎‎‎‎‎‎‏‎‏‏‎‏‏‎‎‎‎‎‎‏‏‏‎‏‏‎‎‎‏‎‎‏‎‏‏‏‏‏‎‎‏‎‎‏‏‏‎Vivid colors‎‏‎‎‏‎" + "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‎‎‎‎‎‏‏‏‎‏‎‎‎‏‏‎‎‎‏‏‏‏‎‎‎‏‏‏‎‏‎‎‎‎‏‎‎‏‏‏‎‎‏‎‏‎‎‏‏‏‎Colors‎‏‎‎‏‎" + "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‏‎‎‏‎‏‎‎‏‎‏‏‏‎‏‎‏‎‏‎‎‎‎‎‏‎‎‏‎‎‏‎‏‎‎‏‎‎‎‏‏‏‏‎‎‎‏‏‎‎‎‏‎‏‏‎‎Natural‎‏‎‎‏‎" + "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‎‏‏‏‏‏‎‎‎‎‎‎‎‎‎‏‏‎‎‏‎‏‏‎‏‎‏‏‎‏‎‏‎‏‏‏‎‎‎‏‏‏‎‎‏‎‏‏‎‎‏‎‎‎Boosted‎‏‎‎‏‎" + "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‎‏‏‎‏‎‏‎‏‏‎‎‎‏‏‏‎‏‎‏‏‎‎‏‏‎‏‏‎‏‏‏‎‎‎‏‏‎‏‎‏‏‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎Saturated‎‏‎‎‏‎" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‏‏‏‏‏‎‏‏‏‏‎‎‏‏‎‏‎‎‏‏‏‏‎‎‎‏‎‏‎‎‎‎‏‏‏‏‎‎‎‎‏‎‏‏‎‏‎‎‎‏‏‎‎‏‏‏‎‎Switch orientation automatically when rotating tablet‎‏‎‎‏‎" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‏‏‎‏‏‏‎‏‏‏‏‎‏‏‎‎‎‎‎‎‎‏‏‎‏‎‏‎‎‏‎‏‎‏‎‏‏‎‎‎‎‎‎‏‏‎‏‎‎‏‏‎‏‎‏‎‏‎Switch orientation automatically when rotating phone‎‏‎‎‏‎" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‎‏‎‏‏‏‎‎‎‎‏‎‎‎‎‏‏‏‏‎‏‏‏‎‏‎‏‎‎‏‏‎‏‎‏‎‎‏‏‏‎‎‎‎‏‎‎‎‎‏‎‏‎‎‏‎‎Switch orientation automatically when rotating tablet‎‏‎‎‏‎" diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml index 2204b8cb321..25c91adefa1 100644 --- a/res/values-es-rUS/strings.xml +++ b/res/values-es-rUS/strings.xml @@ -1003,7 +1003,10 @@ "Borrar historial" "Pantalla" "Rotar automáticamente la pantalla" - "Colores intensos" + "Colores" + "Naturales" + "Reforzados" + "Saturados" "Cambiar la orientación automáticamente al girar el tablet" "Cambiar la orientación automáticamente al girar el dispositivo" "Cambiar la orientación automáticamente al girar el tablet" diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 407a3e0b2a3..72b00821368 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -1003,7 +1003,10 @@ "Borrar historial" "Pantalla" "Girar pantalla automáticamente" - "Colores intensos" + "Colores" + "Naturales" + "Reforzados" + "Saturados" "Cambiar orientación al girar el tablet" "Cambiar orientación automáticamente al girar el teléfono" "Cambiar orientación al girar el tablet" diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml index c8fed01e62a..7022c82c132 100644 --- a/res/values-et/strings.xml +++ b/res/values-et/strings.xml @@ -1003,7 +1003,10 @@ "Kustuta ajalugu" "Ekraan" "Pööra ekraani automaatselt" - "Erksad värvid" + "Värvid" + "Loomulik" + "Võimendatud" + "Küllastatud" "Tahvelarvuti pööramisel automaatselt paigutuse ümberlülitamine" "Muuda telefoni pööramisel automaatselt orientatsiooni" "Tahvelarvuti pööramisel automaatselt paigutuse ümberlülitamine" diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml index 309843045b7..92fda464074 100644 --- a/res/values-eu/strings.xml +++ b/res/values-eu/strings.xml @@ -1003,7 +1003,10 @@ "Garbitu historia" "Bistaratzea" "Biratu pantaila automatikoki" - "Kolore biziak" + "Koloreak" + "Naturalak" + "Nabarmenduta" + "Saturatuta" "Aldatu orientazioa automatikoki tableta biratzean" "Aldatu orientazioa automatikoki telefonoa biratzean" "Aldatu orientazioa automatikoki tableta biratzean" @@ -2254,7 +2257,7 @@ "Gailua administratzeko aplikazioak" "Ez dago gailua administratzeko aplikaziorik" "Pertsonala" - "Lantokia" + "Lanekoak" "Ez dago agente fidagarririk erabilgarri" "Gailua administratzeko aplikazioa aktibatu?" "Aktibatu gailua administratzeko aplikazioa" diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml index 5c0a00912f0..59dd423bd2a 100644 --- a/res/values-fa/strings.xml +++ b/res/values-fa/strings.xml @@ -1003,7 +1003,10 @@ "پاک کردن سابقه" "صفحه‌نمایش" "چرخش خودکار صفحه" - "رنگ‌های زنده" + "رنگ‌" + "طبیعی" + "تقویت‌شده" + "اشباع‌شده" "هنگام چرخاندن رایانهٔ لوحی، جهت به‌طور خودکار تغییر می‌کند" "هنگام چرخاندن تلفن، جهت به‌طور خودکار تغییر می‌کند" "هنگام چرخاندن رایانهٔ لوحی، جهت به‌طور خودکار تغییر می‌کند" diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml index 2e1f9ce16ef..cd64171bdd5 100644 --- a/res/values-fi/strings.xml +++ b/res/values-fi/strings.xml @@ -1003,7 +1003,10 @@ "Tyhjennä historia" "Näyttö" "Näytön automaattinen kierto" - "Kirkkaat värit" + "Värit" + "Luonnollinen" + "Tehostettu" + "Kylläinen" "Vaihda suuntaa automaattisesti, kun tablet-laitetta kierretään" "Vaihda suuntaa automaattisesti, kun puhelinta käännetään" "Vaihda suuntaa automaattisesti, kun tablet-laitetta kierretään" diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml index 47886750cdb..4d14643062f 100644 --- a/res/values-fr-rCA/strings.xml +++ b/res/values-fr-rCA/strings.xml @@ -1003,7 +1003,10 @@ "Effacer l\'historique" "Affichage" "Rotation auto de l\'écran" - "Couleurs vives" + "Couleurs" + "Naturelles" + "Intenses" + "Saturées" "Changer automatiquement d\'orientation lors de la rotation de la tablette" "Changer automatiquement d\'orientation lors de la rotation" "Changer automatiquement d\'orientation lors de la rotation de la tablette" diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 543d970ad97..b2a62b468df 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -1003,7 +1003,10 @@ "Effacer l\'historique" "Affichage" "Rotation auto de l\'écran" - "Couleurs vives" + "Couleurs" + "Naturel" + "Contrasté" + "Saturé" "Changer automatiquement d\'orientation lors de la rotation de la tablette" "Changer automatiquement d\'orientation lors de la rotation du téléphone" "Changer automatiquement d\'orientation lors de la rotation de la tablette" diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml index 684a63290f2..f9b437fd922 100644 --- a/res/values-gl/strings.xml +++ b/res/values-gl/strings.xml @@ -1003,7 +1003,10 @@ "Borrar historial" "Pantalla" "Xirar a pantalla automaticamente" - "Cores vivas" + "Cores" + "Natural" + "Realzado" + "Saturado" "Cambia a orientación automaticamente ao xirar a tableta" "Cambia a orientación automaticamente ao xirar o teléfono" "Cambia a orientación automaticamente ao xirar a tableta" diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml index 3f445a2f788..13085efa818 100644 --- a/res/values-gu/strings.xml +++ b/res/values-gu/strings.xml @@ -1003,7 +1003,10 @@ "ઇતિહાસ સાફ કરો" "ડિસ્પ્લે" "સ્ક્રીનને આપમેળે ફેરવો" - "આબેહૂબ રંગ" + "રંગો" + "કુદરતી" + "બુસ્ટ કરેલ" + "સંતૃપ્ત" "ટેબ્લેટને ફેરવતી વખતે ઓરિએન્ટેશનને આપમેળે સ્વિચ કરો" "ફોનને ફેરવતી વખતે ઓરિએન્ટેશનને આપમેળે સ્વિચ કરો" "ટેબ્લેટને ફેરવતી વખતે ઓરિએન્ટેશનને આપમેળે સ્વિચ કરો" diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml index 1dbc098a079..2c03a9da91d 100644 --- a/res/values-hi/strings.xml +++ b/res/values-hi/strings.xml @@ -1003,7 +1003,10 @@ "इतिहास साफ़ करें" "स्क्रीन सेटिंग" "स्‍क्रीन अपनेआप घुमाएं" - "चमकीले रंग" + "रंग" + "बिना किसी बदलाव के" + "बढ़ाया गया" + "सैचुरेट किया गया" "टैबलेट घुमाने पर स्क्रीन की दिशा अपने आप बदलें" "फ़ोन घुमाने पर स्क्रीन की दिशा अपने आप बदलें" "टैबलेट घुमाने पर स्क्रीन की दिशा अपने आप बदलें" @@ -2428,7 +2431,7 @@ "सेट करें" "डेटा खर्च की चेतावनी सेट करें" "डेटा खर्च की सीमा सेट करें" - "डेटा र्खच सीमित करना" + "डेटा खर्च सीमित करना" "जैसे ही आपका टैबलेट डेटा, आपकी सेट की हुई सीमा पर पहुंचेगा, आपका टैबलेट उसे बंद कर देगा.\n\nचूंकि डेटा खर्च आपके टैबलेट से मापा जाता है और आपकी मोबाइल और इंटरनेट सेवा देने वाली कंपनी, इस्तेमाल किए गए डेटा का हिसाब अलग तरीके से लगा सकती है. इसलिए सीमा को कम पर सेट करने के बारे में विचार करें." "जैसे ही आपका मोबाइल डेटा आपकी सेट की हुई सीमा पर पहुंचेगा, आपका फ़ोन उसे बंद कर देगा.\n\nचूंकि डेटा खर्च आपके फ़ोन से मापा जाता है और आपकी मोबाइल और इंटरनेट सेवा देने वाली कंपनी, इस्तेमाल किए गए डेटा का हिसाब अलग तरीके से लगा सकती है. इसलिए सीमा को कम पर सेट करने के बारे में विचार करें." "पृष्ठभूमि डेटा प्रतिबंधित करें?" diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml index da03dc80651..74f2d738173 100644 --- a/res/values-hr/strings.xml +++ b/res/values-hr/strings.xml @@ -1015,7 +1015,10 @@ "Izbriši povijest" "Prikaz" "Automatski zakreni zaslon" - "Žive boje" + "Boje" + "Prirodno" + "Pojačano" + "Zasićeno" "Prebaci orijentaciju automatski pri rotaciji tabletnog uređaja" "Promijeni orijentaciju automatski kod rotacije telefona" "Prebaci orijentaciju automatski pri rotaciji tabletnog uređaja" diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml index 08e9853af51..7e3a83779a9 100644 --- a/res/values-hu/strings.xml +++ b/res/values-hu/strings.xml @@ -1003,7 +1003,10 @@ "Előzmények törlése" "Megjelenítés" "Automatikus képernyőforgatás" - "Élénk színek" + "Színek" + "Természetes" + "Élénk" + "Telített" "Tájolás automatikus váltása a táblagép forgatásakor" "Tájolás automatikus váltása a telefon elfordításakor" "Tájolás automatikus váltása a táblagép forgatásakor" diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml index 60b73ee9b7a..d7c5f7a6aef 100644 --- a/res/values-hy/strings.xml +++ b/res/values-hy/strings.xml @@ -1003,7 +1003,10 @@ "Մաքրել պատմությունը" "Էկրան" "Ավտոմատ պտտել էկրանը" - "Վառ գույներ" + "Գույներ" + "Բնական" + "Պայծառ" + "Հագեցած" "Ավտոմատ փոխել դիրքավորումը պլանշետը պտտելիս" "Ավտոմատ փոխել դիրքավորումը հեռախոսը պտտելիս" "Գրասալիկը պտտեցնելիս ինքնաշխատ փոխել դիրքավորումը" diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml index 7451ff81431..a2aed0ed0e3 100644 --- a/res/values-in/strings.xml +++ b/res/values-in/strings.xml @@ -1003,7 +1003,10 @@ "Hapus histori" "Tampilan" "Rotasi layar otomatis" - "Warna jernih" + "Warna" + "Alami" + "Ditingkatkan" + "Disaturasi" "Ubah orientasi secara otomatis ketika memutar tablet" "Berganti orientasi secara otomatis ketika memutar ponsel" "Ubah orientasi secara otomatis ketika memutar tablet" diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml index e13509be864..b35c8589373 100644 --- a/res/values-is/strings.xml +++ b/res/values-is/strings.xml @@ -1003,7 +1003,10 @@ "Hreinsa feril" "Skjár" "Snúa skjá sjálfkrafa" - "Skærir litir" + "Litir" + "Náttúrulegir" + "Efldir" + "Mettaðir" "Snúa skjámynd sjálfkrafa þegar spjaldtölvu er snúið" "Breyta stefnu sjálfkrafa þegar símanum er snúið" "Snúa skjámynd sjálfkrafa þegar spjaldtölvu er snúið" diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index 8ceb762cd8a..99b54631c85 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -1003,7 +1003,10 @@ "Cancella cronologia" "Display" "Rotazione automatica" - "Colori vivaci" + "Colori" + "Naturali" + "Migliorati" + "Intensi" "Cambia automaticamente l\'orientamento quando il tablet viene ruotato" "Cambia automaticamente quando il cellulare viene ruotato" "Cambia automaticamente l\'orientamento quando il tablet viene ruotato" @@ -1395,7 +1398,7 @@ "Rete mobile" "Piano dati mobile" "App SMS" - "Cambiare app per gli SMS?" + "Vuoi cambiare app per gli SMS?" "Utilizzare %1$s anziché %2$s come app per gli SMS?" "Utilizzare %s come app per gli SMS?" "Fornitore di servizi di valutazione rete" diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml index ed2798655ad..a030f819cb7 100644 --- a/res/values-iw/strings.xml +++ b/res/values-iw/strings.xml @@ -1027,7 +1027,10 @@ "נקה את ההיסטוריה" "תצוגה" "סיבוב אוטומטי של המסך" - "צבעים עזים" + "צבעים" + "טבעי" + "מוגבר" + "רווי" "שנה כיוון באופן אוטומטי בעת סיבוב הטאבלט" "שנה כיוון באופן אוטומטי בעת סיבוב הטלפון" "שנה כיוון באופן אוטומטי בעת סיבוב הטאבלט" diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index c6153b70e96..b4095d1133f 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -770,7 +770,7 @@ "Wi-Fiネットワークを変更する権限がありません。" "その他" "自動設定（WPS）" - "詳細設定項目" + "詳細設定" "詳細オプションのプルダウン リストです。折りたたむにはダブルタップします。" "詳細オプションのプルダウン リストです。展開するにはダブルタップします。" "Wi-Fi保護設定" @@ -1003,7 +1003,10 @@ "履歴を削除" "ディスプレイ" "画面の自動回転" - "鮮明な色" + "カラー" + "ナチュラル" + "ブースト" + "彩度調整" "画面の向きに合わせて縦横表示を切り替える" "画面の向きに合わせて縦横表示を切り替える" "画面の向きに合わせて縦横表示を切り替える" diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml index 574c7110905..1330072e9b2 100644 --- a/res/values-ka/strings.xml +++ b/res/values-ka/strings.xml @@ -1003,7 +1003,10 @@ "ისტორიის გასუფთავება" "ეკრანი" "ავტოროტაციის ეკრანი" - "მკვეთრი ფერები" + "ფერები" + "ბუნებრივი" + "კონტრასტული" + "ინტენსიური" "ტაბლეტის გადატრიალებისას ეკრანის ორიენტაციის ავტომატური შეცვლა" "ტელეფონის გადატრიალებისას ეკრანის ორიენტაციის ავტომატური შეცვლა" "ავტომატურად შეიცვალოს ეკრანის ორიენტაცია ტაბლეტის გადატრიალებისას" diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml index 2334fd7f6c5..639d1c963ad 100644 --- a/res/values-kk/strings.xml +++ b/res/values-kk/strings.xml @@ -1003,7 +1003,10 @@ "Тарихты өшіру" "Дисплей" "Экранды автоматты бұру" - "Жанды түстер" + "Түстер" + "Табиғи" + "\"Сергек\" әсерлі" + "Қаныққан" "Планшетті айналдырғанда бағытын автоматты түрде ауыстыру" "Телефонды бұрғанда бағытын автоматты түрде бұру" "Планшетті айналдырғанда бағытын автоматты түрде ауыстыру" diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml index 58d0823c3bc..1e3fa34d144 100644 --- a/res/values-km/strings.xml +++ b/res/values-km/strings.xml @@ -1003,7 +1003,10 @@ "សម្អាត​ប្រវត្តិ" "បង្ហាញ" "បង្វិល​អេក្រង់​ស្វ័យប្រវត្តិ" - "ពណ៌ស្រស់" + "ពណ៌" + "ធម្មជាតិ" + "បង្កើនពន្លឺ" + "ឆ្អែត" "ប្ដូរ​ទិស​ស្វ័យ​ប្រវត្តិ​ពេល​បង្វិល​កុំព្យូទ័រ​បន្ទះ" "ប្ដូរ​ទិស​ស្វ័យ​ប្រវត្តិ​ពេល​បង្វិល​ទូរស័ព្ទ" "ប្ដូរ​ទិស​ស្វ័យប្រវត្តិ​ពេល​បង្វិល​កុំព្យូទ័រ​បន្ទះ" diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml index e559a75628d..c86e5597b34 100644 --- a/res/values-kn/strings.xml +++ b/res/values-kn/strings.xml @@ -1003,7 +1003,10 @@ "ಇತಿಹಾಸ ತೆರವುಗೊಳಿಸಿ" "ಪ್ರದರ್ಶನ" "ಪರದೆಯನ್ನು ಸ್ವಯಂ-ತಿರುಗಿಸು" - "ಹೊಳೆಯುವ ಬಣ್ಣಗಳು" + "ಬಣ್ಣಗಳು" + "ಪ್ರಾಕೃತಿಕ" + "ಬೂಸ್ಟ್ ಮಾಡಲಾಗಿದೆ" + "ಸ್ಯಾಚುರೇಟೆಡ್" "ಟ್ಯಾಬ್ಲೆಟ್‌ ತಿರುಗಿಸುವಾಗ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಓರಿಯಂಟೇಶನ್ ಬದಲಾಯಿಸು" "ಫೋನ್ ಅನ್ನು ತಿರುಗಿಸುವಾಗ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಓರಿಯಂಟೇಶನ್ ಬದಲಾಯಿಸು" "ಟ್ಯಾಬ್ಲೆಟ್‌ ತಿರುಗಿಸುವಾಗ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಓರಿಯಂಟೇಶನ್ ಬದಲಾಯಿಸು" diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index 23d54f35457..048fe7c5224 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -1003,7 +1003,10 @@ "기록 삭제" "디스플레이" "자동 화면 회전" - "선명한 색상" + "색상" + "자연스럽게" + "부스트" + "선명하게" "태블릿 회전 시 자동으로 방향 바꾸기" "휴대전화 회전 시 자동으로 방향 바꾸기" "태블릿 회전 시 자동으로 방향 바꾸기" diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml index 54d3c5ea4e8..8f1a014775d 100644 --- a/res/values-ky/strings.xml +++ b/res/values-ky/strings.xml @@ -1002,7 +1002,10 @@ "Таржымалды тазалоо" "Дисплей" "Экранды авто-буруу" - "Ачык түстөр" + "Түстөр" + "Табигый" + "Күчөтүлгөн" + "Каныккан" "Планшет тегеренип жатканда багытын автоматтык түрдө которуштуруу" "Телефон тегеренип жатканда багытын автоматтык түрдө которуштуруу" "Планшет тегеренип жатканда багытын автоматтык түрдө которуштуруу" @@ -1395,7 +1398,7 @@ "Тарифтик план" "SMS колдонмосу" "SMS колдонмону алмаштырасызбы?" - "Сиздин %2$s SMS колдонмоңуз ордуна %1$s колдонулсунбу?" + "SMS билдирүүлөрү менен жазышуу үчүн %2$s ордуна %1$s колдоносузбу?" "%s SMS колдонмосу болсунбу?" "Тармактардын рейтингинин автору" "Эч бири" diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml index 551090da664..32e6f1064dc 100644 --- a/res/values-lo/strings.xml +++ b/res/values-lo/strings.xml @@ -1003,7 +1003,10 @@ "ລຶບປະຫວັດ" "ການສະແດງຜົນ" "ໝຸນໜ້າຈໍອັດຕະໂນມັດ" - "ສີສົດໃສ" + "ສີ" + "ທຳ​ມະ​ຊາດ" + "ເລັ່ງແລ້ວ" + "ເພີ່ມສີແລ້ວ" "ປັບປ່ຽນທິດທາງອັດຕະໂນມັດເມື່ອໝຸນແທັບເລັດ" "ປັບປ່ຽນທິດທາງອັດຕະໂນມັດເມື່ອໝຸນໂທລະສັບ" "ສະລັບທິດທາງອັດຕະໂນມັດເມື່ອໝຸນແທັບເລັດ" @@ -1395,8 +1398,8 @@ "ເຄືອຂ່າຍໂທລະສັບ" "ແພັກເກດມືຖື" "SMS" - "ປ່ຽນແອັບຯສົ່ງ SMS?" - "ໃຊ້ %1$s ແທນ %2$s ໃຫ້ເປັນແອັບຯ SMS ຂອງທ່ານ?" + "ປ່ຽນແອັບສົ່ງ SMS?" + "ໃຊ້ %1$s ເປັນແອັບສົ່ງ SMS ແທນ %2$s ບໍ?" "ໃຊ້ %s ເປັນແອັບຯ SMS ຂອງທ່ານ?" "ຜູ້ໃຫ້ບໍລິການຄະແນນເຄືອຂ່າຍ" "ບໍ່ໃຊ້" diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml index ca201b43c7d..6a04b7bd709 100644 --- a/res/values-lt/strings.xml +++ b/res/values-lt/strings.xml @@ -1027,7 +1027,10 @@ "Išvalyti istoriją" "Ekranas" "Automatiškai sukti ekraną" - "Ryškios spalvos" + "Spalvos" + "Natūrali" + "Padidinta" + "Sodri" "Sukant planšetinį kompiuterį automatiškai perjungti orientaciją" "Perjungti padėtį automatiškai, kai sukamas telefonas" "Sukant planšetinį kompiuterį automatiškai perjungti orientaciją" diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml index 508478fc70b..a42515f523a 100644 --- a/res/values-lv/strings.xml +++ b/res/values-lv/strings.xml @@ -1015,7 +1015,10 @@ "Dzēst vēsturi" "Attēls" "Automātiska ekrāna pagriešana" - "Izteiksmīgas krāsas" + "Krāsas" + "Dabiska" + "Paspilgtināta" + "Piesātināta" "Mainīt orientāciju automātiski, rotējot planšetdatoru" "Automātiski pārslēgt orientāciju, kad tālrunis tiek pagriezts" "Mainīt orientāciju automātiski, rotējot planšetdatoru" diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml index 01ff2058f17..5a1039cc218 100644 --- a/res/values-mk/strings.xml +++ b/res/values-mk/strings.xml @@ -1003,7 +1003,10 @@ "Исчисти ја историјата" "Приказ" "Автоматско ротирање на екранот" - "Интензивни бои" + "Бои" + "Природно" + "Нагласено" + "Заситено" "Автоматски префрли ја ориентацијата при ротирање на таблетот" "Автоматски префрли ја ориентацијата при ротирање на телефонот" "Автоматски префрли ја ориентацијата при ротирање на таблетот" @@ -1396,7 +1399,7 @@ "Мобилен план" "Апликација за SMS" "Избери апликација за SMS" - "Користи %1$s наместо %2$s како на SMS апликација?" + "Да се користи %1$s наместо %2$s како SMS-апликација?" "Користи %s како SMS апликација?" "Оператор за оценување мрежа" "Ниедно" diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml index 5fd61fae5c2..abf10fddbf3 100644 --- a/res/values-ml/strings.xml +++ b/res/values-ml/strings.xml @@ -1003,7 +1003,10 @@ "ചരിത്രം മായ്‌ക്കുക" "ഡിസ്പ്ലേ" "സ്‌ക്രീൻ സ്വയമേ തിരിക്കുക" - "കടും നിറങ്ങൾ" + "നിറങ്ങൾ" + "സ്വാഭാവികം" + "ബൂസ്‌റ്റ് ചെയ്‌‌ത" + "സാച്ചുറേറ്റ് ചെയ്‌‌ത" "ടാബ്‌ലെറ്റ് തിരിക്കുമ്പോൾ ഒാറിയൻ്റേഷനിലേയ്ക്ക് സ്വയം മാറുക" "ഫോൺ തിരിക്കുമ്പോൾ ഒാറിയൻ്റേഷനിലേയ്ക്ക് സ്വയം മാറുക" "ടാബ്‌ലെറ്റ് തിരിക്കുമ്പോൾ ഒാറിയൻ്റേഷനിലേയ്ക്ക് സ്വയം മാറുക" diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml index dc09a1ba2e0..bfbdf5141c4 100644 --- a/res/values-mn/strings.xml +++ b/res/values-mn/strings.xml @@ -1003,7 +1003,10 @@ "Түүхийг устгах" "Дэлгэц" "Дэлгэцийг автоматаар эргүүлэх" - "Тод өнгө" + "Өнгө" + "Байгалийн" + "Өдөөсөн" + "Өнгө ялгасан" "Таблетыг эргүүлбэл харагдацыг автоматаар эргүүлэх" "Утсыг эргүүлбэл харагдацыг автоматаар эргүүлэх" "Таблетыг эргүүлбэл харагдацыг автоматаар эргүүлэх" diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml index 69da6bdc0d3..8453e641d31 100644 --- a/res/values-mr/strings.xml +++ b/res/values-mr/strings.xml @@ -1003,7 +1003,10 @@ "इतिहास साफ करा" "डिस्प्ले" "स्वयं-फिरणारी स्क्रीन" - "गडद रंग" + "रंग" + "नैसर्गिक" + "बूस्ट केलेला" + "संपृक्त" "टॅब्लेट फिरवताना ओरिएंटेशन आपोआप स्विच करा" "फोन फिरवताना ओरिएंटेशन आपोआप स्विच करा" "टॅब्लेट फिरवताना ओरिएंटेशन आपोआप स्विच करा" diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml index 67e8edeedf5..a2016618bb5 100644 --- a/res/values-ms/strings.xml +++ b/res/values-ms/strings.xml @@ -1003,7 +1003,10 @@ "Kosongkan sejarah" "Paparan" "Skrin autoputar" - "Warna terang" + "Warna" + "Asli" + "Ditingkatkan" + "Tepu" "Menukar orientasi secara automatik apabila memutarkan tablet" "Tukar orientasi secara automatik apabila memutarkan telefon" "Menukar orientasi secara automatik apabila memutarkan tablet" diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml index d728250ae89..060086d9653 100644 --- a/res/values-my/strings.xml +++ b/res/values-my/strings.xml @@ -1003,7 +1003,10 @@ "မှတ်တမ်းကို ရှင်းလင်းရန်" "ဖန်သားပြင်" "မျက်နှာပြင်ကို အော်တိုလှည့်ရန်" - "တောက်ပသော အရောင်များ" + "အရောင်များ" + "သဘာဝ" + "အရောင်တင်ထားသည်" + "စိုစွတ်ပြည့်ဝစေရန် ပြုလုပ်ထားသည်" "တက်ဘလက်ကိုလှည့်လျှင် အနေအထားအားအလိုအလျောက်ပြောင်းရန်" "ဖုန်းကိုလှည့်သည့်အခါတွင် အနေအထားအား အလိုအလျောက်ပြောင်းရန်" "တက်ဘလက်ကိုလှည့်လျှင် အနေအထားအားအလိုအလျောက်ပြောင်းရန်" diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index 3fe19a2b31d..d55e8dbdb69 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -1003,7 +1003,10 @@ "Tøm loggen" "Skjerm" "Rotér skjermen automatisk" - "Levende farger" + "Farger" + "Naturlig" + "Forsterket" + "Mettet" "Bytt retning automatisk når nettbrettet roteres" "Bytt orientering automatisk når telefonen blir snudd" "Bytt retning automatisk når nettbrettet roteres" diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml index 678b811f406..4e5e2bb4191 100644 --- a/res/values-ne/strings.xml +++ b/res/values-ne/strings.xml @@ -1003,7 +1003,10 @@ "इतिहास खाली गर्नुहोस्" "प्रदर्शन" "स्वतःघुम्ने स्क्रिन" - "जीवन्त रङहरू" + "रङहरू" + "प्राकृतिक" + "बढाइयो" + "परिपूर्ण पारियो" "ट्याब्लेट घुमाउँदा स्वचालित रूपमा अभिमुखिकरण स्विच गर्नुहोस्" "फोन घुमाउँदा स्वचालित रूपमा अभिमुखिकरण स्विच गर्नुहोस्" "ट्याब्लेट घुमाउँदा अभिमुखिकरण स्वचालित तवरले बदल्नुहोस्" @@ -1454,7 +1457,7 @@ "सुरक्षा र नियामक सम्बन्धी मार्गदर्शन" "प्रतिलिपि अधिकार" "इजाजतपत्र" - "सेवा सर्तहरू" + "सेवाका सर्तहरू" "प्रणाली वेबभ्यु लाइसेन्स" "वालपेपरहरु" "स्याटलाइट कल्पना प्रदायकहरू:\n©२०१४ CNES / Astrium, DigitalGlobe, Bluesky" diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index 75f63275b23..769297ef0c3 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -1003,7 +1003,10 @@ "Geschiedenis wissen" "Weergave" "Scherm autom. draaien" - "Levendige kleuren" + "Kleuren" + "Natuurlijk" + "Versterkt" + "Verzadigd" "Stand automatisch wijzigen als tablet wordt gedraaid" "Stand automatisch wijzigen als telefoon wordt gedraaid" "Stand automatisch wijzigen als tablet wordt gedraaid" diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml index bf93b4aa6c9..54ecf4a1de7 100644 --- a/res/values-pa/strings.xml +++ b/res/values-pa/strings.xml @@ -1003,7 +1003,10 @@ "ਇਤਿਹਾਸ ਕਲੀਅਰ ਕਰੋ" "ਡਿਸਪਲੇ" "ਸਕ੍ਰੀਨ ਆਪਣੇ-ਆਪ ਘੁੰਮਾਓ" - "ਸ਼ੋਖ ਰੰਗ" + "ਰੰਗ" + "ਕੁਦਰਤੀ" + "ਵਧਾਇਆ ਗਿਆ" + "ਪਰਿਪੂਰਨ ਕੀਤਾ ਗਿਆ" "ਟੈਬਲੈੱਟ ਨੂੰ ਘੁੰਮਾਉਣ ਵੇਲੇ ਆਪਣੇ ਆਪ ਦਿਸ਼ਾਮਾਨ \'ਤੇ ਬਦਲੋ" "ਫ਼ੋਨ ਨੂੰ ਘੁੰਮਾਉਣ ਵੇਲੇ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਦਿਸ਼ਾਮਾਨ ਸਵਿੱਚ ਕਰੋ" "ਟੈਬਲੈੱਟ ਨੂੰ ਘੁੰਮਾਉਣ ਵੇਲੇ ਆਪਣੇ ਆਪ ਦਿਸ਼ਾਮਾਨ \'ਤੇ ਬਦਲੋ" diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index 9eacd8ca8c5..7b3116ad701 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -1027,7 +1027,10 @@ "Wyczyść historię" "Wyświetlacz" "Autoobracanie ekranu" - "Żywe kolory" + "Kolory" + "Naturalne" + "Wzmocnione" + "Nasycone" "Automatycznie przełącz orientację przy obracaniu tabletu" "Automatycznie przełącz orientację przy obracaniu telefonu" "Automatycznie przełącz orientację przy obracaniu tabletu" diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml index f8fee0302b8..c3c79f2b348 100644 --- a/res/values-pt-rBR/strings.xml +++ b/res/values-pt-rBR/strings.xml @@ -1003,7 +1003,10 @@ "Limpar histórico" "Tela" "Girar tela automaticamente" - "Cores vívidas" + "Cores" + "Natural" + "Realçada" + "Saturada" "Alternar orientação automaticamente ao girar o tablet" "Alternar orientação automaticamente ao girar o telefone" "Alternar orientação automaticamente ao girar o tablet" diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml index eeb0f101406..18b4c65cd9d 100644 --- a/res/values-pt-rPT/strings.xml +++ b/res/values-pt-rPT/strings.xml @@ -1003,7 +1003,10 @@ "Limpar histórico" "Ecrã" "Rodar ecrã automaticamente" - "Cores vivas" + "Cores" + "Natural" + "Amplificada" + "Saturada" "Mudar orientação automaticamente ao rodar o tablet" "Mudar orientação automaticamente ao rodar o telefone" "Mudar orientação automaticamente ao rodar o tablet" diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index f8fee0302b8..c3c79f2b348 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -1003,7 +1003,10 @@ "Limpar histórico" "Tela" "Girar tela automaticamente" - "Cores vívidas" + "Cores" + "Natural" + "Realçada" + "Saturada" "Alternar orientação automaticamente ao girar o tablet" "Alternar orientação automaticamente ao girar o telefone" "Alternar orientação automaticamente ao girar o tablet" diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml index 2ff1d8dc67e..d9bf3cea1e6 100644 --- a/res/values-ro/strings.xml +++ b/res/values-ro/strings.xml @@ -1015,7 +1015,10 @@ "Ștergeți istoricul" "Afișaj" "Rotire automată a ecranului" - "Culori vii" + "Culori" + "Natural" + "Intensificat" + "Saturat" "Doresc comutarea automată a orientării atunci când se rotește tableta" "Schimbați automat orientarea la rotirea telefonului" "Doresc comutarea automată a orientării atunci când se rotește tableta" diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 221918e9a8e..5fb3763c2c0 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -1027,7 +1027,10 @@ "Очистить историю" "Экран" "Автоповорот экрана" - "Насыщенные цвета" + "Цвета" + "Натуральные" + "Яркие" + "Насыщенные" "Автоматически изменять ориентацию экрана при повороте планшетного ПК" "Автоматически менять ориентацию экрана при повороте телефона" "Автоматически изменять ориентацию экрана при повороте планшетного ПК" @@ -1422,7 +1425,7 @@ "Тарифный план" "Приложение для SMS" "Приложение для обмена SMS" - "Использовать приложение %1$s вместо %2$s для обмена SMS-сообщениями?" + "Использовать %1$s вместо %2$s для обмена SMS-сообщениями?" "Использовать приложение \"%s\" для обмена SMS-сообщениями?" "Источник рейтинга сетей" "Нет" diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml index 246f7682fa7..33f86d1e56b 100644 --- a/res/values-si/strings.xml +++ b/res/values-si/strings.xml @@ -1003,7 +1003,10 @@ "ඉතිහාසය හිස් කරන්න" "සංදර්ශකය" "ස්වයංක්‍රීයව-භ්‍රමණය වන තීරය" - "විචිත්‍ර වර්ණ" + "වර්ණ" + "ස්වභාවික" + "වැඩි කළ" + "සන්තෘප්ත" "ටැබ්ලටය කරකැවීමේදී ස්වයංක්‍රියව දිශානතිය වෙනස් කරන්න" "දුරකථනය කරකැවීමේදී ස්වයංක්‍රියව දිශානතිය වෙනස් කරන්න" "ටැබ්ලටය කරකැවීමේදී ස්වයංක්‍රියව දිශානතිය වෙනස් කරන්න" diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml index 59c64565475..ab1acdc0134 100644 --- a/res/values-sk/strings.xml +++ b/res/values-sk/strings.xml @@ -1027,7 +1027,10 @@ "Vymazať históriu" "Obrazovka" "Automaticky otáčať obrazovku" - "Živé farby" + "Farby" + "Prirodzené" + "Zosilnené" + "Sýte" "Pri otáčaní tabletu automaticky prepínať orientáciu" "Pri otáčaní telefónu automaticky prepínať orientáciu" "Pri otáčaní tabletu automaticky prepínať orientáciu" diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml index 74061270699..3e04d8bcc9b 100644 --- a/res/values-sl/strings.xml +++ b/res/values-sl/strings.xml @@ -1027,7 +1027,10 @@ "Počisti zgodovino" "Zaslon" "Samodejno zasukaj zaslon" - "Intenzivne barve" + "Barve" + "Naravne" + "Poudarjene" + "Nasičene" "Samodejno spremeni usmerjenost ob zasuku tabličnega računalnika" "Samodejno preklopi usmeritev ob zasuku telefona" "Samodejno spremeni usmerjenost ob zasuku tabličnega računalnika" diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml index 387a6b113ed..2a80fa3aa78 100644 --- a/res/values-sq/strings.xml +++ b/res/values-sq/strings.xml @@ -1003,7 +1003,10 @@ "Pastro historikun" "Ekrani" "Ekran me rrotullim automatik" - "Ngjyra të gjalla" + "Ngjyrat" + "Natyrale" + "E theksuar" + "E gjallë" "Ndërro orientimin automatikisht kur rrotullon tabletin" "Ndrysho automatikisht orientimin kur rrotullon telefonin" "Ndërro orientimin automatikisht kur rrotullon tabletin" diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml index 69ef9f9765a..b60aa02f91b 100644 --- a/res/values-sr/strings.xml +++ b/res/values-sr/strings.xml @@ -1015,7 +1015,10 @@ "Обриши историју" "Екран" "Аутоматско ротирање екрана" - "Живописне боје" + "Боје" + "Природне" + "Појачане" + "Засићене" "Промени положај аутоматски приликом ротирања таблета" "Аутоматска промена положаја приликом ротације телефона" "Промени положај аутоматски приликом ротирања таблета" diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index 1e6b488c84d..17e81e3a089 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -639,7 +639,7 @@ "Vill du koppla med den här enheten?" "Vill du dela telefonboken?" "%1$s vill komma åt dina kontakter och din samtalshistorik." - "%1$s vill koppla med Bluetooth. När den är ansluten får den åtkomst till kontakter och samtalshistorik." + "%1$s vill parkoppla med Bluetooth. När den är ansluten får den åtkomst till kontakter och samtalshistorik." "Parkopplade enheter" "Tillgängliga enheter" "Det finns inga enheter tillgängliga" @@ -1003,7 +1003,10 @@ "Rensa historik" "Skärm" "Rotera skärmen automatiskt" - "Starka färger" + "Färger" + "Naturliga" + "Förstärkta" + "Mättade" "Växla riktning automatiskt när du roterar surfplattan" "Växla riktning automatiskt när du roterar telefonen" "Växla riktning automatiskt när du roterar surfplattan" diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml index 779ba9cf590..7206c239621 100644 --- a/res/values-sw/strings.xml +++ b/res/values-sw/strings.xml @@ -1003,7 +1003,10 @@ "Futa historia" "Kwenye Skrini" "Skrini ijizungushe kiotomatiki" - "Rangi dhahiri" + "Rangi" + "Asili" + "Imeongezwa Rangi" + "Imekolezwa" "Badilisha uelekezo kiotomatiki wakati unazungusha kompyuta ndogo" "Badili uelekezaji kiotomatiki wakati wa kuzungusha simu" "Badilisha uelekezo kiotomatiki wakati unazungusha kompyuta ndogo" @@ -1823,7 +1826,7 @@ "Ya majaribio" "Talkback" "Kisoma skrini hasa kwa watu wenye upofu na wenye matatizo ya kuona" - "Gonga vipengee kwenye skrini yako ili usikie vikisoma kwa sauti" + "Gusa vipengee kwenye skrini yako ili usikie vikisoma kwa sauti" "Manukuu" "Ukuzaji" "Kuza kwa kugonga mara tatu" @@ -1833,7 +1836,7 @@ "Gonga mara 3 ili ukuze" "Gonga kitufe ili ukuze" "Ili kukuza"", gonga skrini mara 3 haraka.\n"
  • "Buruta vidole 2 au zaidi ili usogeze"
    • \n
  • "Bana vidole 2 au zaidi ili ubadilishe ukuzaji"
\n\n"Ili kukuza kwa muda mfupi"", gonga skrini mara 3 kwa haraka na ukifika mara ya tatu, usiondoe kidole.\n"
  • "Buruta ili usogeze kwenye skrini"
    • \n
  • "Inua kidole ili uvute mbali"
\n\n"Huwezi kukuza ukitumia kibodi au sehemu ya viungo muhimu." - "Ukiwasha kipengele cha ukuzaji, tumia Kitufe cha zana za walio na matatizo ya kuona au kusikia hapo chini ya skrini ili ukuze haraka.\n\n""Ili kukuza"", gonga Kitufe cha zana za walio na matatizo ya kuona au kusikia, kisha ugonge mahali popote kwenye skrini.\n"
  • "Buruta kwa kutumia vidole 2 au zaidi ili usogeze"
    • \n
  • "Bana vidole 2 au zaidi ili ubadilishe ukuzaji"
\n\n"Ili kukuza kwa muda mfupi"", gonga Kitufe cha zana za walio na matatizo ya kuona au kusikia, kisha uguse na ushikilie mahali popote kwenye skrini.\n"
  • "Buruta ili usogeze kwenye skrini"
    • \n
  • "Inua kidole ili usogeze mbali"
\n\n"Huwezi kuvuta karibu kwenye kibodi au sehemu ya viungo muhimu." + "Ukiwasha kipengele cha ukuzaji, tumia Kitufe cha zana za walio na matatizo ya kuona au kusikia hapo chini ya skrini ili ukuze haraka.\n\n""Ili kukuza"", gusa Kitufe cha zana za walio na matatizo ya kuona au kusikia, kisha ugonge mahali popote kwenye skrini.\n"
  • "Buruta kwa kutumia vidole 2 au zaidi ili usogeze"
    • \n
  • "Bana vidole 2 au zaidi ili ubadilishe ukuzaji"
\n\n"Ili kukuza kwa muda mfupi"", gusa Kitufe cha zana za walio na matatizo ya kuona au kusikia, kisha uguse na ushikilie mahali popote kwenye skrini.\n"
  • "Buruta ili usogeze kwenye skrini"
    • \n
  • "Inua kidole ili usogeze mbali"
\n\n"Huwezi kuvuta karibu kwenye kibodi au sehemu ya viungo muhimu." "Kitufe cha zana za walio na matatizo ya kuona au kusikia kimewekwa kuwa %1$s. Gusa na ushikilie Kitufe cha zana za walio na matatizo ya kuona au kusikia, kisha uchague ukuzaji ili utumie kipengele cha ukuzaji." "Njia ya mkato ya kitufe cha sauti" "Huduma ya njia ya mkato" @@ -2640,14 +2643,14 @@ "Tumia chaguo-msingi" "Kila wakati" "Isipokuwa wakati programu nyingine ya malipo imefunguliwa" - "Unapolipa ukitumia chaguo la Gonga na ulipe, tumia:" + "Unapolipa ukitumia chaguo la Gusisha ili ulipe, tumia:" "Kulipa katika kituo" "Sanidi programu ya malipo. Shikilia tu upande wa nyuma wa simu yako kwenye kituo chochote cha malipo chenye alama ya kulipa bila kugusa." "Nimeelewa" "Zaidi..." "Ungependa kuweka kama mapendeleo yako?" - "Ungependa kutumia %1$s unapotumia Gonga na ulipe?" - "Ungependa kutumia %1$s badala ya %2$s unapotumia Gonga na ulipe?" + "Ungependa kutumia %1$s unapogusisha ili ulipe?" + "Ungependa kutumia %1$s badala ya %2$s unapotumia chaguo la kugusisha ili ulipe?" "Vikwazo" "Ondoa vikwazo" "Badilisha PIN" @@ -3579,7 +3582,7 @@ "Gonga mara mbili ili uangalie simu" "Gonga mara mbili ili uangalie kompyuta kibao" "Gonga mara mbili ili uangalie kifaa" - "Ili uangalie saa, aikoni za arifa na maelezo mengine, gonga skrini yako mara mbili." + "Ili uangalie saa, aikoni za arifa na maelezo mengine, gusa skrini yako mara mbili." "Angalia arifa wakati skrini imezimwa" "Inua ili uangalie simu" "Inua ili uangalie kompyuta kibao" diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml index 5d60765324d..e2370ad0d3e 100644 --- a/res/values-ta/strings.xml +++ b/res/values-ta/strings.xml @@ -1003,7 +1003,10 @@ "வரலாற்றை அழி" "திரை அமைப்பு" "திரையைத் தானாகச் சுழற்று" - "ஒளிமிக்க நிறங்கள்" + "வண்ணங்கள்" + "இயற்கை வண்ணம்" + "பூஸ்ட் செய்யப்பட்டது" + "செறிவூட்டப்பட்டது" "டேப்லெட்டைச் சுழற்றும்போது திசையமைவையும் தானாக மாற்று" "மொபைலைச் சுழற்றும்போது திசையமைவைத் தானாக மாற்று" "டேப்லெட்டைச் சுழற்றும்போது திசையமைவையும் தானாக மாற்று" @@ -1396,8 +1399,8 @@ "மொபைல் திட்டம்" "SMS" "SMS பயன்பாட்டை மாற்றவா?" - "%2$s க்குப் பதிலாக %1$s ஐ உங்கள் SMS பயன்பாடாகப் பயன்படுத்தவா?" - "%s ஐ உங்கள் SMS பயன்பாடாகப் பயன்படுத்தவா?" + "%2$sக்குப் பதிலாக %1$sஐ உங்கள் SMS பயன்பாடாகப் பயன்படுத்தவா?" + "%sஐ உங்கள் SMS பயன்பாடாகப் பயன்படுத்தவா?" "நெட்வொர்க் மதிப்பீட்டு வழங்குநர்" "ஏதுமில்லை" "வைஃபை அசிஸ்டண்டை மாற்றவா?" diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml index f25733b2f4c..92be0658075 100644 --- a/res/values-te/strings.xml +++ b/res/values-te/strings.xml @@ -1003,7 +1003,10 @@ "చరిత్రను తీసివేయి" "ప్రదర్శన" "స్క్రీన్‌ను స్వయంచాలకంగా తిప్పు" - "ప్రకాశవంతమైన రంగులు" + "రంగులు" + "సహజం" + "అభివృద్ధిపరచబడింది" + "సంతృప్తి చెందింది" "టాబ్లెట్ తిప్పుతున్నప్పుడు దృగ్విన్యాసాన్ని స్వయంచాలకంగా మార్చు" "ఫోన్‌ను తిప్పుతున్నప్పుడు దృగ్విన్యాసాన్ని స్వయంచాలకంగా మార్చు" "టాబ్లెట్ తిప్పుతున్నప్పుడు దృగ్విన్యాసాన్ని స్వయంచాలకంగా మార్చు" diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml index fc175ca516a..83325e9fad3 100644 --- a/res/values-th/strings.xml +++ b/res/values-th/strings.xml @@ -1003,7 +1003,10 @@ "ล้างประวัติ" "การแสดงผล" "หมุนหน้าจออัตโนมัติ" - "สีสันสดใส" + "สี" + "ธรรมชาติ" + "บูสต์" + "อิ่มตัว" "เปลี่ยนการวางแนวโดยอัตโนมัติเมื่อหมุนแท็บเล็ต" "สลับแนวหน้าจออัตโนมัติเมื่อหมุนโทรศัพท์" "เปลี่ยนการวางแนวโดยอัตโนมัติเมื่อหมุนแท็บเล็ต" diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml index e2904a8ef34..ad9e8372c3f 100644 --- a/res/values-tl/strings.xml +++ b/res/values-tl/strings.xml @@ -1003,7 +1003,10 @@ "I-clear ang history" "Display" "I-auto rotate ang screen" - "Matitingkad na kulay" + "Mga Kulay" + "Natural" + "Naka-boost" + "Saturated" "Awtomatikong ilipat ang oryentasyon kapag iniikot ang tablet" "Ilipat nang awtomatiko ang oryentasyon kapag niro-rotate ang telepono" "Awtomatikong ilipat ang oryentasyon kapag iniikot ang tablet" diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index e0ca93cb855..c6ab8a61627 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -1003,7 +1003,10 @@ "Geçmişi temizle" "Ekran" "Ekranı otomatik döndür" - "Canlı renkler" + "Renkler" + "Doğal" + "Artırılmış" + "Doymuş" "Tableti döndürürken yönü otomatik değiştir" "Telefonu döndürürken yönü otomatik değiştir" "Tableti döndürürken yönü otomatik değiştir" diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml index 3b049b280cf..5fb0dca230f 100644 --- a/res/values-uk/strings.xml +++ b/res/values-uk/strings.xml @@ -1027,7 +1027,10 @@ "Очистити історію" "Екран" "Автоповорот екрана" - "Яскраві кольори" + "Кольори" + "Природний" + "Насичений" + "Яскравий" "Автомат. переключ. орієнтацію під час обертання пристрою" "Автомат. переключ. орієнтацію при обертанні телефону" "Автомат. переключ. орієнтацію під час обертання пристрою" diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml index d84b684b486..f41c5b990a7 100644 --- a/res/values-ur/strings.xml +++ b/res/values-ur/strings.xml @@ -1003,7 +1003,10 @@ "سرگزشت صاف کریں" "ڈسپلے" "اسکرین کو خود کار طور پر گھمائیں" - "بھڑکیلے رنگ" + "رنگ" + "قدرتی" + "بڑھایا گیا" + "سیچوریٹ کردہ" "ٹیبلٹ گھماتے وقت سمت بندی کو خود کار طور پر سوئچ کریں" "فون گھماتے وقت سمت بندی کو خود کار طور پر سوئچ کریں" "ٹیبلٹ گھماتے وقت سمت بندی کو خود کار طور پر سوئچ کریں" diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml index 64fa8c39f36..89eea460908 100644 --- a/res/values-uz/strings.xml +++ b/res/values-uz/strings.xml @@ -1003,7 +1003,10 @@ "Jurnalni tozalash" "Ekran" "Ekranning avtomatik burilishi" - "Yorqin ranglar" + "Ranglar" + "Tabiiy" + "Yorqin" + "To‘yingan" "Planshet aylantirilganda ekran joylashuvini avtomatik almashtirish" "Ekran joylashuvini telefon burilganda avtomatik almashtirish" "Planshet aylantirilganda ekran joylashuvini avtomatik almashtirish" @@ -1395,9 +1398,9 @@ "Mobil tarmoq" "Uyali tarmoq paketlari" "SMS ilovasi" - "SMS ilovasi o‘zgartirilsinmi?" - "SMS ilovasi sifatida %1$sdan %2$s o‘rniga foydalanilsinmi?" - "%sdan SMS ilovasi sifatida foydalanilsinmi?" + "SMS ilovasi almashtirilsinmi?" + "SMS xabarlar uchun %2$s emas, %1$s ishlatilsinmi?" + "SMS xabarlar uchun %s ishlatilsinmi?" "Tarmoqlar reytingi muallifi" "Hech biri" "Wi‑Fi yordamchisi o‘zgartirilsinmi?" @@ -2910,7 +2913,7 @@ "Past" "O‘rtacha" "Yuqori" - "Juda muhim" + "Shoshilinch" "Bildirishnomalarga ruxsat berish" "Ilovaga ovozli signal va tebranishni yoqishi hamda ekranga bildirishnomalarni chiqarishiga imkon beradi" "Kamroq muhim" diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml index 08ec2fc40b3..17df30a2837 100644 --- a/res/values-vi/strings.xml +++ b/res/values-vi/strings.xml @@ -1003,7 +1003,10 @@ "Xóa lịch sử" "Hiển thị" "Tự động xoay màn hình" - "Màu sắc rực rỡ" + "Màu" + "Tự nhiên" + "Đã tăng độ nét" + "Bão hòa" "Tự động chuyển hướng khi xoay máy tính bảng" "Tự động chuyển hướng khi xoay điện thoại" "Tự động chuyển hướng khi xoay máy tính bảng" diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 78c3152982b..ebc4143c204 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -1003,7 +1003,10 @@ "清除历史记录" "显示" "自动旋转屏幕" - "鲜明的色彩" + "颜色" + "自然色" + "效果增强" + "饱和色" "旋转平板电脑时自动改变浏览模式" "旋转手机时自动改变显示方向" "旋转平板电脑时自动切换浏览模式" @@ -2642,7 +2645,7 @@ "但其他付款应用开启时除外" "通过触碰付款终端进行付款时使用以下应用：" "通过支付终端付款" - "设置付款应用，然后只需将手机背面触碰任何带有非接触标志的终端即可。" + "设置付款应用，然后只需将手机背面靠近任何带有非接触标志的终端即可。" "知道了" "更多…" "要设为您的偏好设置吗？" diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml index 590c9306821..f6fd6c27c3a 100644 --- a/res/values-zh-rHK/strings.xml +++ b/res/values-zh-rHK/strings.xml @@ -1003,7 +1003,10 @@ "清除記錄" "顯示" "自動旋轉螢幕" - "鮮豔顏色" + "顏色" + "自然" + "強化" + "飽和" "旋轉平板電腦時自動切換瀏覽模式" "旋轉手機時自動改變顯示方向" "旋轉平板電腦時自動切換瀏覽模式" diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index cb81caadd8a..68b581b7de6 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -1003,7 +1003,10 @@ "清除紀錄" "顯示" "自動旋轉螢幕" - "鮮明色彩" + "色彩" + "自然" + "增強" + "飽和" "旋轉平板電腦時自動切換瀏覽模式" "旋轉手機時自動改變顯示方向" "旋轉平板電腦時自動切換瀏覽模式" @@ -1396,7 +1399,7 @@ "行動數據傳輸資費方案" "簡訊應用程式" "變更簡訊應用程式？" - "你要改用 %1$s 而不再使用 %2$s 做為簡訊應用程式嗎？" + "你要改用「%1$s」而不再使用「%2$s」做為簡訊應用程式嗎？" "使用 %s 做為簡訊應用程式嗎？" "網路評分服務供應商" "無" diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml index c020c7249ae..577ad6427d4 100644 --- a/res/values-zu/strings.xml +++ b/res/values-zu/strings.xml @@ -1003,7 +1003,10 @@ "Sula umlando" "Ukubukeka" "Phendula iskrini ngokuzenzakalela" - "Imibala ekhanya kakhulu" + "Imibala" + "Kwemvelo" + "I-Boost" + "Ukugcwaliswa kwesikhala" "Shintsha ukujikeleleza ngokuzenzakalela lapho ujikelezisa ithebhulethi" "Shintsha ukujikeleleza ngokuzenzakalela lapho ujikelezisa ifoni" "Shintsha ukujikeleleza ngokuzenzakalela lapho ujikelezisa ithebhulethi" From 05fa18f8474cd5fed798e7ee7ef099682c4a4475 Mon Sep 17 00:00:00 2001 From: Romain Guy Date: Tue, 24 Oct 2017 21:59:40 +0100 Subject: [PATCH 6/7] Add new color mode setting Replace the "vivid" mode setting with a new 3 choice screen: - Natural (sRGB) - Boosted (sRGB + 10% saturation) - Saturated (unmanaged, colors are assigned the native color space) The "Colors" setting that replaces "Vivid" only appears on devices that support wide gamut rendering and color management. Changing the color mode has an immediate effect and triggers a configuration change in running application so that applications that request wide color gamut rendering can react properly (since they lose that ability). Bug: 68159303 Test: make RunSettingsRoboTests Change-Id: I7009723e11ee164c93719f0e42fed9d1b3cf6e01 --- res/xml/display_settings.xml | 6 +- .../ColorModePreferenceController.java | 87 ++------ .../display/ColorModePreferenceFragment.java | 207 ++++++++++++++++++ .../ColorModePreferenceControllerTest.java | 113 ---------- .../ColorModePreferenceFragmentTest.java | 170 ++++++++++++++ 5 files changed, 404 insertions(+), 179 deletions(-) create mode 100644 src/com/android/settings/display/ColorModePreferenceFragment.java delete mode 100644 tests/robotests/src/com/android/settings/display/ColorModePreferenceControllerTest.java create mode 100644 tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml index 27ef86948d1..87d3e5e1d12 100644 --- a/res/xml/display_settings.xml +++ b/res/xml/display_settings.xml @@ -64,9 +64,11 @@ android:key="auto_rotate" android:title="@string/accelerometer_title" /> - + android:title="@string/color_mode_title" + android:fragment="com.android.settings.display.ColorModePreferenceFragment" + settings:keywords="@string/keywords_color_mode" /> 1.0f); - } - @Override public boolean isAvailable() { return mConfigWrapper.isScreenWideColorGamut(); } - @Override - public boolean onPreferenceChange(Preference preference, Object newValue) { - float saturation = (boolean) newValue - ? COLOR_SATURATION_VIVID : COLOR_SATURATION_DEFAULT; - - SystemProperties.set(PERSISTENT_PROPERTY_SATURATION, Float.toString(saturation)); - applySaturation(saturation); - - return true; - } - - /** - * Propagates the provided saturation to the SurfaceFlinger. - */ - private void applySaturation(float saturation) { - if (mSurfaceFlinger != null) { - final Parcel data = Parcel.obtain(); - data.writeInterfaceToken("android.ui.ISurfaceComposer"); - data.writeFloat(saturation); - try { - mSurfaceFlinger.transact(SURFACE_FLINGER_TRANSACTION_SATURATION, data, null, 0); - } catch (RemoteException ex) { - Log.e(TAG, "Failed to set saturation", ex); - } finally { - data.recycle(); - } - } - } - - private static float getSaturationValue() { - try { - return Float.parseFloat(SystemProperties.get( - PERSISTENT_PROPERTY_SATURATION, Float.toString(COLOR_SATURATION_DEFAULT))); - } catch (NumberFormatException e) { - return COLOR_SATURATION_DEFAULT; - } - } - @VisibleForTesting static class ConfigurationWrapper { - private final Context mContext; + private final IBinder mSurfaceFlinger; - ConfigurationWrapper(Context context) { - mContext = context; + ConfigurationWrapper() { + mSurfaceFlinger = ServiceManager.getService("SurfaceFlinger"); } boolean isScreenWideColorGamut() { - return mContext.getResources().getConfiguration().isScreenWideColorGamut(); + if (mSurfaceFlinger != null) { + final Parcel data = Parcel.obtain(); + final Parcel reply = Parcel.obtain(); + data.writeInterfaceToken("android.ui.ISurfaceComposer"); + try { + mSurfaceFlinger.transact(SURFACE_FLINGER_TRANSACTION_QUERY_WIDE_COLOR, + data, reply, 0); + return reply.readBoolean(); + } catch (RemoteException ex) { + Log.e(TAG, "Failed to query wide color support", ex); + } finally { + data.recycle(); + reply.recycle(); + } + } + return false; } } } diff --git a/src/com/android/settings/display/ColorModePreferenceFragment.java b/src/com/android/settings/display/ColorModePreferenceFragment.java new file mode 100644 index 00000000000..7c8b841b38b --- /dev/null +++ b/src/com/android/settings/display/ColorModePreferenceFragment.java @@ -0,0 +1,207 @@ +/* + * Copyright (C) 2017 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.settings.display; + +import android.app.ActivityManager; +import android.app.IActivityManager; +import android.content.Context; +import android.graphics.drawable.Drawable; +import android.os.IBinder; +import android.os.Parcel; +import android.os.RemoteException; +import android.os.ServiceManager; +import android.os.SystemProperties; +import android.support.annotation.VisibleForTesting; +import android.util.Log; + +import com.android.internal.logging.nano.MetricsProto; + +import com.android.settings.R; +import com.android.settings.widget.RadioButtonPickerFragment; + +import java.util.Arrays; +import java.util.List; + +@SuppressWarnings("WeakerAccess") +public class ColorModePreferenceFragment extends RadioButtonPickerFragment { + private static final String TAG = "ColorModePreferenceFragment"; + + @VisibleForTesting + static final float COLOR_SATURATION_NATURAL = 1.0f; + @VisibleForTesting + static final float COLOR_SATURATION_BOOSTED = 1.1f; + + private static final int SURFACE_FLINGER_TRANSACTION_SATURATION = 1022; + private static final int SURFACE_FLINGER_TRANSACTION_NATIVE_MODE = 1023; + + @VisibleForTesting + static final String PERSISTENT_PROPERTY_SATURATION = "persist.sys.sf.color_saturation"; + @VisibleForTesting + static final String PERSISTENT_PROPERTY_NATIVE_MODE = "persist.sys.sf.native_mode"; + + @VisibleForTesting + static final String KEY_COLOR_MODE_NATURAL = "color_mode_natural"; + @VisibleForTesting + static final String KEY_COLOR_MODE_BOOSTED = "color_mode_boosted"; + @VisibleForTesting + static final String KEY_COLOR_MODE_SATURATED = "color_mode_saturated"; + + private IBinder mSurfaceFlinger; + private IActivityManager mActivityManager; + + @Override + public void onAttach(Context context) { + super.onAttach(context); + mSurfaceFlinger = ServiceManager.getService("SurfaceFlinger"); + mActivityManager = ActivityManager.getService(); + } + + @Override + protected List getCandidates() { + Context c = getContext(); + return Arrays.asList( + new ColorModeCandidateInfo(c.getString(R.string.color_mode_option_natural), + KEY_COLOR_MODE_NATURAL), + new ColorModeCandidateInfo(c.getString(R.string.color_mode_option_boosted), + KEY_COLOR_MODE_BOOSTED), + new ColorModeCandidateInfo(c.getString(R.string.color_mode_option_saturated), + KEY_COLOR_MODE_SATURATED) + ); + } + + @Override + protected String getDefaultKey() { + if (isNativeModeEnabled()) { + return KEY_COLOR_MODE_SATURATED; + } + if (getSaturationValue() > COLOR_SATURATION_NATURAL) { + return KEY_COLOR_MODE_BOOSTED; + } + return KEY_COLOR_MODE_NATURAL; + } + + @Override + protected boolean setDefaultKey(String key) { + switch (key) { + case KEY_COLOR_MODE_NATURAL: + applySaturation(COLOR_SATURATION_NATURAL); + setNativeMode(false); + break; + case KEY_COLOR_MODE_BOOSTED: + applySaturation(COLOR_SATURATION_BOOSTED); + setNativeMode(false); + break; + case KEY_COLOR_MODE_SATURATED: + applySaturation(COLOR_SATURATION_NATURAL); + setNativeMode(true); + break; + } + + updateConfiguration(); + + return true; + } + + @VisibleForTesting + void updateConfiguration() { + try { + mActivityManager.updateConfiguration(null); + } catch (RemoteException e) { + Log.d(TAG, "Could not update configuration", e); + } + } + + @Override + public int getMetricsCategory() { + return MetricsProto.MetricsEvent.COLOR_MODE_SETTINGS; + } + + /** + * Propagates the provided saturation to the SurfaceFlinger. + */ + private void applySaturation(float saturation) { + SystemProperties.set(PERSISTENT_PROPERTY_SATURATION, Float.toString(saturation)); + if (mSurfaceFlinger != null) { + final Parcel data = Parcel.obtain(); + data.writeInterfaceToken("android.ui.ISurfaceComposer"); + data.writeFloat(saturation); + try { + mSurfaceFlinger.transact(SURFACE_FLINGER_TRANSACTION_SATURATION, data, null, 0); + } catch (RemoteException ex) { + Log.e(TAG, "Failed to set saturation", ex); + } finally { + data.recycle(); + } + } + } + + private static float getSaturationValue() { + try { + return Float.parseFloat(SystemProperties.get( + PERSISTENT_PROPERTY_SATURATION, Float.toString(COLOR_SATURATION_NATURAL))); + } catch (NumberFormatException e) { + return COLOR_SATURATION_NATURAL; + } + } + + /** + * Toggles native mode on/off in SurfaceFlinger. + */ + private void setNativeMode(boolean enabled) { + SystemProperties.set(PERSISTENT_PROPERTY_NATIVE_MODE, enabled ? "1" : "0"); + if (mSurfaceFlinger != null) { + final Parcel data = Parcel.obtain(); + data.writeInterfaceToken("android.ui.ISurfaceComposer"); + data.writeInt(enabled ? 1 : 0); + try { + mSurfaceFlinger.transact(SURFACE_FLINGER_TRANSACTION_NATIVE_MODE, data, null, 0); + } catch (RemoteException ex) { + Log.e(TAG, "Failed to set native mode", ex); + } finally { + data.recycle(); + } + } + } + + private static boolean isNativeModeEnabled() { + return SystemProperties.getBoolean(PERSISTENT_PROPERTY_NATIVE_MODE, false); + } + + @VisibleForTesting + static class ColorModeCandidateInfo extends CandidateInfo { + private final CharSequence mLabel; + private final String mKey; + + ColorModeCandidateInfo(CharSequence label, String key) { + super(true); + mLabel = label; + mKey = key; + } + + @Override + public CharSequence loadLabel() { + return mLabel; + } + + @Override + public Drawable loadIcon() { + return null; + } + + @Override + public String getKey() { + return mKey; + } + } +} diff --git a/tests/robotests/src/com/android/settings/display/ColorModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/ColorModePreferenceControllerTest.java deleted file mode 100644 index 00d910eb82c..00000000000 --- a/tests/robotests/src/com/android/settings/display/ColorModePreferenceControllerTest.java +++ /dev/null @@ -1,113 +0,0 @@ -/* - * Copyright (C) 2017 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.settings.display; - -import android.content.Context; -import android.os.IBinder; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.TestConfig; -import com.android.settings.testutils.shadow.SettingsShadowSystemProperties; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.Mock; -import org.mockito.MockitoAnnotations; -import org.robolectric.annotation.Config; -import org.robolectric.util.ReflectionHelpers; - -import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -@RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) -public class ColorModePreferenceControllerTest { - @Mock - private ColorModePreferenceController.ConfigurationWrapper mConfigWrapper; - @Mock - private SwitchPreference mPreference; - @Mock - private PreferenceScreen mScreen; - @Mock - private Context mContext; - @Mock - private IBinder mSurfaceFlinger; - - private ColorModePreferenceController mController; - - @Before - public void setup() { - MockitoAnnotations.initMocks(this); - SettingsShadowSystemProperties.clear(); - - mController = new ColorModePreferenceController(mContext); - ReflectionHelpers.setField(mController, "mSurfaceFlinger", mSurfaceFlinger); - ReflectionHelpers.setField(mController, "mConfigWrapper", mConfigWrapper); - - when(mConfigWrapper.isScreenWideColorGamut()).thenReturn(true); - - when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference); - when(mPreference.getKey()).thenReturn(mController.getPreferenceKey()); - } - - @Config(shadows = {SettingsShadowSystemProperties.class}) - @Test - public void shouldCheckPreference() { - SettingsShadowSystemProperties.set( - ColorModePreferenceController.PERSISTENT_PROPERTY_SATURATION, - Float.toString(ColorModePreferenceController.COLOR_SATURATION_VIVID)); - - mController.updateState(mPreference); - - verify(mPreference).setChecked(true); - } - - @Config(shadows = {SettingsShadowSystemProperties.class}) - @Test - public void shouldUncheckPreference() { - SettingsShadowSystemProperties.set( - ColorModePreferenceController.PERSISTENT_PROPERTY_SATURATION, - Float.toString(ColorModePreferenceController.COLOR_SATURATION_DEFAULT)); - - mController.updateState(mPreference); - - verify(mPreference).setChecked(false); - } - - @Config(shadows = {SettingsShadowSystemProperties.class}) - @Test - public void shouldBoostSaturationOnCheck() { - mController.onPreferenceChange(mPreference, true); - - String saturation = SettingsShadowSystemProperties - .get(ColorModePreferenceController.PERSISTENT_PROPERTY_SATURATION); - assertThat(saturation) - .isEqualTo(Float.toString(ColorModePreferenceController.COLOR_SATURATION_VIVID)); - } - - @Config(shadows = {SettingsShadowSystemProperties.class}) - @Test - public void shouldResetSaturationOnUncheck() { - mController.onPreferenceChange(mPreference, false); - - String saturation = SettingsShadowSystemProperties - .get(ColorModePreferenceController.PERSISTENT_PROPERTY_SATURATION); - assertThat(saturation) - .isEqualTo(Float.toString(ColorModePreferenceController.COLOR_SATURATION_DEFAULT)); - } -} diff --git a/tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java new file mode 100644 index 00000000000..435f4f21a67 --- /dev/null +++ b/tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java @@ -0,0 +1,170 @@ +/* + * Copyright (C) 2017 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.settings.display; + +import static com.google.common.truth.Truth.assertThat; + +import static org.mockito.Mockito.doNothing; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.spy; + +import android.app.IActivityManager; +import android.content.res.Configuration; +import android.os.IBinder; +import android.os.RemoteException; + +import com.android.internal.logging.nano.MetricsProto; + +import com.android.settings.TestConfig; +import com.android.settings.testutils.SettingsRobolectricTestRunner; +import com.android.settings.testutils.shadow.SettingsShadowSystemProperties; +import com.android.settings.widget.RadioButtonPickerFragment; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; +import org.robolectric.RuntimeEnvironment; +import org.robolectric.annotation.Config; +import org.robolectric.util.ReflectionHelpers; + +import java.util.List; + +@RunWith(SettingsRobolectricTestRunner.class) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +public class ColorModePreferenceFragmentTest { + @Mock + private IBinder mSurfaceFlinger; + @Mock + private IActivityManager mActivityManager; + + private ColorModePreferenceFragment mFragment; + + @Before + public void setup() { + MockitoAnnotations.initMocks(this); + SettingsShadowSystemProperties.clear(); + + mFragment = spy(new ColorModePreferenceFragment()); + doReturn(RuntimeEnvironment.application).when(mFragment).getContext(); + doNothing().when(mFragment).updateConfiguration(); + + ReflectionHelpers.setField(mFragment, "mSurfaceFlinger", mSurfaceFlinger); + ReflectionHelpers.setField(mFragment, "mActivityManager", mActivityManager); + } + + @Test + public void verifyMetricsConstant() { + assertThat(mFragment.getMetricsCategory()) + .isEqualTo(MetricsProto.MetricsEvent.COLOR_MODE_SETTINGS); + } + + @Test + public void getCandidates() { + List candidates = + mFragment.getCandidates(); + + assertThat(candidates.size()).isEqualTo(3); + assertThat(candidates.get(0).getKey()) + .isEqualTo(ColorModePreferenceFragment.KEY_COLOR_MODE_NATURAL); + assertThat(candidates.get(1).getKey()) + .isEqualTo(ColorModePreferenceFragment.KEY_COLOR_MODE_BOOSTED); + assertThat(candidates.get(2).getKey()) + .isEqualTo(ColorModePreferenceFragment.KEY_COLOR_MODE_SATURATED); + } + + @Config(shadows = {SettingsShadowSystemProperties.class}) + @Test + public void getKey_natural() { + SettingsShadowSystemProperties.set( + ColorModePreferenceFragment.PERSISTENT_PROPERTY_SATURATION, + Float.toString(ColorModePreferenceFragment.COLOR_SATURATION_NATURAL)); + SettingsShadowSystemProperties.set( + ColorModePreferenceFragment.PERSISTENT_PROPERTY_NATIVE_MODE, "0"); + + assertThat(mFragment.getDefaultKey()) + .isEqualTo(ColorModePreferenceFragment.KEY_COLOR_MODE_NATURAL); + } + + @Config(shadows = {SettingsShadowSystemProperties.class}) + @Test + public void getKey_boosted() { + SettingsShadowSystemProperties.set( + ColorModePreferenceFragment.PERSISTENT_PROPERTY_SATURATION, + Float.toString(ColorModePreferenceFragment.COLOR_SATURATION_BOOSTED)); + SettingsShadowSystemProperties.set( + ColorModePreferenceFragment.PERSISTENT_PROPERTY_NATIVE_MODE, "0"); + + assertThat(mFragment.getDefaultKey()) + .isEqualTo(ColorModePreferenceFragment.KEY_COLOR_MODE_BOOSTED); + } + + @Config(shadows = {SettingsShadowSystemProperties.class}) + @Test + public void getKey_saturated() { + SettingsShadowSystemProperties.set( + ColorModePreferenceFragment.PERSISTENT_PROPERTY_NATIVE_MODE, "1"); + + assertThat(mFragment.getDefaultKey()) + .isEqualTo(ColorModePreferenceFragment.KEY_COLOR_MODE_SATURATED); + } + + @Config(shadows = {SettingsShadowSystemProperties.class}) + @Test + public void setKey_natural() { + mFragment.setDefaultKey(ColorModePreferenceFragment.KEY_COLOR_MODE_NATURAL); + + String saturation = SettingsShadowSystemProperties + .get(ColorModePreferenceFragment.PERSISTENT_PROPERTY_SATURATION); + assertThat(saturation) + .isEqualTo(Float.toString(ColorModePreferenceFragment.COLOR_SATURATION_NATURAL)); + + String nativeMode = SettingsShadowSystemProperties + .get(ColorModePreferenceFragment.PERSISTENT_PROPERTY_NATIVE_MODE); + assertThat(nativeMode).isEqualTo("0"); + } + + @Config(shadows = {SettingsShadowSystemProperties.class}) + @Test + public void setKey_boosted() { + mFragment.setDefaultKey(ColorModePreferenceFragment.KEY_COLOR_MODE_BOOSTED); + + String saturation = SettingsShadowSystemProperties + .get(ColorModePreferenceFragment.PERSISTENT_PROPERTY_SATURATION); + assertThat(saturation) + .isEqualTo(Float.toString(ColorModePreferenceFragment.COLOR_SATURATION_BOOSTED)); + + String nativeMode = SettingsShadowSystemProperties + .get(ColorModePreferenceFragment.PERSISTENT_PROPERTY_NATIVE_MODE); + assertThat(nativeMode).isEqualTo("0"); + } + + @Config(shadows = {SettingsShadowSystemProperties.class}) + @Test + public void setKey_saturated() { + mFragment.setDefaultKey(ColorModePreferenceFragment.KEY_COLOR_MODE_SATURATED); + + String saturation = SettingsShadowSystemProperties + .get(ColorModePreferenceFragment.PERSISTENT_PROPERTY_SATURATION); + assertThat(saturation) + .isEqualTo(Float.toString(ColorModePreferenceFragment.COLOR_SATURATION_NATURAL)); + + String nativeMode = SettingsShadowSystemProperties + .get(ColorModePreferenceFragment.PERSISTENT_PROPERTY_NATIVE_MODE); + assertThat(nativeMode).isEqualTo("1"); + } +} From 9c07451786fa57b9eea6497634019ba30f92cf29 Mon Sep 17 00:00:00 2001 From: Daniel Finchelstein Date: Tue, 24 Oct 2017 10:30:35 -0700 Subject: [PATCH 7/7] Rename files for consistency. Test: CTS (API2 tests) Change-Id: I8a079525499e564c438281fcf5b3ef8333925f5b --- ...meraHalHdrplusPreferenceControllerV2.java} | 4 +- .../DevelopmentSettingsDashboardFragment.java | 2 +- ...HalHdrplusPreferenceControllerV2Test.java} | 42 +++++++++---------- 3 files changed, 24 insertions(+), 24 deletions(-) rename src/com/android/settings/development/{CameraHalHdrPlusPreferenceControllerV2.java => CameraHalHdrplusPreferenceControllerV2.java} (96%) rename tests/robotests/src/com/android/settings/development/{CameraHalHdrPlusPreferenceControllerV2Test.java => CameraHalHdrplusPreferenceControllerV2Test.java} (75%) diff --git a/src/com/android/settings/development/CameraHalHdrPlusPreferenceControllerV2.java b/src/com/android/settings/development/CameraHalHdrplusPreferenceControllerV2.java similarity index 96% rename from src/com/android/settings/development/CameraHalHdrPlusPreferenceControllerV2.java rename to src/com/android/settings/development/CameraHalHdrplusPreferenceControllerV2.java index 11ee6c78a15..b8828fe1d02 100644 --- a/src/com/android/settings/development/CameraHalHdrPlusPreferenceControllerV2.java +++ b/src/com/android/settings/development/CameraHalHdrplusPreferenceControllerV2.java @@ -29,7 +29,7 @@ import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; -public class CameraHalHdrPlusPreferenceControllerV2 extends +public class CameraHalHdrplusPreferenceControllerV2 extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { @@ -45,7 +45,7 @@ public class CameraHalHdrPlusPreferenceControllerV2 extends private SwitchPreference mPreference; - public CameraHalHdrPlusPreferenceControllerV2(Context context) { + public CameraHalHdrplusPreferenceControllerV2(Context context) { super(context); } diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java index fa89ba40f7c..d532136cd39 100644 --- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java +++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java @@ -376,7 +376,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra controllers.add(new LogPersistPreferenceControllerV2(context, fragment, lifecycle)); controllers.add(new ConnectivityMonitorPreferenceControllerV2(context)); controllers.add(new CameraLaserSensorPreferenceControllerV2(context)); - controllers.add(new CameraHalHdrPlusPreferenceControllerV2(context)); + controllers.add(new CameraHalHdrplusPreferenceControllerV2(context)); controllers.add(new WifiDisplayCertificationPreferenceController(context)); controllers.add(new WifiVerboseLoggingPreferenceController(context)); controllers.add(new WifiAggressiveHandoverPreferenceController(context)); diff --git a/tests/robotests/src/com/android/settings/development/CameraHalHdrPlusPreferenceControllerV2Test.java b/tests/robotests/src/com/android/settings/development/CameraHalHdrplusPreferenceControllerV2Test.java similarity index 75% rename from tests/robotests/src/com/android/settings/development/CameraHalHdrPlusPreferenceControllerV2Test.java rename to tests/robotests/src/com/android/settings/development/CameraHalHdrplusPreferenceControllerV2Test.java index f28fd6e2671..e0e137c3b19 100644 --- a/tests/robotests/src/com/android/settings/development/CameraHalHdrPlusPreferenceControllerV2Test.java +++ b/tests/robotests/src/com/android/settings/development/CameraHalHdrplusPreferenceControllerV2Test.java @@ -42,7 +42,7 @@ import org.robolectric.annotation.Config; @RunWith(SettingsRobolectricTestRunner.class) @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, shadows = {SettingsShadowSystemProperties.class}) -public class CameraHalHdrPlusPreferenceControllerV2Test { +public class CameraHalHdrplusPreferenceControllerV2Test { @Mock private PreferenceScreen mScreen; @@ -50,7 +50,7 @@ public class CameraHalHdrPlusPreferenceControllerV2Test { private SwitchPreference mPreference; private Context mContext; - private CameraHalHdrPlusPreferenceControllerV2 mController; + private CameraHalHdrplusPreferenceControllerV2 mController; static final String USERDEBUG_BUILD = "userdebug"; @@ -58,7 +58,7 @@ public class CameraHalHdrPlusPreferenceControllerV2Test { public void setUp() { MockitoAnnotations.initMocks(this); mContext = RuntimeEnvironment.application; - mController = new CameraHalHdrPlusPreferenceControllerV2(mContext); + mController = new CameraHalHdrplusPreferenceControllerV2(mContext); when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference); when(mPreference.getKey()).thenReturn(mController.getPreferenceKey()); mController.displayPreference(mScreen); @@ -73,18 +73,18 @@ public class CameraHalHdrPlusPreferenceControllerV2Test { @Config(qualifiers = "mcc999") public void isAvailable_withConfigNoShowAndUserDebugBuild_shouldReturnFalse() { SettingsShadowSystemProperties.set( - CameraHalHdrPlusPreferenceControllerV2.BUILD_TYPE, USERDEBUG_BUILD); + CameraHalHdrplusPreferenceControllerV2.BUILD_TYPE, USERDEBUG_BUILD); assertThat(mController.isAvailable()).isFalse(); } @Test - public void updateState_cameraHalHdrPlusEnabled_shouldCheckedPreference() { + public void updateState_cameraHalHdrplusEnabled_shouldCheckedPreference() { SettingsShadowSystemProperties.set( - CameraHalHdrPlusPreferenceControllerV2.PROPERTY_CAMERA_HAL_HDRPLUS, - CameraHalHdrPlusPreferenceControllerV2.ENABLED); + CameraHalHdrplusPreferenceControllerV2.PROPERTY_CAMERA_HAL_HDRPLUS, + CameraHalHdrplusPreferenceControllerV2.ENABLED); SettingsShadowSystemProperties.set( - CameraHalHdrPlusPreferenceControllerV2.BUILD_TYPE, USERDEBUG_BUILD); + CameraHalHdrplusPreferenceControllerV2.BUILD_TYPE, USERDEBUG_BUILD); mController.updateState(mPreference); @@ -92,12 +92,12 @@ public class CameraHalHdrPlusPreferenceControllerV2Test { } @Test - public void updateState_cameraHalHdrPlusEnabled_shouldUncheckedPreference() { + public void updateState_cameraHalHdrplusEnabled_shouldUncheckedPreference() { SettingsShadowSystemProperties.set( - CameraHalHdrPlusPreferenceControllerV2.PROPERTY_CAMERA_HAL_HDRPLUS, - CameraHalHdrPlusPreferenceControllerV2.DISABLED); + CameraHalHdrplusPreferenceControllerV2.PROPERTY_CAMERA_HAL_HDRPLUS, + CameraHalHdrplusPreferenceControllerV2.DISABLED); SettingsShadowSystemProperties.set( - CameraHalHdrPlusPreferenceControllerV2.BUILD_TYPE, USERDEBUG_BUILD); + CameraHalHdrplusPreferenceControllerV2.BUILD_TYPE, USERDEBUG_BUILD); mController.updateState(mPreference); @@ -108,20 +108,20 @@ public class CameraHalHdrPlusPreferenceControllerV2Test { public void onPreferenceChange_preferenceChecked_shouldEnableCameraHalHdrplus() { mController.onPreferenceChange(mPreference, true /* new value */); - assertThat(CameraHalHdrPlusPreferenceControllerV2.ENABLED).isEqualTo( + assertThat(CameraHalHdrplusPreferenceControllerV2.ENABLED).isEqualTo( SystemProperties.get( - CameraHalHdrPlusPreferenceControllerV2.PROPERTY_CAMERA_HAL_HDRPLUS, - CameraHalHdrPlusPreferenceControllerV2.DISABLED)); + CameraHalHdrplusPreferenceControllerV2.PROPERTY_CAMERA_HAL_HDRPLUS, + CameraHalHdrplusPreferenceControllerV2.DISABLED)); } @Test public void handlePreferenceTreeClick_preferenceUnchecked_shouldDisableCameraHalHdrplus() { mController.onPreferenceChange(mPreference, false /* new value */); - assertThat(CameraHalHdrPlusPreferenceControllerV2.DISABLED).isEqualTo( + assertThat(CameraHalHdrplusPreferenceControllerV2.DISABLED).isEqualTo( SystemProperties.get( - CameraHalHdrPlusPreferenceControllerV2.PROPERTY_CAMERA_HAL_HDRPLUS, - CameraHalHdrPlusPreferenceControllerV2.DISABLED)); + CameraHalHdrplusPreferenceControllerV2.PROPERTY_CAMERA_HAL_HDRPLUS, + CameraHalHdrplusPreferenceControllerV2.DISABLED)); } @Test @@ -137,9 +137,9 @@ public class CameraHalHdrPlusPreferenceControllerV2Test { verify(mPreference).setEnabled(false); verify(mPreference).setChecked(false); - assertThat(CameraHalHdrPlusPreferenceControllerV2.DISABLED).isEqualTo( + assertThat(CameraHalHdrplusPreferenceControllerV2.DISABLED).isEqualTo( SystemProperties.get( - CameraHalHdrPlusPreferenceControllerV2.PROPERTY_CAMERA_HAL_HDRPLUS, - CameraHalHdrPlusPreferenceControllerV2.DISABLED)); + CameraHalHdrplusPreferenceControllerV2.PROPERTY_CAMERA_HAL_HDRPLUS, + CameraHalHdrplusPreferenceControllerV2.DISABLED)); } }