diff --git a/Android.mk b/Android.mk deleted file mode 100644 index 7911f61..0000000 --- a/Android.mk +++ /dev/null @@ -1 +0,0 @@ -LOCAL_PATH := $(call my-dir) diff --git a/README.md b/README.md index 5c86a1e..a5a7104 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,4 @@ -# AlphaDroid Settings repo # +# ScoopDroid Settings repo # ### Description ### -There will be goodies! :) - -### Translations ### -If you want to help out on translations, please click below badge - -[![Crowdin](https://d322cqt584bo4o.cloudfront.net/crdroid-translation/localized.svg)](https://crowdin.com/project/alphadroid_alphasettings) +ScoopDroid custom settings diff --git a/res/layout-land/dialog_color_picker.xml b/res/layout-land/dialog_color_picker.xml index 0e5c614..1509c7d 100644 --- a/res/layout-land/dialog_color_picker.xml +++ b/res/layout-land/dialog_color_picker.xml @@ -23,7 +23,7 @@ android:padding="20dp" android:orientation="horizontal"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/layout/changelog.xml b/res/layout/changelog.xml deleted file mode 100644 index 9ca8a9b..0000000 --- a/res/layout/changelog.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/res/layout/data_option.xml b/res/layout/data_option.xml deleted file mode 100644 index 48de7e3..0000000 --- a/res/layout/data_option.xml +++ /dev/null @@ -1,99 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/layout/dialog_color_picker.xml b/res/layout/dialog_color_picker.xml index 652910d..45c825e 100644 --- a/res/layout/dialog_color_picker.xml +++ b/res/layout/dialog_color_picker.xml @@ -54,7 +54,7 @@ android:src="@drawable/ic_action_set" /> - - - - - - - - - - - - - - - - - - - - diff --git a/res/layout/icon_option.xml b/res/layout/icon_option.xml deleted file mode 100644 index 99324db..0000000 --- a/res/layout/icon_option.xml +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/layout/lock_clock_fonts_option.xml b/res/layout/lock_clock_fonts_option.xml deleted file mode 100644 index 2c9344d..0000000 --- a/res/layout/lock_clock_fonts_option.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - diff --git a/res/layout/navbar_option.xml b/res/layout/navbar_option.xml deleted file mode 100644 index 8606c87..0000000 --- a/res/layout/navbar_option.xml +++ /dev/null @@ -1,96 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/layout/qs_header_image_option.xml b/res/layout/qs_header_image_option.xml deleted file mode 100644 index 9530a27..0000000 --- a/res/layout/qs_header_image_option.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - diff --git a/res/xml/alpha_settings_notifications.xml b/res/layout/scoop_settings.xml similarity index 55% rename from res/xml/alpha_settings_notifications.xml rename to res/layout/scoop_settings.xml index 755326f..d8a25e9 100644 --- a/res/xml/alpha_settings_notifications.xml +++ b/res/layout/scoop_settings.xml @@ -1,24 +1,29 @@ - - + android:key=".scoop_settings_preference_screen" + android:persistent="true"> + + + diff --git a/res/layout/styles_option.xml b/res/layout/styles_option.xml deleted file mode 100644 index 6347be9..0000000 --- a/res/layout/styles_option.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - diff --git a/res/values/alpha_strings.xml b/res/values/alpha_strings.xml deleted file mode 100644 index eba350f..0000000 --- a/res/values/alpha_strings.xml +++ /dev/null @@ -1,207 +0,0 @@ - - - - - - OK - Reset - Cancel - Save - Discard changes - Never - Always - Caution - Delete - Remove selected item? - Choose app - Enable - Disable - On - Off - - - Alpha settings - There will be goodies! - - - Buttons - Lock Screen - Miscellaneous - Navigation - Notifications - Quick Settings - Sound - Status Bar - Display - User Interface - - - Color Picker - Press on color below to apply - → - ↓ - Hex: - #ff000000 - Set - Default - - - Current changelog - View changes in the ROM installed - Unable to load changelog - - - About AlphaDroid - Device - - - Share AlphaDroid - Let others know about AlphaDroid - Check out if #AlphaDroidAndroid is available for your device @ https://sourceforge.net/projects/alphadroid-project/files - Share AlphaDroid - - - GitHub - We love open source, check us out - AlphaDroid community - We are on telegram. Join us! - Updates channel - Get notified of new builds on Telegram - Official website - Visit our official website - Translations - Help with localisation of ROM in your language! - ScopeHosts - Visit our website host partner - InterServer - We recommend their servers if interested in one - - - Support us - Donate to support further development - AlphaDroid team - Donate to support server hosting, site uptime and overall management - - - Updates - Check and download latest update - - - Google Play - - - Value: %s - by default - Default value: %s\nLong tap to set - Default value is set - - - seconds - milliseconds - dp - hz - - - Copied to clipboard - Long-press to copy - - - SELinux status - Disabled - Permissive - Enforcing - - - Android - AlphaDroid - Device - - - Build Status - Unofficial - Official - Unofficial - AlphaDroid version - Build date - - - Maintainer - Searching for maintainer... - - - Storage - Occupied - Android %s - The device name can and will be seen by the nearby devices. - - - Reset settings - This will reset most AlphaDroid settings to their default values for the current user. Would you like to continue? - - - Never - 5 seconds - 10 seconds - 15 seconds - 30 seconds - 1 minute - 2 minutes - 5 minutes - 10 minutes - 20 minutes - 30 minutes - 1 hour - 2 hours - 4 hours - 8 hours - 12 hours - 24 hours - 36 hours - 48 hours - 72 hours - - - App lock - - %1$d application is protected - %1$d applications are protected - - Unlock - Enable debugging - Disable debugging - Protected apps - Select the apps to protect with biometrics or device credentials - Auto lock timeout - Duration of time after which an unlocked app in background should be locked - Redact notifications - Notification content will be hidden and collapsed for selected apps when they are locked. Heads up notifications will be automatically disabled. - Protect an application first - Enable biometrics for unlocking - Bubbles will be automatically dismissed after timeout - Enable protection - Hide from launcher - Prevent this application from showing up in any launcher. Requires a launcher restart for changes to take effect. - - - AlphaDroid launcher - Change AlphaDroid built-in launcher - Launcher3 - Nexus Launcher - Lawnchair - - diff --git a/res/values/alpha_arrays.xml b/res/values/scoop_arrays.xml similarity index 93% rename from res/values/alpha_arrays.xml rename to res/values/scoop_arrays.xml index 51bace7..e78966d 100644 --- a/res/values/alpha_arrays.xml +++ b/res/values/scoop_arrays.xml @@ -1,7 +1,7 @@ + + + + OK + Reset + Cancel + Save + Discard changes + Never + Always + Caution + Delete + Remove selected item? + Choose app + Enable + Disable + On + Off + + + Scoopdroid settings + Our custom settings space + + + Buttons + Miscellaneous + Status Bar + + + Color Picker + Press on color below to apply + → + ↓ + Hex: + #ff000000 + Set + Default + + + Value: %s + by default + Default value: %s\nLong tap to set + Default value is set + + + seconds + milliseconds + dp + hz + + + Reset settings + This will reset most Scoopdroid settings to their default values for the current user. Would you like to continue? + + + Never + 5 seconds + 10 seconds + 15 seconds + 30 seconds + 1 minute + 2 minutes + 5 minutes + 10 minutes + 20 minutes + 30 minutes + 1 hour + 2 hours + 4 hours + 8 hours + 12 hours + 24 hours + 36 hours + 48 hours + 72 hours + + diff --git a/res/values/alpha_dimens.xml b/res/values/scoop_styles.xml similarity index 92% rename from res/values/alpha_dimens.xml rename to res/values/scoop_styles.xml index 2bfcd19..136d553 100644 --- a/res/values/alpha_dimens.xml +++ b/res/values/scoop_styles.xml @@ -1,6 +1,6 @@ - - - - - - diff --git a/res/xml/alpha_settings_about.xml b/res/xml/alpha_settings_about.xml deleted file mode 100644 index d04aa12..0000000 --- a/res/xml/alpha_settings_about.xml +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/xml/alpha_settings_lockscreen.xml b/res/xml/alpha_settings_lockscreen.xml deleted file mode 100644 index f279065..0000000 --- a/res/xml/alpha_settings_lockscreen.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - diff --git a/res/xml/alpha_settings_navigation.xml b/res/xml/alpha_settings_navigation.xml deleted file mode 100644 index 4f128ea..0000000 --- a/res/xml/alpha_settings_navigation.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - diff --git a/res/xml/alpha_settings_quicksettings.xml b/res/xml/alpha_settings_quicksettings.xml deleted file mode 100644 index dd31f23..0000000 --- a/res/xml/alpha_settings_quicksettings.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - diff --git a/res/xml/alpha_settings_sound.xml b/res/xml/alpha_settings_sound.xml deleted file mode 100644 index de1465e..0000000 --- a/res/xml/alpha_settings_sound.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - diff --git a/res/xml/alpha_settings_ui.xml b/res/xml/alpha_settings_ui.xml deleted file mode 100644 index a444798..0000000 --- a/res/xml/alpha_settings_ui.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - diff --git a/res/xml/alpha_settings_misc.xml b/res/xml/scoop_settings_misc.xml similarity index 100% rename from res/xml/alpha_settings_misc.xml rename to res/xml/scoop_settings_misc.xml diff --git a/src/com/alpha/settings/fragments/About.java b/src/com/alpha/settings/fragments/About.java deleted file mode 100644 index e1cd079..0000000 --- a/src/com/alpha/settings/fragments/About.java +++ /dev/null @@ -1,115 +0,0 @@ -/* - * Copyright (C) 2016-2023 crDroid Android Project - * 2023-2024 AlphaDroid 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.alpha.settings.fragments; - -import android.app.Activity; -import android.content.Context; -import android.content.Intent; -import android.net.Uri; -import android.os.Build; -import android.os.Bundle; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - -import com.android.internal.logging.nano.MetricsProto; -import com.android.settings.SettingsPreferenceFragment; -import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settingslib.search.SearchIndexable; - -import com.android.settings.R; - -import java.util.List; -import java.util.ArrayList; - -@SearchIndexable -public class About extends SettingsPreferenceFragment { - - public static final String TAG = "About"; - - private String KEY_ABOUT_DONATE = "about_donate"; - private String KEY_ABOUT_SOURCE = "about_source"; - private String KEY_ABOUT_TELEGRAM = "about_telegram"; - private String KEY_ABOUT_SHARE = "about_share"; - private String KEY_ABOUT_TRANSLATE = "about_translate"; - private String KEY_ABOUT_WEBSITE = "about_website"; - private String KEY_ABOUT_TELEGRAM_CHANNEL = "about_telegram_channel"; - - private Preference mDonate; - private Preference mSourceUrl; - private Preference mTelegramUrl; - private Preference mShare; - private Preference mTranslate; - private Preference mWebsite; - private Preference mTelegramChannelUrl; - - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - addPreferencesFromResource(R.xml.alpha_settings_about); - - mDonate = findPreference(KEY_ABOUT_DONATE); - mSourceUrl = findPreference(KEY_ABOUT_SOURCE); - mTelegramUrl = findPreference(KEY_ABOUT_TELEGRAM); - mShare = findPreference(KEY_ABOUT_SHARE); - mTranslate = findPreference(KEY_ABOUT_TRANSLATE); - mWebsite = findPreference(KEY_ABOUT_WEBSITE); - mTelegramChannelUrl = findPreference(KEY_ABOUT_TELEGRAM_CHANNEL); - } - - @Override - public boolean onPreferenceTreeClick(Preference preference) { - if (preference == mDonate) { - launchUrl("https://paypal.me/alphadroidproject"); - } else if (preference == mSourceUrl) { - launchUrl("https://github.com/alphadroid-project"); - } else if (preference == mTelegramUrl) { - launchUrl("https://t.me/alphadroid_chat"); - } else if (preference == mShare) { - Intent intent = new Intent(); - intent.setAction(Intent.ACTION_SEND); - intent.setType("text/plain"); - intent.putExtra(Intent.EXTRA_TEXT, String.format( - getActivity().getString(R.string.share_message), Build.MODEL)); - startActivity(Intent.createChooser(intent, getActivity().getString(R.string.share_chooser_title))); - } else if (preference == mTranslate) { - launchUrl("https://crowdin.com/project/alphadroid_alphasettings"); - } else if (preference == mWebsite) { - launchUrl("https://t.me/alphadroid_chat"); - } else if (preference == mTelegramChannelUrl) { - launchUrl("https://t.me/alphadroid_releases"); - } - - return super.onPreferenceTreeClick(preference); - } - - private void launchUrl(String url) { - Uri uriUrl = Uri.parse(url); - Intent intent = new Intent(Intent.ACTION_VIEW, uriUrl); - getActivity().startActivity(intent); - } - - @Override - public int getMetricsCategory() { - return MetricsProto.MetricsEvent.ALPHA; - } - - /** - * For search - */ - public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider(R.xml.alpha_settings_about); -} diff --git a/src/com/alpha/settings/fragments/Lockscreen.java b/src/com/alpha/settings/fragments/Lockscreen.java deleted file mode 100644 index ea89434..0000000 --- a/src/com/alpha/settings/fragments/Lockscreen.java +++ /dev/null @@ -1,90 +0,0 @@ -/* - * Copyright (C) 2016-2024 crDroid Android Project - * 2023-2024 AlphaDroid 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.alpha.settings.fragments; - -import android.app.Activity; -import android.content.ContentResolver; -import android.content.Context; -import android.content.Intent; -import android.content.res.Resources; -import android.os.Bundle; -import android.os.UserHandle; -import android.provider.SearchIndexableResource; -import android.provider.Settings; -import android.text.TextUtils; - -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceScreen; -import androidx.preference.Preference.OnPreferenceChangeListener; - -import com.android.internal.logging.nano.MetricsProto; - -import com.android.settings.R; -import com.android.settings.SettingsPreferenceFragment; -import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settingslib.search.SearchIndexable; - -import java.util.List; - -import lineageos.providers.LineageSettings; - -@SearchIndexable -public class LockScreen extends SettingsPreferenceFragment - implements Preference.OnPreferenceChangeListener { - - public static final String TAG = "LockScreen"; - - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - addPreferencesFromResource(R.xml.alpha_settings_lockscreen); - } - - @Override - public boolean onPreferenceChange(Preference preference, Object newValue) { - return false; - } - - public static void reset(Context mContext) { - ContentResolver resolver = mContext.getContentResolver(); - } - - @Override - public void onResume() { - super.onResume(); - } - - @Override - public int getMetricsCategory() { - return MetricsProto.MetricsEvent.ALPHA; - } - - /** - * For search - */ - public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider(R.xml.alpha_settings_lockscreen) { - - @Override - public List getNonIndexableKeys(Context context) { - List keys = super.getNonIndexableKeys(context); - return keys; - } - }; -} diff --git a/src/com/alpha/settings/fragments/Navigation.java b/src/com/alpha/settings/fragments/Navigation.java deleted file mode 100644 index 7490d21..0000000 --- a/src/com/alpha/settings/fragments/Navigation.java +++ /dev/null @@ -1,90 +0,0 @@ -/* - * Copyright (C) 2016-2024 crDroid Android Project - * 2023-2024 AlphaDroid 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.alpha.settings.fragments; - -import android.app.Activity; -import android.content.ContentResolver; -import android.content.Context; -import android.content.Intent; -import android.content.res.Resources; -import android.os.Bundle; -import android.os.UserHandle; -import android.provider.SearchIndexableResource; -import android.provider.Settings; -import android.text.TextUtils; - -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceScreen; -import androidx.preference.Preference.OnPreferenceChangeListener; - -import com.android.internal.logging.nano.MetricsProto; - -import com.android.settings.R; -import com.android.settings.SettingsPreferenceFragment; -import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settingslib.search.SearchIndexable; - -import java.util.List; - -import lineageos.providers.LineageSettings; - -@SearchIndexable -public class Navigation extends SettingsPreferenceFragment - implements Preference.OnPreferenceChangeListener { - - public static final String TAG = "Navigation"; - - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - addPreferencesFromResource(R.xml.alpha_settings_navigation); - } - - @Override - public boolean onPreferenceChange(Preference preference, Object newValue) { - return false; - } - - public static void reset(Context mContext) { - ContentResolver resolver = mContext.getContentResolver(); - } - - @Override - public void onResume() { - super.onResume(); - } - - @Override - public int getMetricsCategory() { - return MetricsProto.MetricsEvent.ALPHA; - } - - /** - * For search - */ - public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider(R.xml.alpha_settings_navigation) { - - @Override - public List getNonIndexableKeys(Context context) { - List keys = super.getNonIndexableKeys(context); - return keys; - } - }; -} diff --git a/src/com/alpha/settings/fragments/Notifications.java b/src/com/alpha/settings/fragments/Notifications.java deleted file mode 100644 index c5e196c..0000000 --- a/src/com/alpha/settings/fragments/Notifications.java +++ /dev/null @@ -1,90 +0,0 @@ -/* - * Copyright (C) 2016-2024 crDroid Android Project - * 2023-2024 AlphaDroid 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.alpha.settings.fragments; - -import android.app.Activity; -import android.content.ContentResolver; -import android.content.Context; -import android.content.Intent; -import android.content.res.Resources; -import android.os.Bundle; -import android.os.UserHandle; -import android.provider.SearchIndexableResource; -import android.provider.Settings; -import android.text.TextUtils; - -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceScreen; -import androidx.preference.Preference.OnPreferenceChangeListener; - -import com.android.internal.logging.nano.MetricsProto; - -import com.android.settings.R; -import com.android.settings.SettingsPreferenceFragment; -import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settingslib.search.SearchIndexable; - -import java.util.List; - -import lineageos.providers.LineageSettings; - -@SearchIndexable -public class Notifications extends SettingsPreferenceFragment - implements Preference.OnPreferenceChangeListener { - - public static final String TAG = "Notifications"; - - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - addPreferencesFromResource(R.xml.alpha_settings_notifications); - } - - @Override - public boolean onPreferenceChange(Preference preference, Object newValue) { - return false; - } - - public static void reset(Context mContext) { - ContentResolver resolver = mContext.getContentResolver(); - } - - @Override - public void onResume() { - super.onResume(); - } - - @Override - public int getMetricsCategory() { - return MetricsProto.MetricsEvent.ALPHA; - } - - /** - * For search - */ - public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider(R.xml.alpha_settings_notifications) { - - @Override - public List getNonIndexableKeys(Context context) { - List keys = super.getNonIndexableKeys(context); - return keys; - } - }; -} diff --git a/src/com/alpha/settings/fragments/QuickSettings.java b/src/com/alpha/settings/fragments/QuickSettings.java deleted file mode 100644 index 66d60dc..0000000 --- a/src/com/alpha/settings/fragments/QuickSettings.java +++ /dev/null @@ -1,90 +0,0 @@ -/* - * Copyright (C) 2016-2024 crDroid Android Project - * 2023-2024 AlphaDroid 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.alpha.settings.fragments; - -import android.app.Activity; -import android.content.ContentResolver; -import android.content.Context; -import android.content.Intent; -import android.content.res.Resources; -import android.os.Bundle; -import android.os.UserHandle; -import android.provider.SearchIndexableResource; -import android.provider.Settings; -import android.text.TextUtils; - -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceScreen; -import androidx.preference.Preference.OnPreferenceChangeListener; - -import com.android.internal.logging.nano.MetricsProto; - -import com.android.settings.R; -import com.android.settings.SettingsPreferenceFragment; -import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settingslib.search.SearchIndexable; - -import java.util.List; - -import lineageos.providers.LineageSettings; - -@SearchIndexable -public class QuickSettings extends SettingsPreferenceFragment - implements Preference.OnPreferenceChangeListener { - - public static final String TAG = "QuickSettings"; - - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - addPreferencesFromResource(R.xml.alpha_settings_quicksettings); - } - - @Override - public boolean onPreferenceChange(Preference preference, Object newValue) { - return false; - } - - public static void reset(Context mContext) { - ContentResolver resolver = mContext.getContentResolver(); - } - - @Override - public void onResume() { - super.onResume(); - } - - @Override - public int getMetricsCategory() { - return MetricsProto.MetricsEvent.ALPHA; - } - - /** - * For search - */ - public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider(R.xml.alpha_settings_quicksettings) { - - @Override - public List getNonIndexableKeys(Context context) { - List keys = super.getNonIndexableKeys(context); - return keys; - } - }; -} diff --git a/src/com/alpha/settings/fragments/Sound.java b/src/com/alpha/settings/fragments/Sound.java deleted file mode 100644 index 79471a3..0000000 --- a/src/com/alpha/settings/fragments/Sound.java +++ /dev/null @@ -1,90 +0,0 @@ -/* - * Copyright (C) 2016-2024 crDroid Android Project - * 2023-2024 AlphaDroid 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.alpha.settings.fragments; - -import android.app.Activity; -import android.content.ContentResolver; -import android.content.Context; -import android.content.Intent; -import android.content.res.Resources; -import android.os.Bundle; -import android.os.UserHandle; -import android.provider.SearchIndexableResource; -import android.provider.Settings; -import android.text.TextUtils; - -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceScreen; -import androidx.preference.Preference.OnPreferenceChangeListener; - -import com.android.internal.logging.nano.MetricsProto; - -import com.android.settings.R; -import com.android.settings.SettingsPreferenceFragment; -import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settingslib.search.SearchIndexable; - -import java.util.List; - -import lineageos.providers.LineageSettings; - -@SearchIndexable -public class Sound extends SettingsPreferenceFragment - implements Preference.OnPreferenceChangeListener { - - public static final String TAG = "Sound"; - - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - addPreferencesFromResource(R.xml.alpha_settings_sound; - } - - @Override - public boolean onPreferenceChange(Preference preference, Object newValue) { - return false; - } - - public static void reset(Context mContext) { - ContentResolver resolver = mContext.getContentResolver(); - } - - @Override - public void onResume() { - super.onResume(); - } - - @Override - public int getMetricsCategory() { - return MetricsProto.MetricsEvent.ALPHA; - } - - /** - * For search - */ - public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider(R.xml.alpha_settings_sound) { - - @Override - public List getNonIndexableKeys(Context context) { - List keys = super.getNonIndexableKeys(context); - return keys; - } - }; -} diff --git a/src/com/alpha/settings/fragments/UserInterface.java b/src/com/alpha/settings/fragments/UserInterface.java deleted file mode 100644 index 43ede3a..0000000 --- a/src/com/alpha/settings/fragments/UserInterface.java +++ /dev/null @@ -1,90 +0,0 @@ -/* - * Copyright (C) 2016-2024 crDroid Android Project - * 2023-2024 AlphaDroid 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.alpha.settings.fragments; - -import android.app.Activity; -import android.content.ContentResolver; -import android.content.Context; -import android.content.Intent; -import android.content.res.Resources; -import android.os.Bundle; -import android.os.UserHandle; -import android.provider.SearchIndexableResource; -import android.provider.Settings; -import android.text.TextUtils; - -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceScreen; -import androidx.preference.Preference.OnPreferenceChangeListener; - -import com.android.internal.logging.nano.MetricsProto; - -import com.android.settings.R; -import com.android.settings.SettingsPreferenceFragment; -import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settingslib.search.SearchIndexable; - -import java.util.List; - -import lineageos.providers.LineageSettings; - -@SearchIndexable -public class UserInterface extends SettingsPreferenceFragment - implements Preference.OnPreferenceChangeListener { - - public static final String TAG = "UserInterface"; - - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - addPreferencesFromResource(R.xml.alpha_settings_ui); - } - - @Override - public boolean onPreferenceChange(Preference preference, Object newValue) { - return false; - } - - public static void reset(Context mContext) { - ContentResolver resolver = mContext.getContentResolver(); - } - - @Override - public void onResume() { - super.onResume(); - } - - @Override - public int getMetricsCategory() { - return MetricsProto.MetricsEvent.ALPHA; - } - - /** - * For search - */ - public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider(R.xml.alpha_settings_ui) { - - @Override - public List getNonIndexableKeys(Context context) { - List keys = super.getNonIndexableKeys(context); - return keys; - } - }; -} diff --git a/src/com/alpha/settings/fragments/about/ChangelogActivity.java b/src/com/alpha/settings/fragments/about/ChangelogActivity.java deleted file mode 100644 index b30b963..0000000 --- a/src/com/alpha/settings/fragments/about/ChangelogActivity.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (C) 2016-2024 crDroid Android 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.alpha.settings.fragments.about; - -import android.os.Bundle; -import com.android.settingslib.collapsingtoolbar.CollapsingToolbarBaseActivity; - -public class ChangelogActivity extends CollapsingToolbarBaseActivity { - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - getFragmentManager().beginTransaction().replace( - com.android.settingslib.collapsingtoolbar.R.id.content_frame, - new ChangelogFragment()).commit(); - } -} diff --git a/src/com/alpha/settings/fragments/about/ChangelogFragment.java b/src/com/alpha/settings/fragments/about/ChangelogFragment.java deleted file mode 100644 index d1d2629..0000000 --- a/src/com/alpha/settings/fragments/about/ChangelogFragment.java +++ /dev/null @@ -1,129 +0,0 @@ -/* - * Copyright (C) 2016-2021 crDroid Android 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.alpha.settings.fragments.about; - -import android.annotation.Nullable; -import android.app.Fragment; -import android.content.res.Resources; -import android.os.Bundle; -import android.graphics.Color; -import android.graphics.Typeface; -import android.text.Spannable; -import android.text.SpannableStringBuilder; -import android.text.style.ForegroundColorSpan; -import android.text.style.StyleSpan; -import android.util.Log; -import android.util.TypedValue; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.LinearLayout; -import android.widget.LinearLayout.LayoutParams; -import android.widget.TextView; - -import androidx.preference.PreferenceFragment; - -import com.android.settings.R; - -import java.io.FileReader; -import java.io.IOException; -import java.io.InputStreamReader; -import java.util.regex.Pattern; -import java.util.regex.Matcher; - -import com.android.internal.logging.nano.MetricsProto; - -public class ChangelogFragment extends PreferenceFragment { - - TextView textView; - - private static final String CHANGELOG_PATH = "/system/etc/Changelog.txt"; - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { - return inflater.inflate(R.layout.changelog, container, false); - } - - @Override - public void onViewCreated(final View view, @Nullable Bundle savedInstanceState) { - super.onViewCreated(view, savedInstanceState); - - textView = view.findViewById(R.id.changelog_text); - - InputStreamReader inputReader = null; - String text = null; - StringBuilder data = new StringBuilder(); - - Pattern date = Pattern.compile("(={20}|\\d{4}-\\d{2}-\\d{2})"); - Pattern commit = Pattern.compile("([a-f0-9]{7})"); - Pattern committer = Pattern.compile("\\[(\\D.*?)]"); - Pattern title = Pattern.compile("(\\R\\s+[\\*]\\s.*)"); - - try { - char tmp[] = new char[2048]; - int numRead; - - inputReader = new FileReader(CHANGELOG_PATH); - while ((numRead = inputReader.read(tmp)) >= 0) { - data.append(tmp, 0, numRead); - } -// text = data.toString(); - } catch (IOException e) { -// text = getString(R.string.changelog_error); - } finally { - try { - if (inputReader != null) { - inputReader.close(); - } - } catch (IOException e) { - } - } - - SpannableStringBuilder sb = new SpannableStringBuilder(data); - Resources.Theme theme = getContext().getTheme(); - TypedValue typedValue = new TypedValue(); - theme.resolveAttribute(android.R.attr.colorAccent, typedValue, true); - final int color = getContext().getColor(typedValue.resourceId); - - Matcher m = date.matcher(data); - while (m.find()){ - sb.setSpan(new ForegroundColorSpan(color), m.start(1), m.end(1), Spannable.SPAN_INCLUSIVE_INCLUSIVE); - sb.setSpan(new StyleSpan(Typeface.BOLD), m.start(1), m.end(1), Spannable.SPAN_INCLUSIVE_INCLUSIVE); - } - m = commit.matcher(data); - while (m.find()){ - sb.setSpan(new StyleSpan(Typeface.NORMAL), m.start(1), m.end(1), Spannable.SPAN_INCLUSIVE_INCLUSIVE); - } - m = committer.matcher(data); - while (m.find()){ - sb.setSpan(new ForegroundColorSpan(color), m.start(1), m.end(1), Spannable.SPAN_INCLUSIVE_INCLUSIVE); - sb.setSpan(new StyleSpan(Typeface.NORMAL), m.start(1), m.end(1), Spannable.SPAN_INCLUSIVE_INCLUSIVE); - } - m = title.matcher(data); - while (m.find()){ - sb.setSpan(new ForegroundColorSpan(color), m.start(1), m.end(1), Spannable.SPAN_INCLUSIVE_INCLUSIVE); - sb.setSpan(new StyleSpan(Typeface.BOLD), m.start(1), m.end(1), Spannable.SPAN_INCLUSIVE_INCLUSIVE); - } - - textView.setText(sb); - } - - @Override - public void onCreatePreferences(Bundle savedInstanceState, String rootKey) { - - } -} diff --git a/src/com/alpha/settings/AlphaSettings.java b/src/com/scoop/settings/ScoopSettings.java similarity index 81% rename from src/com/alpha/settings/AlphaSettings.java rename to src/com/scoop/settings/ScoopSettings.java index 0122066..1178199 100644 --- a/src/com/alpha/settings/AlphaSettings.java +++ b/src/com/scoop/settings/ScoopSettings.java @@ -15,28 +15,16 @@ * limitations under the License. */ -package com.alpha.settings; +package com.scoop.settings; -import android.app.Activity; import android.app.AlertDialog; import android.content.Context; import android.content.DialogInterface; -import android.graphics.drawable.Drawable; import android.os.AsyncTask; import android.os.Bundle; -import android.os.UserHandle; -import android.provider.Settings; -import android.view.Gravity; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.Toolbar; - -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import com.android.internal.logging.nano.MetricsProto ; @@ -45,14 +33,12 @@ import com.android.settingslib.search.SearchIndexable; import com.android.settings.R; import com.android.settings.search.BaseSearchIndexProvider; -import com.google.android.material.appbar.CollapsingToolbarLayout; @SearchIndexable -public class AlphaSettings extends DashboardFragment { +public class ScoopSettings extends DashboardFragment { - private static final String TAG = "AlphaSettings"; + private static final String TAG = "ScoopSettings"; - protected CollapsingToolbarLayout mCollapsingToolbarLayout; private static final int MENU_RESET = Menu.FIRST; @Override @@ -115,7 +101,7 @@ public class AlphaSettings extends DashboardFragment { @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.ALPHA; + return MetricsProto.MetricsEvent.SCOOP; } @Override @@ -130,9 +116,9 @@ public class AlphaSettings extends DashboardFragment { @Override protected int getPreferenceScreenResId() { - return R.layout.alpha_settings; + return R.layout.scoop_settings; } public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider(R.layout.alpha_settings); + new BaseSearchIndexProvider(R.layout.scoop_settings); } diff --git a/src/com/alpha/settings/TopLevelSettingsPreferenceController.java b/src/com/scoop/settings/TopLevelSettingsPreferenceController.java similarity index 97% rename from src/com/alpha/settings/TopLevelSettingsPreferenceController.java rename to src/com/scoop/settings/TopLevelSettingsPreferenceController.java index 75fa30e..a281b9d 100644 --- a/src/com/alpha/settings/TopLevelSettingsPreferenceController.java +++ b/src/com/scoop/settings/TopLevelSettingsPreferenceController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.alpha.settings; +package com.scoop.settings; import android.content.Context; diff --git a/src/com/alpha/settings/fragments/Miscellaneous.java b/src/com/scoop/settings/fragments/Miscellaneous.java similarity index 92% rename from src/com/alpha/settings/fragments/Miscellaneous.java rename to src/com/scoop/settings/fragments/Miscellaneous.java index be2ca4c..32bfbae 100644 --- a/src/com/alpha/settings/fragments/Miscellaneous.java +++ b/src/com/scoop/settings/fragments/Miscellaneous.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alpha.settings.fragments; +package com.scoop.settings.fragments; import android.app.Activity; import android.content.ContentResolver; @@ -53,7 +53,7 @@ public class Miscellaneous extends SettingsPreferenceFragment public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - addPreferencesFromResource(R.xml.alpha_settings_misc; + addPreferencesFromResource(R.xml.scoop_settings_misc; } @Override @@ -72,14 +72,14 @@ public class Miscellaneous extends SettingsPreferenceFragment @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.ALPHA; + return MetricsProto.MetricsEvent.SCOOP; } /** * For search */ public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider(R.xml.alpha_settings_misc) { + new BaseSearchIndexProvider(R.xml.scoop_settings_misc) { @Override public List getNonIndexableKeys(Context context) { diff --git a/src/com/alpha/settings/preferences/BacklightTimeoutSeekBar.java b/src/com/scoop/settings/preferences/BacklightTimeoutSeekBar.java similarity index 98% rename from src/com/alpha/settings/preferences/BacklightTimeoutSeekBar.java rename to src/com/scoop/settings/preferences/BacklightTimeoutSeekBar.java index 17c9155..79df65a 100644 --- a/src/com/alpha/settings/preferences/BacklightTimeoutSeekBar.java +++ b/src/com/scoop/settings/preferences/BacklightTimeoutSeekBar.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alpha.settings.preferences; +package com.scoop.settings.preferences; import android.content.Context; import android.graphics.drawable.Drawable; diff --git a/src/com/alpha/settings/preferences/CustomDialogPref.java b/src/com/scoop/settings/preferences/CustomDialogPref.java similarity index 99% rename from src/com/alpha/settings/preferences/CustomDialogPref.java rename to src/com/scoop/settings/preferences/CustomDialogPref.java index 5787768..8b2d3b6 100644 --- a/src/com/alpha/settings/preferences/CustomDialogPref.java +++ b/src/com/scoop/settings/preferences/CustomDialogPref.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alpha.settings.preferences; +package com.scoop.settings.preferences; import android.app.Dialog; import android.content.Context; diff --git a/src/com/alpha/settings/preferences/CustomSeekBarPreference.java b/src/com/scoop/settings/preferences/CustomSeekBarPreference.java similarity index 99% rename from src/com/alpha/settings/preferences/CustomSeekBarPreference.java rename to src/com/scoop/settings/preferences/CustomSeekBarPreference.java index 892928a..751ec8a 100644 --- a/src/com/alpha/settings/preferences/CustomSeekBarPreference.java +++ b/src/com/scoop/settings/preferences/CustomSeekBarPreference.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alpha.settings.preferences; +package com.scoop.settings.preferences; import android.content.Context; import android.content.res.TypedArray; diff --git a/src/com/alpha/settings/preferences/GlobalSettingListPreference.java b/src/com/scoop/settings/preferences/GlobalSettingListPreference.java similarity index 98% rename from src/com/alpha/settings/preferences/GlobalSettingListPreference.java rename to src/com/scoop/settings/preferences/GlobalSettingListPreference.java index 381ade1..64f2ab6 100644 --- a/src/com/alpha/settings/preferences/GlobalSettingListPreference.java +++ b/src/com/scoop/settings/preferences/GlobalSettingListPreference.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alpha.settings.preferences; +package com.scoop.settings.preferences; import android.content.Context; import androidx.preference.ListPreference; diff --git a/src/com/alpha/settings/preferences/GlobalSettingMainSwitchPreference.kt b/src/com/scoop/settings/preferences/GlobalSettingMainSwitchPreference.kt similarity index 97% rename from src/com/alpha/settings/preferences/GlobalSettingMainSwitchPreference.kt rename to src/com/scoop/settings/preferences/GlobalSettingMainSwitchPreference.kt index 2633525..8b0308b 100644 --- a/src/com/alpha/settings/preferences/GlobalSettingMainSwitchPreference.kt +++ b/src/com/scoop/settings/preferences/GlobalSettingMainSwitchPreference.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.alpha.settings.preferences +package com.scoop.settings.preferences import android.content.Context import android.util.AttributeSet diff --git a/src/com/alpha/settings/preferences/GlobalSettingSeekBarPreference.java b/src/com/scoop/settings/preferences/GlobalSettingSeekBarPreference.java similarity index 97% rename from src/com/alpha/settings/preferences/GlobalSettingSeekBarPreference.java rename to src/com/scoop/settings/preferences/GlobalSettingSeekBarPreference.java index 4b74577..6fa7b33 100644 --- a/src/com/alpha/settings/preferences/GlobalSettingSeekBarPreference.java +++ b/src/com/scoop/settings/preferences/GlobalSettingSeekBarPreference.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alpha.settings.preferences; +package com.scoop.settings.preferences; import android.content.Context; import android.util.AttributeSet; diff --git a/src/com/alpha/settings/preferences/GlobalSettingSwitchPreference.java b/src/com/scoop/settings/preferences/GlobalSettingSwitchPreference.java similarity index 97% rename from src/com/alpha/settings/preferences/GlobalSettingSwitchPreference.java rename to src/com/scoop/settings/preferences/GlobalSettingSwitchPreference.java index 7d9ae07..8714339 100644 --- a/src/com/alpha/settings/preferences/GlobalSettingSwitchPreference.java +++ b/src/com/scoop/settings/preferences/GlobalSettingSwitchPreference.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alpha.settings.preferences; +package com.scoop.settings.preferences; import android.content.Context; import android.provider.Settings; diff --git a/src/com/alpha/settings/preferences/GlobalSettingsStore.java b/src/com/scoop/settings/preferences/GlobalSettingsStore.java similarity index 98% rename from src/com/alpha/settings/preferences/GlobalSettingsStore.java rename to src/com/scoop/settings/preferences/GlobalSettingsStore.java index 5f0c0cd..28d2e2a 100644 --- a/src/com/alpha/settings/preferences/GlobalSettingsStore.java +++ b/src/com/scoop/settings/preferences/GlobalSettingsStore.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alpha.settings.preferences; +package com.scoop.settings.preferences; import android.content.ContentResolver; import android.preference.PreferenceDataStore; diff --git a/src/com/alpha/settings/preferences/LineageSecureSettingSeekBarPreference.java b/src/com/scoop/settings/preferences/LineageSecureSettingSeekBarPreference.java similarity index 97% rename from src/com/alpha/settings/preferences/LineageSecureSettingSeekBarPreference.java rename to src/com/scoop/settings/preferences/LineageSecureSettingSeekBarPreference.java index 661e9f5..d68ba21 100644 --- a/src/com/alpha/settings/preferences/LineageSecureSettingSeekBarPreference.java +++ b/src/com/scoop/settings/preferences/LineageSecureSettingSeekBarPreference.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alpha.settings.preferences; +package com.scoop.settings.preferences; import android.content.Context; import android.util.AttributeSet; diff --git a/src/com/alpha/settings/preferences/LineageSecureSettingsStore.java b/src/com/scoop/settings/preferences/LineageSecureSettingsStore.java similarity index 98% rename from src/com/alpha/settings/preferences/LineageSecureSettingsStore.java rename to src/com/scoop/settings/preferences/LineageSecureSettingsStore.java index 2804923..28fba7c 100644 --- a/src/com/alpha/settings/preferences/LineageSecureSettingsStore.java +++ b/src/com/scoop/settings/preferences/LineageSecureSettingsStore.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alpha.settings.preferences; +package com.scoop.settings.preferences; import android.content.ContentResolver; import android.preference.PreferenceDataStore; diff --git a/src/com/alpha/settings/preferences/LineageSystemSettingSeekBarPreference.java b/src/com/scoop/settings/preferences/LineageSystemSettingSeekBarPreference.java similarity index 97% rename from src/com/alpha/settings/preferences/LineageSystemSettingSeekBarPreference.java rename to src/com/scoop/settings/preferences/LineageSystemSettingSeekBarPreference.java index a330831..6430003 100644 --- a/src/com/alpha/settings/preferences/LineageSystemSettingSeekBarPreference.java +++ b/src/com/scoop/settings/preferences/LineageSystemSettingSeekBarPreference.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alpha.settings.preferences; +package com.scoop.settings.preferences; import android.content.Context; import android.util.AttributeSet; diff --git a/src/com/alpha/settings/preferences/LineageSystemSettingsStore.java b/src/com/scoop/settings/preferences/LineageSystemSettingsStore.java similarity index 98% rename from src/com/alpha/settings/preferences/LineageSystemSettingsStore.java rename to src/com/scoop/settings/preferences/LineageSystemSettingsStore.java index 4e1cab8..6e7086a 100644 --- a/src/com/alpha/settings/preferences/LineageSystemSettingsStore.java +++ b/src/com/scoop/settings/preferences/LineageSystemSettingsStore.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alpha.settings.preferences; +package com.scoop.settings.preferences; import android.content.ContentResolver; import android.preference.PreferenceDataStore; diff --git a/src/com/alpha/settings/preferences/PackageListAdapter.java b/src/com/scoop/settings/preferences/PackageListAdapter.java similarity index 99% rename from src/com/alpha/settings/preferences/PackageListAdapter.java rename to src/com/scoop/settings/preferences/PackageListAdapter.java index 3349e9e..2104c61 100644 --- a/src/com/alpha/settings/preferences/PackageListAdapter.java +++ b/src/com/scoop/settings/preferences/PackageListAdapter.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.alpha.settings.preferences; +package com.scoop.settings.preferences; import android.content.Context; import android.content.Intent; diff --git a/src/com/alpha/settings/preferences/SecureSettingListPreference.java b/src/com/scoop/settings/preferences/SecureSettingListPreference.java similarity index 98% rename from src/com/alpha/settings/preferences/SecureSettingListPreference.java rename to src/com/scoop/settings/preferences/SecureSettingListPreference.java index f0d5e42..22488b0 100644 --- a/src/com/alpha/settings/preferences/SecureSettingListPreference.java +++ b/src/com/scoop/settings/preferences/SecureSettingListPreference.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alpha.settings.preferences; +package com.scoop.settings.preferences; import android.content.Context; import androidx.preference.ListPreference; diff --git a/src/com/alpha/settings/preferences/SecureSettingMainSwitchPreference.kt b/src/com/scoop/settings/preferences/SecureSettingMainSwitchPreference.kt similarity index 97% rename from src/com/alpha/settings/preferences/SecureSettingMainSwitchPreference.kt rename to src/com/scoop/settings/preferences/SecureSettingMainSwitchPreference.kt index dcdc277..60cda2e 100644 --- a/src/com/alpha/settings/preferences/SecureSettingMainSwitchPreference.kt +++ b/src/com/scoop/settings/preferences/SecureSettingMainSwitchPreference.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.alpha.settings.preferences +package com.scoop.settings.preferences import android.content.Context import android.util.AttributeSet diff --git a/src/com/alpha/settings/preferences/SecureSettingSeekBarPreference.java b/src/com/scoop/settings/preferences/SecureSettingSeekBarPreference.java similarity index 97% rename from src/com/alpha/settings/preferences/SecureSettingSeekBarPreference.java rename to src/com/scoop/settings/preferences/SecureSettingSeekBarPreference.java index f865fab..dc24e68 100644 --- a/src/com/alpha/settings/preferences/SecureSettingSeekBarPreference.java +++ b/src/com/scoop/settings/preferences/SecureSettingSeekBarPreference.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alpha.settings.preferences; +package com.scoop.settings.preferences; import android.content.Context; import android.util.AttributeSet; diff --git a/src/com/alpha/settings/preferences/SecureSettingSwitchPreference.java b/src/com/scoop/settings/preferences/SecureSettingSwitchPreference.java similarity index 97% rename from src/com/alpha/settings/preferences/SecureSettingSwitchPreference.java rename to src/com/scoop/settings/preferences/SecureSettingSwitchPreference.java index 0a31598..4fd7122 100644 --- a/src/com/alpha/settings/preferences/SecureSettingSwitchPreference.java +++ b/src/com/scoop/settings/preferences/SecureSettingSwitchPreference.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alpha.settings.preferences; +package com.scoop.settings.preferences; import android.content.Context; import android.provider.Settings; diff --git a/src/com/alpha/settings/preferences/SecureSettingsStore.java b/src/com/scoop/settings/preferences/SecureSettingsStore.java similarity index 98% rename from src/com/alpha/settings/preferences/SecureSettingsStore.java rename to src/com/scoop/settings/preferences/SecureSettingsStore.java index 7df1b83..0e17cbc 100644 --- a/src/com/alpha/settings/preferences/SecureSettingsStore.java +++ b/src/com/scoop/settings/preferences/SecureSettingsStore.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alpha.settings.preferences; +package com.scoop.settings.preferences; import android.content.ContentResolver; import android.preference.PreferenceDataStore; diff --git a/src/com/alpha/settings/preferences/SettingPrimarySwitchPreference.kt b/src/com/scoop/settings/preferences/SettingPrimarySwitchPreference.kt similarity index 99% rename from src/com/alpha/settings/preferences/SettingPrimarySwitchPreference.kt rename to src/com/scoop/settings/preferences/SettingPrimarySwitchPreference.kt index b137517..3307e70 100644 --- a/src/com/alpha/settings/preferences/SettingPrimarySwitchPreference.kt +++ b/src/com/scoop/settings/preferences/SettingPrimarySwitchPreference.kt @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.alpha.settings.preferences +package com.scoop.settings.preferences import android.content.Context import android.content.res.TypedArray diff --git a/src/com/alpha/settings/preferences/SystemPropertyListPreference.java b/src/com/scoop/settings/preferences/SystemPropertyListPreference.java similarity index 97% rename from src/com/alpha/settings/preferences/SystemPropertyListPreference.java rename to src/com/scoop/settings/preferences/SystemPropertyListPreference.java index 56ecee9..ac1a958 100644 --- a/src/com/alpha/settings/preferences/SystemPropertyListPreference.java +++ b/src/com/scoop/settings/preferences/SystemPropertyListPreference.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.alpha.settings.preferences; +package com.scoop.settings.preferences; import android.content.Context; import android.os.SystemProperties; diff --git a/src/com/alpha/settings/preferences/SystemPropertySwitchPreference.java b/src/com/scoop/settings/preferences/SystemPropertySwitchPreference.java similarity index 97% rename from src/com/alpha/settings/preferences/SystemPropertySwitchPreference.java rename to src/com/scoop/settings/preferences/SystemPropertySwitchPreference.java index 697a607..a23626f 100644 --- a/src/com/alpha/settings/preferences/SystemPropertySwitchPreference.java +++ b/src/com/scoop/settings/preferences/SystemPropertySwitchPreference.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.alpha.settings.preferences; +package com.scoop.settings.preferences; import android.content.Context; import android.os.SystemProperties; diff --git a/src/com/alpha/settings/preferences/SystemSettingEditTextPreference.java b/src/com/scoop/settings/preferences/SystemSettingEditTextPreference.java similarity index 98% rename from src/com/alpha/settings/preferences/SystemSettingEditTextPreference.java rename to src/com/scoop/settings/preferences/SystemSettingEditTextPreference.java index 9678d14..80df771 100644 --- a/src/com/alpha/settings/preferences/SystemSettingEditTextPreference.java +++ b/src/com/scoop/settings/preferences/SystemSettingEditTextPreference.java @@ -14,7 +14,7 @@ * limitations under the License. */ - package com.alpha.settings.preferences; + package com.scoop.settings.preferences; import android.content.Context; import androidx.preference.EditTextPreference; diff --git a/src/com/alpha/settings/preferences/SystemSettingListPreference.java b/src/com/scoop/settings/preferences/SystemSettingListPreference.java similarity index 98% rename from src/com/alpha/settings/preferences/SystemSettingListPreference.java rename to src/com/scoop/settings/preferences/SystemSettingListPreference.java index 698eaf7..0d8b667 100644 --- a/src/com/alpha/settings/preferences/SystemSettingListPreference.java +++ b/src/com/scoop/settings/preferences/SystemSettingListPreference.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alpha.settings.preferences; +package com.scoop.settings.preferences; import android.content.Context; import androidx.preference.ListPreference; diff --git a/src/com/alpha/settings/preferences/SystemSettingMainSwitchPreference.kt b/src/com/scoop/settings/preferences/SystemSettingMainSwitchPreference.kt similarity index 96% rename from src/com/alpha/settings/preferences/SystemSettingMainSwitchPreference.kt rename to src/com/scoop/settings/preferences/SystemSettingMainSwitchPreference.kt index 5bee6fe..5a96d58 100644 --- a/src/com/alpha/settings/preferences/SystemSettingMainSwitchPreference.kt +++ b/src/com/scoop/settings/preferences/SystemSettingMainSwitchPreference.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.alpha.settings.preferences +package com.scoop.settings.preferences import android.content.Context import android.util.AttributeSet diff --git a/src/com/alpha/settings/preferences/SystemSettingPrimarySwitchPreference.kt b/src/com/scoop/settings/preferences/SystemSettingPrimarySwitchPreference.kt similarity index 96% rename from src/com/alpha/settings/preferences/SystemSettingPrimarySwitchPreference.kt rename to src/com/scoop/settings/preferences/SystemSettingPrimarySwitchPreference.kt index e398f79..84668d0 100644 --- a/src/com/alpha/settings/preferences/SystemSettingPrimarySwitchPreference.kt +++ b/src/com/scoop/settings/preferences/SystemSettingPrimarySwitchPreference.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.alpha.settings.preferences +package com.scoop.settings.preferences import android.content.Context import android.provider.Settings diff --git a/src/com/alpha/settings/preferences/SystemSettingSeekBarPreference.java b/src/com/scoop/settings/preferences/SystemSettingSeekBarPreference.java similarity index 97% rename from src/com/alpha/settings/preferences/SystemSettingSeekBarPreference.java rename to src/com/scoop/settings/preferences/SystemSettingSeekBarPreference.java index 2544896..cfba2b5 100644 --- a/src/com/alpha/settings/preferences/SystemSettingSeekBarPreference.java +++ b/src/com/scoop/settings/preferences/SystemSettingSeekBarPreference.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alpha.settings.preferences; +package com.scoop.settings.preferences; import android.content.Context; import android.util.AttributeSet; diff --git a/src/com/alpha/settings/preferences/SystemSettingSwitchPreference.java b/src/com/scoop/settings/preferences/SystemSettingSwitchPreference.java similarity index 97% rename from src/com/alpha/settings/preferences/SystemSettingSwitchPreference.java rename to src/com/scoop/settings/preferences/SystemSettingSwitchPreference.java index a4ea8c8..a3bc341 100644 --- a/src/com/alpha/settings/preferences/SystemSettingSwitchPreference.java +++ b/src/com/scoop/settings/preferences/SystemSettingSwitchPreference.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alpha.settings.preferences; +package com.scoop.settings.preferences; import android.content.Context; import android.provider.Settings; diff --git a/src/com/alpha/settings/preferences/SystemSettingsStore.java b/src/com/scoop/settings/preferences/SystemSettingsStore.java similarity index 98% rename from src/com/alpha/settings/preferences/SystemSettingsStore.java rename to src/com/scoop/settings/preferences/SystemSettingsStore.java index 91e42fe..4ac1311 100644 --- a/src/com/alpha/settings/preferences/SystemSettingsStore.java +++ b/src/com/scoop/settings/preferences/SystemSettingsStore.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alpha.settings.preferences; +package com.scoop.settings.preferences; import android.content.ContentResolver; import android.preference.PreferenceDataStore; diff --git a/src/com/alpha/settings/preferences/colorpicker/AlphaPatternDrawable.java b/src/com/scoop/settings/preferences/colorpicker/AlphaPatternDrawable.java similarity index 97% rename from src/com/alpha/settings/preferences/colorpicker/AlphaPatternDrawable.java rename to src/com/scoop/settings/preferences/colorpicker/AlphaPatternDrawable.java index 6df0af5..3a767e0 100644 --- a/src/com/alpha/settings/preferences/colorpicker/AlphaPatternDrawable.java +++ b/src/com/scoop/settings/preferences/colorpicker/AlphaPatternDrawable.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.alpha.settings.preferences.colorpicker; +package com.scoop.settings.preferences.colorpicker; import android.graphics.Bitmap; import android.graphics.Bitmap.Config; @@ -65,7 +65,7 @@ public class AlphaPatternDrawable extends Drawable { } @Override - public void setAlpha(int alpha) { + public void setAlpha(int.scoop) { throw new UnsupportedOperationException("Alpha is not supported by this drawwable."); } diff --git a/src/com/alpha/settings/preferences/colorpicker/ColorPickerDialog.java b/src/com/scoop/settings/preferences/colorpicker/ColorPickerDialog.java similarity index 99% rename from src/com/alpha/settings/preferences/colorpicker/ColorPickerDialog.java rename to src/com/scoop/settings/preferences/colorpicker/ColorPickerDialog.java index 9e1f633..3fe1708 100644 --- a/src/com/alpha/settings/preferences/colorpicker/ColorPickerDialog.java +++ b/src/com/scoop/settings/preferences/colorpicker/ColorPickerDialog.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.alpha.settings.preferences.colorpicker; +package com.scoop.settings.preferences.colorpicker; import android.app.AlertDialog; import android.content.Context; diff --git a/src/com/alpha/settings/preferences/colorpicker/ColorPickerPanelView.java b/src/com/scoop/settings/preferences/colorpicker/ColorPickerPanelView.java similarity index 98% rename from src/com/alpha/settings/preferences/colorpicker/ColorPickerPanelView.java rename to src/com/scoop/settings/preferences/colorpicker/ColorPickerPanelView.java index e5785ef..77167ae 100644 --- a/src/com/alpha/settings/preferences/colorpicker/ColorPickerPanelView.java +++ b/src/com/scoop/settings/preferences/colorpicker/ColorPickerPanelView.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.alpha.settings.preferences.colorpicker; +package com.scoop.settings.preferences.colorpicker; import android.content.Context; import android.graphics.Canvas; diff --git a/src/com/alpha/settings/preferences/colorpicker/ColorPickerPreference.java b/src/com/scoop/settings/preferences/colorpicker/ColorPickerPreference.java similarity index 96% rename from src/com/alpha/settings/preferences/colorpicker/ColorPickerPreference.java rename to src/com/scoop/settings/preferences/colorpicker/ColorPickerPreference.java index af21b1a..f4731e1 100644 --- a/src/com/alpha/settings/preferences/colorpicker/ColorPickerPreference.java +++ b/src/com/scoop/settings/preferences/colorpicker/ColorPickerPreference.java @@ -17,7 +17,7 @@ * limitations under the License. */ -package com.alpha.settings.preferences.colorpicker; +package com.scoop.settings.preferences.colorpicker; import android.app.AlertDialog; import android.content.Context; @@ -116,7 +116,7 @@ public class ColorPickerPreference extends Preference implements private void init(Context context, AttributeSet attrs) { mDensity = getContext().getResources().getDisplayMetrics().density; if (attrs != null) { - mAlphaSliderEnabled = attrs.getAttributeBooleanValue(null, "alphaSlider", false); + mAlphaSliderEnabled = attrs.getAttributeBooleanValue(null, .scoopSlider", false); mDefaultValue = attrs.getAttributeIntValue(ANDROIDNS, "defaultValue", Color.BLACK); mShowReset = attrs.getAttributeBooleanValue(SETTINGS_NS, "showReset", true); mShowPreview = attrs.getAttributeBooleanValue(SETTINGS_NS, "showPreview", true); @@ -283,13 +283,13 @@ public class ColorPickerPreference extends Preference implements * @author Unknown */ public static String convertToARGB(int color) { - String alpha = Integer.toHexString(Color.alpha(color)); + String.scoop = Integer.toHexString(Color.scoop(color)); String red = Integer.toHexString(Color.red(color)); String green = Integer.toHexString(Color.green(color)); String blue = Integer.toHexString(Color.blue(color)); - if (alpha.length() == 1) { - alpha = "0" + alpha; + if .scoop.length() == 1) { + .scoop = "0" +.scoop; } if (red.length() == 1) { @@ -304,7 +304,7 @@ public class ColorPickerPreference extends Preference implements blue = "0" + blue; } - return "#" + alpha + red + green + blue; + return "#" +.scoop + red + green + blue; } public static String convertToRGB(int color) { @@ -340,22 +340,22 @@ public class ColorPickerPreference extends Preference implements argb = argb.replace("#", ""); } - int alpha = -1, red = -1, green = -1, blue = -1; + int.scoop = -1, red = -1, green = -1, blue = -1; if (argb.length() == 8) { - alpha = Integer.parseInt(argb.substring(0, 2), 16); + .scoop = Integer.parseInt(argb.substring(0, 2), 16); red = Integer.parseInt(argb.substring(2, 4), 16); green = Integer.parseInt(argb.substring(4, 6), 16); blue = Integer.parseInt(argb.substring(6, 8), 16); } else if (argb.length() == 6) { - alpha = 255; + .scoop = 255; red = Integer.parseInt(argb.substring(0, 2), 16); green = Integer.parseInt(argb.substring(2, 4), 16); blue = Integer.parseInt(argb.substring(4, 6), 16); } - return Color.argb(alpha, red, green, blue); + return Color.argb.scoop, red, green, blue); } /** diff --git a/src/com/alpha/settings/preferences/colorpicker/ColorPickerView.java b/src/com/scoop/settings/preferences/colorpicker/ColorPickerView.java similarity index 93% rename from src/com/alpha/settings/preferences/colorpicker/ColorPickerView.java rename to src/com/scoop/settings/preferences/colorpicker/ColorPickerView.java index a2f3a4b..5cd4649 100644 --- a/src/com/alpha/settings/preferences/colorpicker/ColorPickerView.java +++ b/src/com/scoop/settings/preferences/colorpicker/ColorPickerView.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.alpha.settings.preferences.colorpicker; +package com.scoop.settings.preferences.colorpicker; import android.content.Context; import android.graphics.Canvas; @@ -36,7 +36,7 @@ import android.view.View; /** * Displays a color picker to the user and allow them - * to select a color. A slider for the alpha channel is + * to select a color. A slider for the.scoop channel is * also available. Enable it by setting * setAlphaSliderVisible(boolean) to true. * @author Daniel Nilsson @@ -45,7 +45,7 @@ public class ColorPickerView extends View { private final static int PANEL_SAT_VAL = 0; private final static int PANEL_HUE = 1; - private final static int PANEL_ALPHA = 2; + private final static int PANEL.SCOOP = 2; /** * The width in pixels of the border @@ -58,9 +58,9 @@ public class ColorPickerView extends View { */ private float HUE_PANEL_WIDTH = 30f; /** - * The height in dp of the alpha panel + * The height in dp of the.scoop panel */ - private float ALPHA_PANEL_HEIGHT = 20f; + private float .SCOOP_PANEL_HEIGHT = 20f; /** * The distance in dp between the different * color panels. @@ -71,7 +71,7 @@ public class ColorPickerView extends View { */ private float PALETTE_CIRCLE_TRACKER_RADIUS = 5f; /** - * The dp which the tracker of the hue or alpha panel + * The dp which the tracker of the hue or.scoop panel * will extend outside of its bounds. */ private float RECTANGLE_TRACKER_OFFSET = 2f; @@ -158,7 +158,7 @@ public class ColorPickerView extends View { PALETTE_CIRCLE_TRACKER_RADIUS *= mDensity; RECTANGLE_TRACKER_OFFSET *= mDensity; HUE_PANEL_WIDTH *= mDensity; - ALPHA_PANEL_HEIGHT *= mDensity; + .SCOOP_PANEL_HEIGHT *= mDensity; PANEL_SPACING = PANEL_SPACING * mDensity; mDrawingOffset = calculateRequiredOffset(); @@ -341,7 +341,7 @@ public class ColorPickerView extends View { float rectWidth = 4 * mDensity / 2; - Point p = alphaToPoint(mAlpha); + Point p =.scoopToPoint(mAlpha); RectF r = new RectF(); r.left = p.x - rectWidth; @@ -381,14 +381,14 @@ public class ColorPickerView extends View { return p; } - private Point alphaToPoint(int alpha){ + private Point.scoopToPoint(int.scoop){ final RectF rect = mAlphaRect; final float width = rect.width(); Point p = new Point(); - p.x = (int) (width - (alpha * width / 0xff) + rect.left); + p.x = (int) (width - .scoop * width / 0xff) + rect.left); p.y = (int) rect.top; return p; @@ -527,23 +527,23 @@ public class ColorPickerView extends View { break; - case PANEL_ALPHA: + case PANEL.SCOOP: if(!mShowAlphaPanel || mAlphaRect == null){ update = false; } else{ - int alpha = (int) (mAlpha - x*10); + int.scoop = (int) (mAlpha - x*10); - if(alpha < 0){ - alpha = 0; + if.scoop < 0){ + .scoop = 0; } - else if(alpha > 0xff){ - alpha = 0xff; + else if.scoop > 0xff){ + .scoop = 0xff; } - mAlpha = alpha; + mAlpha =.scoop; update = true; @@ -645,7 +645,7 @@ public class ColorPickerView extends View { } else if(mAlphaRect != null && mAlphaRect.contains(startX, startY)){ - mLastTouchedPanel = PANEL_ALPHA; + mLastTouchedPanel = PANEL.SCOOP; mAlpha = pointToAlpha((int)event.getX()); @@ -686,11 +686,11 @@ public class ColorPickerView extends View { } else{ - width = (int) (heightAllowed - ALPHA_PANEL_HEIGHT + HUE_PANEL_WIDTH); + width = (int) (heightAllowed -.SCOOP_PANEL_HEIGHT + HUE_PANEL_WIDTH); if(width > widthAllowed){ width = widthAllowed; - height = (int) (widthAllowed - HUE_PANEL_WIDTH + ALPHA_PANEL_HEIGHT); + height = (int) (widthAllowed - HUE_PANEL_WIDTH +.SCOOP_PANEL_HEIGHT); } else{ height = heightAllowed; @@ -722,7 +722,7 @@ public class ColorPickerView extends View { int width = getPrefferedHeight(); if(mShowAlphaPanel){ - width -= (PANEL_SPACING + ALPHA_PANEL_HEIGHT); + width -= (PANEL_SPACING +.SCOOP_PANEL_HEIGHT); } @@ -735,7 +735,7 @@ public class ColorPickerView extends View { int height = (int)(200 * mDensity); if(mShowAlphaPanel){ - height += PANEL_SPACING + ALPHA_PANEL_HEIGHT; + height += PANEL_SPACING +.SCOOP_PANEL_HEIGHT; } return height; @@ -764,7 +764,7 @@ public class ColorPickerView extends View { float panelSide = dRect.height() - BORDER_WIDTH_PX * 2; if(mShowAlphaPanel){ - panelSide -= PANEL_SPACING + ALPHA_PANEL_HEIGHT; + panelSide -= PANEL_SPACING +.SCOOP_PANEL_HEIGHT; } float left = dRect.left + BORDER_WIDTH_PX; @@ -781,7 +781,7 @@ public class ColorPickerView extends View { float left = dRect.right - HUE_PANEL_WIDTH + BORDER_WIDTH_PX; float top = dRect.top + BORDER_WIDTH_PX; float bottom = dRect.bottom - BORDER_WIDTH_PX - (mShowAlphaPanel - ? (PANEL_SPACING + ALPHA_PANEL_HEIGHT) : 0); + ? (PANEL_SPACING +.SCOOP_PANEL_HEIGHT) : 0); float right = dRect.right - BORDER_WIDTH_PX; mHueRect = new RectF(left, top, right, bottom); @@ -794,7 +794,7 @@ public class ColorPickerView extends View { final RectF dRect = mDrawingRect; float left = dRect.left + BORDER_WIDTH_PX; - float top = dRect.bottom - ALPHA_PANEL_HEIGHT + BORDER_WIDTH_PX; + float top = dRect.bottom -.SCOOP_PANEL_HEIGHT + BORDER_WIDTH_PX; float bottom = dRect.bottom - BORDER_WIDTH_PX; float right = dRect.right - BORDER_WIDTH_PX; @@ -860,7 +860,7 @@ public class ColorPickerView extends View { */ public void setColor(int color, boolean callback){ - int alpha = Color.alpha(color); + int.scoop = Color.scoop(color); int red = Color.red(color); int blue = Color.blue(color); int green = Color.green(color); @@ -869,7 +869,7 @@ public class ColorPickerView extends View { Color.RGBToHSV(red, green, blue, hsv); - mAlpha = alpha; + mAlpha =.scoop; mHue = hsv[0]; mSat = hsv[1]; mVal = hsv[2]; @@ -894,8 +894,8 @@ public class ColorPickerView extends View { } /** - * Set if the user is allowed to adjust the alpha panel. Default is false. - * If it is set to false no alpha will be set. + * Set if the user is allowed to adjust the.scoop panel. Default is false. + * If it is set to false no.scoop will be set. * @param visible */ public void setAlphaSliderVisible(boolean visible){ @@ -932,7 +932,7 @@ public class ColorPickerView extends View { /** * Set the text that should be shown in the - * alpha slider. Set to null to disable text. + *.scoop slider. Set to null to disable text. * @param res string resource id. */ public void setAlphaSliderText(int res){ @@ -942,7 +942,7 @@ public class ColorPickerView extends View { /** * Set the text that should be shown in the - * alpha slider. Set to null to disable text. + *.scoop slider. Set to null to disable text. * @param text Text that should be shown. */ public void setAlphaSliderText(String text){ @@ -952,7 +952,7 @@ public class ColorPickerView extends View { /** * Get the current value of the text - * that will be shown in the alpha + * that will be shown in the.scoop * slider. * @return */ diff --git a/src/com/alpha/settings/preferences/colorpicker/SecureSettingColorPickerPreference.java b/src/com/scoop/settings/preferences/colorpicker/SecureSettingColorPickerPreference.java similarity index 92% rename from src/com/alpha/settings/preferences/colorpicker/SecureSettingColorPickerPreference.java rename to src/com/scoop/settings/preferences/colorpicker/SecureSettingColorPickerPreference.java index ff0a67b..a53ee22 100644 --- a/src/com/alpha/settings/preferences/colorpicker/SecureSettingColorPickerPreference.java +++ b/src/com/scoop/settings/preferences/colorpicker/SecureSettingColorPickerPreference.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alpha.settings.preferences.colorpicker; +package com.scoop.settings.preferences.colorpicker; import android.content.Context; import android.text.TextUtils; import android.util.AttributeSet; import android.provider.Settings; -import com.alpha.settings.preferences.SecureSettingsStore; +import com.scoop.settings.preferences.SecureSettingsStore; public class SecureSettingColorPickerPreference extends ColorPickerPreference { diff --git a/src/com/alpha/settings/preferences/colorpicker/SystemSettingColorPickerPreference.java b/src/com/scoop/settings/preferences/colorpicker/SystemSettingColorPickerPreference.java similarity index 92% rename from src/com/alpha/settings/preferences/colorpicker/SystemSettingColorPickerPreference.java rename to src/com/scoop/settings/preferences/colorpicker/SystemSettingColorPickerPreference.java index 754f2de..445c09f 100644 --- a/src/com/alpha/settings/preferences/colorpicker/SystemSettingColorPickerPreference.java +++ b/src/com/scoop/settings/preferences/colorpicker/SystemSettingColorPickerPreference.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alpha.settings.preferences.colorpicker; +package com.scoop.settings.preferences.colorpicker; import android.content.Context; import android.text.TextUtils; import android.util.AttributeSet; import android.provider.Settings; -import com.alpha.settings.preferences.SystemSettingsStore; +import com.scoop.settings.preferences.SystemSettingsStore; public class SystemSettingColorPickerPreference extends ColorPickerPreference {