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

Commit 23fdfeb4 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Launch help with system default theme" into rvc-dev am: 3929ef34 

Change-Id: I5312a99bc22ec1c58e8c7cb12d2ff219f8a43c83
parents a328d028 3929ef34

packages/SettingsLib/HelpUtils/src/com/android/settingslib/HelpUtils.java

+1 −6
Original line number Original line Diff line number Diff line
@@ -24,7 +24,6 @@ import android.content.Intent; 
import android.content.pm.PackageInfo;

import android.content.pm.PackageInfo;

import android.content.pm.PackageManager.NameNotFoundException;

import android.content.pm.PackageManager.NameNotFoundException;

import android.content.res.Resources;

import android.content.res.Resources;

import android.content.res.TypedArray;

import android.net.Uri;

import android.net.Uri;

import android.provider.Settings.Global;

import android.provider.Settings.Global;

import android.text.TextUtils;

import android.text.TextUtils;
@@ -63,7 +62,6 @@ public class HelpUtils { 
    // Constants for help intents.

    // Constants for help intents.

    private static final String EXTRA_CONTEXT = "EXTRA_CONTEXT";

    private static final String EXTRA_CONTEXT = "EXTRA_CONTEXT";

    private static final String EXTRA_THEME = "EXTRA_THEME";

    private static final String EXTRA_THEME = "EXTRA_THEME";

    private static final String EXTRA_PRIMARY_COLOR = "EXTRA_PRIMARY_COLOR";

    private static final String EXTRA_BACKUP_URI = "EXTRA_BACKUP_URI";

    private static final String EXTRA_BACKUP_URI = "EXTRA_BACKUP_URI";





    /**

    /**
@@ -216,10 +214,7 @@ public class HelpUtils { 
            intent.putExtra(feedbackIntentExtraKey, packageNameKey);

            intent.putExtra(feedbackIntentExtraKey, packageNameKey);

            intent.putExtra(feedbackIntentNameKey, packageNameValue);

            intent.putExtra(feedbackIntentNameKey, packageNameValue);

        }

        }

        intent.putExtra(EXTRA_THEME, 0 /* Light theme */);

        intent.putExtra(EXTRA_THEME, 3 /* System Default theme */);

        TypedArray array = context.obtainStyledAttributes(new int[]{android.R.attr.colorPrimary});

        intent.putExtra(EXTRA_PRIMARY_COLOR, array.getColor(0, 0));

        array.recycle();

    }

    }





    /**

    /**