Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 77ef7901 authored by Michael W's avatar Michael W Committed by Gabriele M
Browse files

SetupWizard: Remove Themes related code 

* CMTE is not coming back in 14.1 anyway
* Instead of fixing stuff around it, just remove remainders of it

Change-Id: Ib0e3261d970779aa6dd30db5c8869a0f5198d2d3
parent f79f8cfc

AndroidManifest.xml

+0 −1
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ 
    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" />

    <uses-permission android:name="android.permission.MANAGE_USERS" />

    <uses-permission android:name="android.permission.CHANGE_COMPONENT_ENABLED_STATE" />

    <uses-permission android:name="cyanogenmod.permission.ACCESS_THEME_MANAGER"/>

    <uses-permission android:name="android.permission.EXPAND_STATUS_BAR" />

    <uses-permission android:name="cyanogenmod.permission.HARDWARE_ABSTRACTION_ACCESS" />

    <uses-permission android:name="android.permission.BACKUP" />

res/layout/finish_activity.xml

+0 −8
Original line number Diff line number Diff line
@@ -56,12 +56,4 @@ 
               android:background="@drawable/reveal"

               android:visibility="invisible"/>



    <ProgressBar

        android:id="@+id/finishing_bar"

        style="?android:attr/progressBarStyleHorizontal"

        android:layout_width="match_parent"

        android:layout_height="8dp"

        android:layout_gravity="bottom"

        android:visibility="gone"/>



</com.cyanogenmod.setupwizard.widget.ScrimInsetsFrameLayout>
 
 No newline at end of file

res/layout/setup_lineage_settings.xml

+0 −36
Original line number Diff line number Diff line
@@ -87,42 +87,6 @@ 


                </LinearLayout>



                <!-- Whether or not to enable default theme -->

                <LinearLayout

                    android:id="@+id/theme"

                    android:orientation="horizontal"

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    android:paddingLeft="@dimen/location_margin_left"

                    android:paddingRight="@dimen/content_margin_right"

                    android:background="?android:attr/selectableItemBackground"

                    android:clickable="true">





                    <CheckBox

                        android:id="@+id/enable_theme_checkbox"

                        android:layout_width="wrap_content"

                        android:layout_height="wrap_content"

                        android:layout_gravity="top"

                        android:layout_marginTop="5dp"

                        android:duplicateParentState="true"

                        android:clickable="false"/>



                    <TextView

                        android:id="@+id/enable_theme_summary"

                        android:layout_width="0px"

                        android:layout_height="wrap_content"

                        android:layout_weight="1"

                        android:textSize="15sp"

                        android:lineSpacingExtra="@dimen/setup_line_spacing"

                        android:gravity="top"

                        android:layout_marginLeft="@dimen/location_text_margin_left"

                        android:layout_marginRight="@dimen/location_text_margin_right"

                        android:paddingBottom="@dimen/content_margin_bottom"

                        android:text="@string/services_metrics_label"/>



                </LinearLayout>



                <!-- Checkbox for using on-screen nav keys -->

                <LinearLayout

                    android:id="@+id/nav_keys"

res/values/strings.xml

+0 −2
Original line number Diff line number Diff line
@@ -83,8 +83,6 @@ 
    <string name="services_privacy_policy">Privacy Policy</string>

    <string name="services_help_improve_cm">Help improve <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>

    <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> by automatically sending diagnostic and usage data to LineageOS. This information can’t be used to identify you and lends a hand to teams working on things like battery life, app performance, and new <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> features.</string>

    <string name="services_apply_theme">Apply the <xliff:g id="name" example="Material">%s</xliff:g> theme</string>

    <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> enabling a unique visual style for your icons, wallpaper and more.</string>

    <string name="services_os_nav_keys_label"><b>Use on screen navigation keys</b> instead of hardware keys.</string>

    <string name="services_os_privacy_guard"><b>Enable Privacy guard</b> to make your personal data such as contacts, messages or call logs not available for newly installed apps</string>

src/com/cyanogenmod/setupwizard/FinishActivity.java

+2 −59
Original line number Diff line number Diff line
@@ -31,13 +31,11 @@ import android.content.Context; 
import android.content.Intent;

import android.content.SharedPreferences;

import android.content.pm.ActivityInfo;

import android.content.res.ThemeConfig;

import android.graphics.Bitmap;

import android.graphics.Point;

import android.os.Bundle;

import android.os.Handler;

import android.preference.PreferenceManager;

import android.util.Log;

import android.view.View;

import android.view.ViewAnimationUtils;

import android.view.animation.Animation;
@@ -48,19 +46,15 @@ import android.widget.ProgressBar; 
import com.android.setupwizardlib.util.WizardManagerHelper;



import com.cyanogenmod.setupwizard.util.EnableAccessibilityController;

import com.cyanogenmod.setupwizard.util.SetupWizardUtils;



import cyanogenmod.hardware.CMHardwareManager;

import cyanogenmod.providers.CMSettings;

import cyanogenmod.themes.ThemeManager;



public class FinishActivity extends BaseSetupWizardActivity

        implements ThemeManager.ThemeChangeListener {

public class FinishActivity extends BaseSetupWizardActivity {



    public static final String TAG = FinishActivity.class.getSimpleName();



    private ImageView mReveal;

    private ProgressBar mFinishingProgressBar;



    private EnableAccessibilityController mEnableAccessibilityController;
@@ -79,7 +73,6 @@ public class FinishActivity extends BaseSetupWizardActivity 
        }

        mSetupWizardApp = (SetupWizardApp) getApplication();

        mReveal = (ImageView) findViewById(R.id.reveal);

        mFinishingProgressBar = (ProgressBar)findViewById(R.id.finishing_bar);

        mEnableAccessibilityController =

                EnableAccessibilityController.getInstance(getApplicationContext());

        setNextText(R.string.start);
@@ -118,45 +111,10 @@ public class FinishActivity extends BaseSetupWizardActivity 
        setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LOCKED);

        hideBackButton();

        hideNextButton();

        Animation fadeIn = AnimationUtils.loadAnimation(this, android.R.anim.fade_in);

        mFinishingProgressBar.setVisibility(View.VISIBLE);

        mFinishingProgressBar.setIndeterminate(true);

        mFinishingProgressBar.startAnimation(fadeIn);

        final ThemeManager tm = ThemeManager.getInstance(this);

        try {

            tm.registerThemeChangeListener(this);

        } catch (Exception e) {

            Log.w(TAG, "ThemeChangeListener already registered");

        }

        handleDefaultThemeSetup(this);

    }



    @Override

    public void onFinish(boolean isSuccess) {

        if (isResumed()) {

            mHandler.post(new Runnable() {

                @Override

                public void run() {

                    startFinishSequence();

                }

            });

        }

    }



    @Override

    public void onProgress(int progress) {

        if (progress > 0) {

            mFinishingProgressBar.setIndeterminate(false);

            mFinishingProgressBar.setProgress(progress);

        }

        finishSetup();

    }



    private void setupRevealImage() {

        mFinishingProgressBar.setProgress(100);

        Animation fadeOut = AnimationUtils.loadAnimation(this, android.R.anim.fade_out);

        mFinishingProgressBar.startAnimation(fadeOut);

        mFinishingProgressBar.setVisibility(View.INVISIBLE);



        final Point p = new Point();

        getWindowManager().getDefaultDisplay().getRealSize(p);

        final WallpaperManager wallpaperManager =
@@ -218,8 +176,6 @@ public class FinishActivity extends BaseSetupWizardActivity 
        handlePrivacyGuard(mSetupWizardApp);

        handleEnableMetrics(mSetupWizardApp);

        handleNavKeys(mSetupWizardApp);

        final ThemeManager tm = ThemeManager.getInstance(mSetupWizardApp);

        tm.unregisterThemeChangeListener(this);

        final WallpaperManager wallpaperManager =

                WallpaperManager.getInstance(mSetupWizardApp);

        wallpaperManager.forgetLoadedWallpaper();
@@ -239,19 +195,6 @@ public class FinishActivity extends BaseSetupWizardActivity 
        }

    }



    private static void handleDefaultThemeSetup(FinishActivity finishActivity) {

        Bundle privacyData = finishActivity.mSetupWizardApp.getSettingsBundle();

        if (!SetupWizardUtils.getDefaultThemePackageName(finishActivity.mSetupWizardApp)

                .equals(ThemeConfig.SYSTEM_DEFAULT) && privacyData != null &&

                privacyData.getBoolean(KEY_APPLY_DEFAULT_THEME)) {

            Log.i(TAG, "Applying default theme");

            final ThemeManager tm = ThemeManager.getInstance(finishActivity.mSetupWizardApp);

            tm.applyDefaultTheme();

        } else {

            finishActivity.finishSetup();

        }

    }



    private static void handlePrivacyGuard(SetupWizardApp setupWizardApp) {

        Bundle mPrivacyData = setupWizardApp.getSettingsBundle();

        if (mPrivacyData != null && mPrivacyData.containsKey(KEY_PRIVACY_GUARD)) {