diff --git a/res/drawable/ic_sysbar_back.xml b/res/drawable/ic_sysbar_back.xml index b03ead0..7d2bdee 100644 --- a/res/drawable/ic_sysbar_back.xml +++ b/res/drawable/ic_sysbar_back.xml @@ -1,27 +1,28 @@ - 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. ---> + android:viewportWidth="20" + android:viewportHeight="20"> - + android:fillColor="@android:color/white" + android:pathData="M15.5417 1.66669C15.1833 1.66669 14.8417 1.76669 14.5333 1.94169L3.21667 8.74169C2.775 9.00002 2.5 9.48335 2.5 10C2.5 10.5167 2.775 11 3.21667 11.2584L14.5333 18.05C14.8417 18.2334 15.1833 18.325 15.5417 18.325C16.625 18.325 17.5 17.45 17.5 16.3667V3.62502C17.5 2.54169 16.625 1.66669 15.5417 1.66669Z" /> + \ No newline at end of file diff --git a/res/drawable/ic_sysbar_home.xml b/res/drawable/ic_sysbar_home.xml index f093ea2..987f2f6 100644 --- a/res/drawable/ic_sysbar_home.xml +++ b/res/drawable/ic_sysbar_home.xml @@ -1,29 +1,27 @@ - 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. ---> + android:width="20dp" + android:height="20dp" + android:viewportWidth="20" + android:viewportHeight="20"> - - + android:fillColor="@android:color/white" + android:pathData="M10.0001 18.3334C5.40008 18.3334 1.66675 14.6 1.66675 10C1.66675 5.40002 5.40008 1.66669 10.0001 1.66669C14.6001 1.66669 18.3334 5.40002 18.3334 10C18.3334 14.6 14.6001 18.3334 10.0001 18.3334Z" /> + \ No newline at end of file diff --git a/res/drawable/ic_sysbar_recent.xml b/res/drawable/ic_sysbar_recent.xml index eda8f66..26c4dc8 100644 --- a/res/drawable/ic_sysbar_recent.xml +++ b/res/drawable/ic_sysbar_recent.xml @@ -1,26 +1,27 @@ - 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. ---> + android:width="20dp" + android:height="20dp" + android:viewportWidth="20" + android:viewportHeight="20"> - + android:fillColor="@android:color/white" + android:pathData="M4.47634 2.5H15.5241C16.6164 2.5 17.5002 3.38382 17.5002 4.4761V15.5239C17.5002 16.6162 16.6164 17.5 15.5241 17.5H4.47634C3.38407 17.5 2.50024 16.6162 2.50024 15.5239V4.4761C2.50024 3.38382 3.38407 2.5 4.47634 2.5Z" /> + \ No newline at end of file diff --git a/res/values/evolution_arrays.xml b/res/values/evolution_arrays.xml index c4b02cd..8dfe41a 100644 --- a/res/values/evolution_arrays.xml +++ b/res/values/evolution_arrays.xml @@ -655,21 +655,6 @@ 1 - - - @string/navbar_layout_normal - @string/navbar_layout_compact - @string/navbar_layout_leftleaning - @string/navbar_layout_rightleaning - - - - default - left;back,home,recent;right - left,back,home,recent,right;space;space - space;space;left,back,home,recent,right - - @string/pulse_render_mode_fading_bars diff --git a/res/values/evolution_strings.xml b/res/values/evolution_strings.xml index ae461fa..ba12f51 100644 --- a/res/values/evolution_strings.xml +++ b/res/values/evolution_strings.xml @@ -552,16 +552,6 @@ Unlock higher FPS in games Spoof your device as different model for specific games to unlock higher FPS - - Button navbar - Layout - Normal - Compact - Left-leaning - Right-leaning - Invert layout - Inverts the layout of the navigation bar and other items, such as the IME switcher - Evolution X aims to provide users with a Pixel-like feel at first glance, with additional features at your disposal Website diff --git a/res/xml/evolution_settings.xml b/res/xml/evolution_settings.xml index 4f8d9e3..5b0f284 100644 --- a/res/xml/evolution_settings.xml +++ b/res/xml/evolution_settings.xml @@ -57,14 +57,6 @@ android:icon="@drawable/ic_power_menu" android:fragment="org.evolution.settings.fragments.powermenu.PowerMenu" /> - - - - - - - - - - - - - - - diff --git a/res/xml/pulse_settings.xml b/res/xml/pulse_settings.xml index 15c3b67..7879b98 100644 --- a/res/xml/pulse_settings.xml +++ b/res/xml/pulse_settings.xml @@ -1,6 +1,7 @@ getNonIndexableKeys(Context context) { - List keys = super.getNonIndexableKeys(context); - final Resources resources = context.getResources(); - return keys; - } - }; -} diff --git a/src/org/evolution/settings/fragments/lockscreen/PulseSettings.java b/src/org/evolution/settings/fragments/lockscreen/PulseSettings.java index 71a3467..c58cd2a 100644 --- a/src/org/evolution/settings/fragments/lockscreen/PulseSettings.java +++ b/src/org/evolution/settings/fragments/lockscreen/PulseSettings.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016-2021 crDroid Android Project + * Copyright (C) 2016-2025 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. @@ -42,7 +42,6 @@ public class PulseSettings extends SettingsPreferenceFragment implements private static final String TAG = PulseSettings.class.getSimpleName(); - private static final String NAVBAR_PULSE_ENABLED_KEY = "navbar_pulse_enabled"; private static final String LOCKSCREEN_PULSE_ENABLED_KEY = "lockscreen_pulse_enabled"; private static final String AMBIENT_PULSE_ENABLED_KEY = "ambient_pulse_enabled"; private static final String PULSE_SMOOTHING_KEY = "pulse_smoothing_enabled"; @@ -61,7 +60,6 @@ public class PulseSettings extends SettingsPreferenceFragment implements private static final String PULSE_SETTINGS_FOOTER = "pulse_settings_footer"; - private SwitchPreferenceCompat mNavbarPulse; private SwitchPreferenceCompat mLockscreenPulse; private SwitchPreferenceCompat mAmbientPulse; private SwitchPreferenceCompat mPulseSmoothing; @@ -82,12 +80,6 @@ public class PulseSettings extends SettingsPreferenceFragment implements ContentResolver resolver = getContext().getContentResolver(); - mNavbarPulse = (SwitchPreferenceCompat) findPreference(NAVBAR_PULSE_ENABLED_KEY); - boolean navbarPulse = Settings.Secure.getIntForUser(resolver, - Settings.Secure.NAVBAR_PULSE_ENABLED, 0, UserHandle.USER_CURRENT) != 0; - mNavbarPulse.setChecked(navbarPulse); - mNavbarPulse.setOnPreferenceChangeListener(this); - mLockscreenPulse = (SwitchPreferenceCompat) findPreference(LOCKSCREEN_PULSE_ENABLED_KEY); boolean lockscreenPulse = Settings.Secure.getIntForUser(resolver, Settings.Secure.LOCKSCREEN_PULSE_ENABLED, 1, UserHandle.USER_CURRENT) != 0; @@ -124,13 +116,7 @@ public class PulseSettings extends SettingsPreferenceFragment implements @Override public boolean onPreferenceChange(Preference preference, Object newValue) { ContentResolver resolver = getContext().getContentResolver(); - if (preference == mNavbarPulse) { - boolean val = (Boolean) newValue; - Settings.Secure.putIntForUser(resolver, - Settings.Secure.NAVBAR_PULSE_ENABLED, val ? 1 : 0, UserHandle.USER_CURRENT); - updateAllPrefs(); - return true; - } else if (preference == mLockscreenPulse) { + if (preference == mLockscreenPulse) { boolean val = (Boolean) newValue; Settings.Secure.putIntForUser(resolver, Settings.Secure.LOCKSCREEN_PULSE_ENABLED, val ? 1 : 0, UserHandle.USER_CURRENT); @@ -155,18 +141,16 @@ public class PulseSettings extends SettingsPreferenceFragment implements private void updateAllPrefs() { ContentResolver resolver = getContext().getContentResolver(); - boolean navbarPulse = Settings.Secure.getIntForUser(resolver, - Settings.Secure.NAVBAR_PULSE_ENABLED, 0, UserHandle.USER_CURRENT) != 0; boolean lockscreenPulse = Settings.Secure.getIntForUser(resolver, Settings.Secure.LOCKSCREEN_PULSE_ENABLED, 1, UserHandle.USER_CURRENT) != 0; boolean ambientPulse = Settings.Secure.getIntForUser(resolver, Settings.Secure.AMBIENT_PULSE_ENABLED, 0, UserHandle.USER_CURRENT) != 0; - mPulseSmoothing.setEnabled(navbarPulse || lockscreenPulse || ambientPulse); + mPulseSmoothing.setEnabled(lockscreenPulse || ambientPulse); - mColorModePref.setEnabled(navbarPulse || lockscreenPulse || ambientPulse); - if (navbarPulse || lockscreenPulse) { + mColorModePref.setEnabled(lockscreenPulse || ambientPulse); + if (lockscreenPulse || ambientPulse) { int colorMode = Settings.Secure.getIntForUser(resolver, Settings.Secure.PULSE_COLOR_MODE, COLOR_TYPE_LAVALAMP, UserHandle.USER_CURRENT); updateColorPrefs(colorMode); @@ -175,8 +159,8 @@ public class PulseSettings extends SettingsPreferenceFragment implements mLavaSpeedPref.setEnabled(false); } - mRenderMode.setEnabled(navbarPulse || lockscreenPulse || ambientPulse); - if (navbarPulse || lockscreenPulse || ambientPulse) { + mRenderMode.setEnabled(lockscreenPulse || ambientPulse); + if (lockscreenPulse || ambientPulse) { int renderMode = Settings.Secure.getIntForUser(resolver, Settings.Secure.PULSE_RENDER_STYLE, RENDER_STYLE_SOLID_LINES, UserHandle.USER_CURRENT); updateRenderCategories(renderMode); @@ -185,7 +169,7 @@ public class PulseSettings extends SettingsPreferenceFragment implements mSolidBarsCat.setEnabled(false); } - mFooterPref.setEnabled(navbarPulse || lockscreenPulse); + mFooterPref.setEnabled(lockscreenPulse || ambientPulse); } private void updateColorPrefs(int val) { diff --git a/src/org/evolution/settings/fragments/themes/NavigationBarIcons.java b/src/org/evolution/settings/fragments/themes/NavigationBarIcons.java index c4c46dc..ac3f543 100644 --- a/src/org/evolution/settings/fragments/themes/NavigationBarIcons.java +++ b/src/org/evolution/settings/fragments/themes/NavigationBarIcons.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 crDroid Android Project + * Copyright (C) 2022-2025 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. @@ -56,6 +56,7 @@ import com.android.settings.SettingsPreferenceFragment; import com.bumptech.glide.Glide; import com.android.internal.util.evolution.ThemeUtils; +import com.android.internal.util.evolution.Utils; import java.util.ArrayList; import java.util.HashMap; @@ -73,6 +74,7 @@ public class NavigationBarIcons extends SettingsPreferenceFragment { private String mCategory = "android.theme.customization.navbar"; private List mPkgs; + private String mLauncherPackage; @Override public void onCreate(Bundle savedInstanceState) { @@ -80,7 +82,12 @@ public class NavigationBarIcons extends SettingsPreferenceFragment { getActivity().setTitle(R.string.themes_navigation_bar_icons_title); mThemeUtils = new ThemeUtils(getActivity()); - mPkgs = mThemeUtils.getOverlayPackagesForCategory(mCategory, "com.android.systemui"); + + mLauncherPackage = Utils.isPackageInstalled(getContext(), "com.google.android.apps.nexuslauncher", false) + ? "com.google.android.apps.nexuslauncher" + : "com.android.launcher3"; + + mPkgs = mThemeUtils.getOverlayPackagesForCategory(mCategory, mLauncherPackage); } @Override @@ -132,13 +139,13 @@ public class NavigationBarIcons extends SettingsPreferenceFragment { holder.image2.setBackgroundDrawable(getDrawable(holder.image2.getContext(), navPkg, "ic_sysbar_home")); holder.image3.setBackgroundDrawable(getDrawable(holder.image3.getContext(), navPkg, "ic_sysbar_recent")); - String currentPackageName = mThemeUtils.getOverlayInfos(mCategory, "com.android.systemui").stream() + String currentPackageName = mThemeUtils.getOverlayInfos(mCategory, mLauncherPackage).stream() .filter(info -> info.isEnabled()) .map(info -> info.packageName) .findFirst() - .orElse("com.android.systemui"); + .orElse(mLauncherPackage); - holder.name.setText("com.android.systemui".equals(navPkg) ? "Default" : getLabel(holder.name.getContext(), navPkg)); + holder.name.setText(mLauncherPackage.equals(navPkg) ? "Default" : getLabel(holder.name.getContext(), navPkg)); if (currentPackageName.equals(navPkg)) { mAppliedPkg = navPkg; @@ -155,8 +162,6 @@ public class NavigationBarIcons extends SettingsPreferenceFragment { updateActivatedStatus(navPkg, true); mSelectedPkg = navPkg; enableOverlays(position); - Settings.System.putStringForUser(getContext().getContentResolver(), - Settings.System.NAVBAR_STYLE, navPkg, UserHandle.USER_CURRENT); } }); } @@ -193,7 +198,7 @@ public class NavigationBarIcons extends SettingsPreferenceFragment { } public Drawable getDrawable(Context context, String pkg, String drawableName) { - if (pkg.equals("com.android.systemui")) + if (pkg.equals("com.android.launcher3") || pkg.equals("com.google.android.apps.nexuslauncher")) pkg = "com.android.settings"; try { PackageManager pm = context.getPackageManager(); @@ -219,6 +224,6 @@ public class NavigationBarIcons extends SettingsPreferenceFragment { } public void enableOverlays(int position) { - mThemeUtils.setOverlayEnabled(mCategory, mPkgs.get(position), "com.android.systemui"); + mThemeUtils.setOverlayEnabled(mCategory, mPkgs.get(position), mLauncherPackage); } } diff --git a/src/org/evolution/settings/fragments/themes/Themes.java b/src/org/evolution/settings/fragments/themes/Themes.java index 9280821..f8b89a5 100644 --- a/src/org/evolution/settings/fragments/themes/Themes.java +++ b/src/org/evolution/settings/fragments/themes/Themes.java @@ -43,7 +43,6 @@ public class Themes extends SettingsPreferenceFragment implements private static final String KEY_LOCK_SOUND = "lock_sound"; private static final String KEY_UNLOCK_SOUND = "unlock_sound"; private static final String KEY_ICONS_CATEGORY = "themes_icons_category"; - private static final String KEY_NAVBAR_ICON = "android.theme.customization.navbar"; private static final String KEY_SIGNAL_ICON = "android.theme.customization.signal_icon"; private static final String KEY_UDFPS_ICON = "udfps_icon"; private static final String KEY_ANIMATIONS_CATEGORY = "themes_animations_category"; @@ -79,7 +78,6 @@ public class Themes extends SettingsPreferenceFragment implements private GlobalSettingListPreference mUnlockSound; private PreferenceCategory mLauncherCategory; private PreferenceCategory mIconsCategory; - private Preference mNavbarIcon; private Preference mSignalIcon; private Preference mUdfpsIcon; private PreferenceCategory mAnimationsCategory; @@ -106,7 +104,6 @@ public class Themes extends SettingsPreferenceFragment implements mUnlockSound.setOnPreferenceChangeListener(this); mLauncherCategory = (PreferenceCategory) findPreference(KEY_LAUNCHER_CATEGORY); mIconsCategory = (PreferenceCategory) findPreference(KEY_ICONS_CATEGORY); - mNavbarIcon = (Preference) findPreference(KEY_NAVBAR_ICON); mSignalIcon = (Preference) findPreference(KEY_SIGNAL_ICON); mUdfpsIcon = (Preference) findPreference(KEY_UDFPS_ICON); mAnimationsCategory = (PreferenceCategory) findPreference(KEY_ANIMATIONS_CATEGORY); @@ -116,10 +113,6 @@ public class Themes extends SettingsPreferenceFragment implements mIconsCategory.removePreference(mSignalIcon); } - if (DeviceUtils.isEdgeToEdgeEnabled(context)) { - mIconsCategory.removePreference(mNavbarIcon); - } - FingerprintManager fingerprintManager = (FingerprintManager) getActivity().getSystemService(Context.FINGERPRINT_SERVICE);