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

Commit 439e8e42 authored by Josh Guilfoyle's avatar Josh Guilfoyle
Browse files

ESPRESSO-823: Removed status bar themeability.

parent d952abf6

core/java/android/widget/RemoteViews.java

+4 −18
Original line number Diff line number Diff line
@@ -17,14 +17,10 @@ 
package android.widget;



import android.app.PendingIntent;

import android.app.ActivityManagerNative;

import android.app.PendingIntent.CanceledException;

import android.content.Context;

import android.content.Intent;

import android.content.IntentSender;

import android.content.pm.PackageManager.NameNotFoundException;

import android.content.res.Resources;

import android.content.res.CustomTheme;

import android.graphics.Bitmap;

import android.graphics.PorterDuff;

import android.graphics.Rect;
@@ -32,10 +28,12 @@ import android.graphics.drawable.Drawable; 
import android.net.Uri;

import android.os.Parcel;

import android.os.Parcelable;

import android.os.RemoteException;

import android.text.TextUtils;

import android.util.Log;

import android.view.*;

import android.view.LayoutInflater;

import android.view.RemotableViewMethod;

import android.view.View;

import android.view.ViewGroup;

import android.view.LayoutInflater.Filter;

import android.view.View.OnClickListener;
@@ -936,18 +934,6 @@ public class RemoteViews implements Parcelable, Filter { 
        if (packageName != null) {

            try {

                c = context.createPackageContext(packageName, Context.CONTEXT_RESTRICTED);

                try {

                    CustomTheme theme = ActivityManagerNative.getDefault().getConfiguration().customTheme;

                    if (theme != null && !TextUtils.isEmpty(theme.getThemePackageName())) {

                        int styleId = CustomTheme.getStyleId(c, theme.getThemePackageName(),

                                theme.getThemeId());

                        ContextThemeWrapper themeContext = new ContextThemeWrapper(c, styleId);

                        themeContext.useThemedResources(theme.getThemePackageName());

                        c = themeContext;

                    }

                } catch (RemoteException e) {

                    Log.e(LOG_TAG, "Failed to get current theme", e);

                }

            } catch (NameNotFoundException e) {

                Log.e(LOG_TAG, "Package name " + packageName + " not found");

                c = context;

core/res/res/layout/status_bar_expanded.xml

+4 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 


<com.android.server.status.ExpandedView xmlns:android="http://schemas.android.com/apk/res/android"

    android:orientation="vertical"

    android:background="@drawable/status_bar_background"

    android:focusable="true"

    android:descendantFocusability="afterDescendants">
@@ -66,10 +67,12 @@ 
            android:layout_marginTop="4dp"

            android:layout_marginBottom="1dp"

            android:textSize="14sp"

            android:textColor="#ff000000"

            android:text="@string/status_bar_clear_all_button"

            style="?android:attr/buttonStyleSmall"

            style="?android:attr/buttonStyle"

            android:paddingLeft="15dp"

            android:paddingRight="15dp"

            android:background="@drawable/btn_default_small"

            />

    </LinearLayout>

core/res/res/layout/status_bar_latest_event.xml

+3 −2
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
    <com.android.server.status.LatestItemView android:id="@+id/content"

            android:layout_width="fill_parent"

            android:layout_height="64sp"

            android:background="@drawable/status_bar_item_background"

            android:focusable="true"

            android:clickable="true"

            android:paddingRight="6sp"
@@ -15,8 +16,8 @@ 


    <View

        android:layout_width="fill_parent"

        android:layout_height="wrap_content"

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

        android:layout_height="1sp"

        android:background="@drawable/divider_horizontal_bright"

        />



</LinearLayout>

core/res/res/layout/status_bar_latest_event_content.xml

+6 −3
Original line number Diff line number Diff line
@@ -25,8 +25,9 @@ 
            android:ellipsize="marquee"

            android:fadingEdge="horizontal"

            android:textStyle="bold"

            android:textSize="18sp"

            android:paddingLeft="4dp"

            android:textAppearance="@style/TextAppearance.Medium" />

            android:textColor="#ff000000" />

    </LinearLayout>

    <LinearLayout

        android:layout_width="fill_parent"
@@ -37,10 +38,11 @@ 
            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_weight="1"

            android:textColor="#ff000000"

            android:singleLine="true"

            android:ellipsize="marquee"

            android:fadingEdge="horizontal"

            android:textAppearance="@style/TextAppearance.Small"

            android:textSize="14sp"

            android:paddingLeft="4dp"

            />

        <TextView android:id="@+id/time"
@@ -48,7 +50,8 @@ 
            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:singleLine="true"

            android:textSize="14sp"

            android:paddingRight="5dp"

            android:textAppearance="@style/TextAppearance.Small" />

            android:textColor="#ff000000" />

    </LinearLayout>

</LinearLayout>

core/res/res/values/attrs.xml

+0 −7
Original line number Diff line number Diff line
@@ -458,13 +458,6 @@ 
        <!-- DigitalClock attributes -->

        <!-- =================== -->

        <attr name="menuItemBackground" format="reference" />



        <!-- =================== -->

        <!-- status bar related attributes -->

        <!-- =================== -->

        <attr name="com_android_server_status_expandedView" format="reference" />

        <attr name="com_android_server_status_latestItemView" format="reference" />



    </declare-styleable>



    <!-- **************************************************************** -->