[2/2] OmniGears: make aspect ratio hack configable on app level
Change-Id: I556a7ef2ea8bcb7d1a4ad9607e4c0bc3e76aa8d3
diff --git a/res/values/custom_strings.xml b/res/values/custom_strings.xml
index 0555e39..a0f5153 100644
--- a/res/values/custom_strings.xml
+++ b/res/values/custom_strings.xml
@@ -720,7 +720,7 @@
<!-- Expanded desktop -->
<string name="expanded_desktop_title">Expanded desktop</string>
- <string name="expanded_desktop_summary">Per-app configuration of the status bar and navigation key view</string>
+ <string name="expanded_desktop_summary">Per-app configuration of the status bar and navigation bar</string>
<string name="expanded_hide_nothing">Hide nothing</string>
<string name="expanded_hide_status">Hide status bar</string>
<string name="expanded_hide_navigation">Hide navigation bar</string>
@@ -764,4 +764,12 @@
<string name="system_proxi_check_enabled_title">Proximity check</string>
<string name="system_proxi_check_enabled_summary">Check proximity sensor before handling power button and volume button wake events</string>
+
+ <string name="aspect_ratio_apps_enabled_title">Enable scaling</string>
+ <string name="aspect_ratio_apps_enabled_summary">Allow legacy apps to use full screen</string>
+ <string name="aspect_ratio_apps_list_summary"></string>
+ <string name="aspect_ratio_apps_list_title">Apps allowed to use scaling</string>
+ <string name="aspect_ratio_category_title">Legacy app scaling</string>
+ <string name="aspect_ratio_apps_info">Applications need to be restarted after changes</string>
+
</resources>
diff --git a/res/xml/bars_settings.xml b/res/xml/bars_settings.xml
index ebe3bbb..4290246 100644
--- a/res/xml/bars_settings.xml
+++ b/res/xml/bars_settings.xml
@@ -98,4 +98,33 @@
</PreferenceCategory>
+ <PreferenceCategory
+ android:key="aspect_ratio_category"
+ android:title="@string/aspect_ratio_category_title">
+
+ <org.omnirom.omnigears.preference.SystemSettingSwitchPreference
+ android:key="aspect_ratio_apps_enabled"
+ android:title="@string/aspect_ratio_apps_enabled_title"
+ android:summary="@string/aspect_ratio_apps_enabled_summary"
+ android:defaultValue="false" />
+
+ <org.omnirom.omnigears.preference.AppMultiSelectListPreference
+ android:dependency="aspect_ratio_apps_enabled"
+ android:key="aspect_ratio_apps_list"
+ android:persistent="false"
+ android:summary="@string/aspect_ratio_apps_list_summary"
+ android:title="@string/aspect_ratio_apps_list_title" />
+
+ <org.omnirom.omnigears.preference.ScrollAppsViewPreference
+ android:dependency="aspect_ratio_apps_enabled"
+ android:key="aspect_ratio_apps_list_scroller"
+ android:persistent="false"
+ android:selectable="false" />
+
+ <Preference
+ android:dependency="aspect_ratio_apps_enabled"
+ android:icon="@drawable/ic_info_outline_24dp"
+ android:persistent="false"
+ android:summary="@string/aspect_ratio_apps_info" />
+ </PreferenceCategory>
</PreferenceScreen>
diff --git a/src/org/omnirom/omnigears/interfacesettings/BarsSettings.java b/src/org/omnirom/omnigears/interfacesettings/BarsSettings.java
index 9e8776c..2d1c12d 100644
--- a/src/org/omnirom/omnigears/interfacesettings/BarsSettings.java
+++ b/src/org/omnirom/omnigears/interfacesettings/BarsSettings.java
@@ -21,12 +21,12 @@
import android.content.ContentResolver;
import android.content.Intent;
import android.content.res.Resources;
+import android.net.TrafficStats;
import android.os.Bundle;
-import android.support.v7.preference.Preference;
import android.provider.SearchIndexableResource;
import android.provider.Settings;
+import android.text.TextUtils;
import android.util.Log;
-import android.net.TrafficStats;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
@@ -47,8 +47,13 @@
import com.android.internal.util.omni.DeviceUtils;
import com.android.settings.Utils;
-import java.util.List;
+import org.omnirom.omnigears.preference.AppMultiSelectListPreference;
+import org.omnirom.omnigears.preference.ScrollAppsViewPreference;
+
+import java.util.Arrays;
import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
public class BarsSettings extends SettingsPreferenceFragment implements
Preference.OnPreferenceChangeListener, Indexable {
@@ -56,10 +61,15 @@
private static final String NETWORK_TRAFFIC_ROOT = "category_network_traffic";
private static final String NAVIGATIONBAR_ROOT = "category_navigationbar";
private static final String EXPANDED_DESKTOP_CATEGORY = "expanded_desktop_category";
-
private static final String QUICK_PULLDOWN = "quick_pulldown";
+ private static final String KEY_ASPECT_RATIO_APPS_ENABLED = "aspect_ratio_apps_enabled";
+ private static final String KEY_ASPECT_RATIO_APPS_LIST = "aspect_ratio_apps_list";
+ private static final String KEY_ASPECT_RATIO_CATEGORY = "aspect_ratio_category";
+ private static final String KEY_ASPECT_RATIO_APPS_LIST_SCROLLER = "aspect_ratio_apps_list_scroller";
private ListPreference mQuickPulldown;
+ private AppMultiSelectListPreference mAspectRatioAppsSelect;
+ private ScrollAppsViewPreference mAspectRatioApps;
@Override
public int getMetricsCategory() {
@@ -91,6 +101,27 @@
TrafficStats.getTotalRxBytes() == TrafficStats.UNSUPPORTED) {
prefScreen.removePreference(findPreference(NETWORK_TRAFFIC_ROOT));
}
+
+ final PreferenceCategory aspectRatioCategory =
+ (PreferenceCategory) getPreferenceScreen().findPreference(KEY_ASPECT_RATIO_CATEGORY);
+ final boolean supportMaxAspectRatio = getResources().getBoolean(com.android.internal.R.bool.config_haveHigherAspectRatioScreen);
+ if (!supportMaxAspectRatio) {
+ getPreferenceScreen().removePreference(aspectRatioCategory);
+ } else {
+ mAspectRatioAppsSelect = (AppMultiSelectListPreference) findPreference(KEY_ASPECT_RATIO_APPS_LIST);
+ mAspectRatioApps = (ScrollAppsViewPreference) findPreference(KEY_ASPECT_RATIO_APPS_LIST_SCROLLER);
+ final String valuesString = Settings.System.getString(getContentResolver(), Settings.System.ASPECT_RATIO_APPS_LIST);
+ List<String> valuesList = new ArrayList<String>();
+ if (!TextUtils.isEmpty(valuesString)) {
+ valuesList.addAll(Arrays.asList(valuesString.split(":")));
+ mAspectRatioApps.setVisible(true);
+ mAspectRatioApps.setValues(valuesList);
+ } else {
+ mAspectRatioApps.setVisible(false);
+ }
+ mAspectRatioAppsSelect.setValues(valuesList);
+ mAspectRatioAppsSelect.setOnPreferenceChangeListener(this);
+ }
}
@Override
@@ -106,6 +137,18 @@
quickPulldownValue);
updatePulldownSummary(quickPulldownValue);
return true;
+ } else if (preference == mAspectRatioAppsSelect) {
+ Collection<String> valueList = (Collection<String>) newValue;
+ mAspectRatioApps.setVisible(false);
+ if (valueList != null) {
+ Settings.System.putString(getContentResolver(), Settings.System.ASPECT_RATIO_APPS_LIST,
+ TextUtils.join(":", valueList));
+ mAspectRatioApps.setVisible(true);
+ mAspectRatioApps.setValues(valueList);
+ } else {
+ Settings.System.putString(getContentResolver(), Settings.System.ASPECT_RATIO_APPS_LIST, "");
+ }
+ return true;
}
return false;
}