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

Commit d4d397f3 authored by Sergey Ten's avatar Sergey Ten
Browse files

Status bar theming. 

Per PD requirements, only status bar expanded view
is made theme-aware.

CR: JoshG.
parent 18067588

api/current.xml

+33 −11
Original line number Diff line number Diff line
@@ -4035,6 +4035,17 @@ 
 visibility="public"

>

</field>

<field name="iconMenuTheme"

 type="int"

 transient="false"

 volatile="false"

 value="16843435"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="iconPreview"

 type="int"

 transient="false"
@@ -5542,17 +5553,6 @@ 
 visibility="public"

>

</field>

<field name="iconMenuTheme"

 type="int"

 transient="false"

 volatile="false"

 value="16843435"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="mimeType"

 type="int"

 transient="false"
@@ -7467,6 +7467,28 @@ 
 visibility="public"

>

</field>

<field name="statusBarExpandedBackgroundColor"

 type="int"

 transient="false"

 volatile="false"

 value="16843436"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="statusBarLatestItemBackground"

 type="int"

 transient="false"

 volatile="false"

 value="16843437"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="stepSize"

 type="int"

 transient="false"

core/java/android/widget/RemoteViews.java

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



import android.app.PendingIntent;

import android.app.ActivityManagerNative;

import android.app.PendingIntent.CanceledException;

import android.content.Context;

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.drawable.BitmapDrawable;
@@ -28,12 +30,10 @@ 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.LayoutInflater;

import android.view.RemotableViewMethod;

import android.view.View;

import android.view.ViewGroup;

import android.view.*;

import android.view.LayoutInflater.Filter;

import android.view.View.OnClickListener;

import android.view.animation.Animation;
@@ -864,9 +864,16 @@ public class RemoteViews implements Parcelable, Filter { 
        if (packageName != null) {

            try {

                c = context.createPackageContext(packageName, 0);

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

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

                ContextThemeWrapper themeContext = new ContextThemeWrapper(c, styleId);

                themeContext.useThemedResources(theme.getThemePackageName());

                c = themeContext;

            } catch (NameNotFoundException e) {

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

                c = context;

            } catch (RemoteException e) {

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

            }

        } else {

            c = context;

core/res/res/layout/status_bar_expanded.xml

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


<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">
@@ -67,12 +66,10 @@ 
            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/buttonStyle"

            style="?android:attr/buttonStyleSmall"

            android:paddingLeft="15dp"

            android:paddingRight="15dp"

            android:background="@drawable/btn_default_small"

            />

    </LinearLayout>
@@ -86,6 +83,7 @@ 
            android:layout_height="wrap_content"

            android:layout_weight="1"

            android:fadingEdge="none"

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

            >

            <com.android.server.status.NotificationLinearLayout

                android:id="@+id/notificationLinearLayout"

core/res/res/layout/status_bar_latest_event.xml

+3 −3
Original line number Diff line number Diff line
@@ -7,7 +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:background="?android:attr/statusBarLatestItemBackground"

            android:focusable="true"

            android:clickable="true"

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


    <View

        android:layout_width="fill_parent"

        android:layout_height="1sp"

        android:background="@drawable/divider_horizontal_bright"

        android:layout_height="wrap_content"

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

        />



</LinearLayout>

core/res/res/layout/status_bar_latest_event_content.xml

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

            android:fadingEdge="horizontal"

            android:textStyle="bold"

            android:textSize="18sp"

            android:paddingLeft="4dp"

            android:textColor="#ff000000" />

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

    </LinearLayout>

    <LinearLayout

        android:layout_width="fill_parent"
@@ -38,11 +37,10 @@ 
            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:textSize="14sp"

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

            android:paddingLeft="4dp"

            />

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

            android:layout_height="wrap_content"

            android:singleLine="true"

            android:textSize="14sp"

            android:paddingRight="5dp"

            android:textColor="#ff000000" />

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

    </LinearLayout>

</LinearLayout>