[2/2] OmniGears: make aspect ratio hack configable on app level
Change-Id: I7b88a9820e475eae2d959d0856127f887391e286
diff --git a/res/drawable/ic_bars_tile.xml b/res/drawable/ic_bars_tile.xml
new file mode 100644
index 0000000..81b8396
--- /dev/null
+++ b/res/drawable/ic_bars_tile.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2015 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.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:height="24dp"
+ android:width="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24"
+ android:tint="?android:attr/colorControlNormal" >
+ <path android:fillColor="#000" android:pathData="M17.25,18H6.75V4H17.25M14,21H10V20H14M16,1H8A3,3 0 0,0 5,4V20A3,3 0 0,0 8,23H16A3,3 0 0,0 19,20V4A3,3 0 0,0 16,1Z" />
+</vector>
diff --git a/res/values/custom_strings.xml b/res/values/custom_strings.xml
index a6d6027..90dcf1b 100644
--- a/res/values/custom_strings.xml
+++ b/res/values/custom_strings.xml
@@ -808,4 +808,6 @@
<string name="omni_device_parts">Device features</string>
<string name="style_settings_title">Style</string>
<string name="style_settings_summary">Wallpapers and other swag</string>
+ <string name="custom_bars_settings_title">Bars</string>
+
</resources>
diff --git a/res/xml/bars_settings.xml b/res/xml/bars_settings.xml
new file mode 100644
index 0000000..457164a
--- /dev/null
+++ b/res/xml/bars_settings.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Copyright (C) 2017-2018 The OmniROM Project
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+-->
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:settings="http://schemas.android.com/apk/res-auto"
+ android:key="bars_settings"
+ android:title="@string/custom_bars_settings_title" >
+
+ <PreferenceCategory
+ android:key="aspect_ratio_category"
+ android:title="@string/aspect_ratio_category_title">
+
+ <org.omnirom.omnilib.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.omnilib.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.omnilib.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/res/xml/omni_dashboard_fragment.xml b/res/xml/omni_dashboard_fragment.xml
index 30e128b..20e42bc 100644
--- a/res/xml/omni_dashboard_fragment.xml
+++ b/res/xml/omni_dashboard_fragment.xml
@@ -38,6 +38,12 @@
android:fragment="org.omnirom.omnigears.ButtonSettings" />
<Preference
+ android:key="bars_settings"
+ android:title="@string/custom_bars_settings_title"
+ android:icon="@drawable/ic_bars_tile"
+ android:fragment="org.omnirom.omnigears.interfacesettings.BarsSettings" />
+
+ <Preference
android:key="gesture_settings"
android:icon="@drawable/ic_settings_gestures_omni"
android:title="@string/gesture_settings_title"
diff --git a/src/org/omnirom/omnigears/interfacesettings/BarsSettings.java b/src/org/omnirom/omnigears/interfacesettings/BarsSettings.java
new file mode 100644
index 0000000..2a61b1a
--- /dev/null
+++ b/src/org/omnirom/omnigears/interfacesettings/BarsSettings.java
@@ -0,0 +1,138 @@
+/*
+ * Copyright (C) 2017 The OmniROM Project
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+*/
+package org.omnirom.omnigears.interfacesettings;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.net.TrafficStats;
+import android.os.Bundle;
+import android.provider.SearchIndexableResource;
+import android.provider.Settings;
+import android.text.TextUtils;
+
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+
+import android.support.v7.preference.ListPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.support.v7.preference.PreferenceCategory;
+
+import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.R;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.search.Indexable;
+
+import org.omnirom.omnilib.preference.AppMultiSelectListPreference;
+import org.omnirom.omnilib.preference.ScrollAppsViewPreference;
+import org.omnirom.omnilib.preference.SeekBarPreference;
+
+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 {
+ private static final String TAG = "BarsSettings";
+ 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 AppMultiSelectListPreference mAspectRatioAppsSelect;
+ private ScrollAppsViewPreference mAspectRatioApps;
+
+ @Override
+ public int getMetricsCategory() {
+ return MetricsEvent.OMNI_SETTINGS;
+ }
+
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ addPreferencesFromResource(R.xml.bars_settings);
+
+ PreferenceScreen prefScreen = getPreferenceScreen();
+
+ 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.OMNI_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
+ public boolean onPreferenceTreeClick(Preference preference) {
+ return super.onPreferenceTreeClick(preference);
+ }
+
+ @Override
+ public boolean onPreferenceChange(Preference preference, Object newValue) {
+ if (preference == mAspectRatioAppsSelect) {
+ Collection<String> valueList = (Collection<String>) newValue;
+ mAspectRatioApps.setVisible(false);
+ if (valueList != null) {
+ Settings.System.putString(getContentResolver(), Settings.System.OMNI_ASPECT_RATIO_APPS_LIST,
+ TextUtils.join(":", valueList));
+ mAspectRatioApps.setVisible(true);
+ mAspectRatioApps.setValues(valueList);
+ } else {
+ Settings.System.putString(getContentResolver(), Settings.System.OMNI_ASPECT_RATIO_APPS_LIST, "");
+ }
+ return true;
+ }
+ return false;
+ }
+
+ public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+ new BaseSearchIndexProvider() {
+ @Override
+ public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
+ boolean enabled) {
+ ArrayList<SearchIndexableResource> result =
+ new ArrayList<SearchIndexableResource>();
+
+ SearchIndexableResource sir = new SearchIndexableResource(context);
+ sir.xmlResId = R.xml.bars_settings;
+ result.add(sir);
+
+ return result;
+ }
+
+ @Override
+ public List<String> getNonIndexableKeys(Context context) {
+ ArrayList<String> result = new ArrayList<String>();
+ return result;
+ }
+ };
+}