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

Commit 106ad531 authored by Chinmay Dhodapkar's avatar Chinmay Dhodapkar
Browse files

Fix telecom UI elements 

-fix main issue where we were forcing device default alert theme
in dark mode and at the same time, we were overriding colors
and styles for dark mode (in values-night)

-fix secondary issue where our theme colors were not matching with
dialer/messages highlight colors. This was again due to us overriding
themer colors manualy. This doesnt work anymore since the accent
theme colors change based on wallpaper. Removed all hardcoding
of color

-fix some styles which did not have forceDarkAllowed set

-fix sytles which were 'orphaned' and made them inherit from
activity theme defaults

Bug: 218877038
Tests: Manual UI test in normal and dark mode and changing wallpapers
Change-Id: I064e3daeb107c53ccf34de1270a2f42c7ea0deac
parent 9696d14a

res/values-night/styles.xml

deleted100644 → 0
+0 −41
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2019 The Android Open Source Project



     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.

-->



<resources>



    <style name="Theme.Telecom.DialerSettings" parent="@android:style/Theme.Material.Light">

        <item name="android:forceDarkAllowed">true</item>

        <item name="android:tint">@color/blocked_numbers_secondary_text_color</item>

        <item name="android:actionBarStyle">@style/TelecomDialerSettingsActionBarStyle</item>

        <item name="android:navigationBarColor">@color/background_color</item>

        <item name="android:windowBackground">@color/background_color</item>

        <item name="android:colorPrimaryDark">@color/background_color</item>

        <item name="android:actionOverflowButtonStyle">@style/TelecomDialerSettingsActionOverflowButtonStyle</item>

        <item name="android:windowContentOverlay">@null</item>

    </style>



    <style name="Theme.Telecom.BlockedNumbers" parent="@android:style/Theme.Material.Light">

        <item name="android:forceDarkAllowed">true</item>

        <item name="android:actionBarStyle">@style/TelecomDialerSettingsActionBarStyle</item>

        <item name="android:navigationBarColor">@color/background_color</item>

        <item name="android:windowBackground">@color/background_color</item>

        <item name="android:colorPrimaryDark">@color/background_color</item>

        <item name="android:windowContentOverlay">@null</item>

        <item name="android:colorAccent">@color/theme_color</item>

        <item name="android:listDivider">@null</item>

    </style>



</resources>

res/values/styles.xml

+5 −16
Original line number Original line Diff line number Diff line
@@ -28,33 +28,24 @@ 




   <style name="Theme.Telecom.DialerSettings" parent="@android:style/Theme.DeviceDefault.Light">

   <style name="Theme.Telecom.DialerSettings" parent="@android:style/Theme.DeviceDefault.Light">

        <item name="android:forceDarkAllowed">true</item>

        <item name="android:forceDarkAllowed">true</item>

        <item name="android:tint">@color/blocked_numbers_secondary_text_color</item>

        <item name="android:actionBarStyle">@style/TelecomDialerSettingsActionBarStyle</item>

        <item name="android:actionBarStyle">@style/TelecomDialerSettingsActionBarStyle</item>

        <item name="android:actionOverflowButtonStyle">@style/TelecomDialerSettingsActionOverflowButtonStyle</item>

        <item name="android:actionOverflowButtonStyle">@style/TelecomDialerSettingsActionOverflowButtonStyle</item>

        <item name="android:colorPrimaryDark">@color/background_color</item>

        <item name="android:windowLightStatusBar">true</item>

        <item name="android:windowLightStatusBar">true</item>

        <item name="android:navigationBarColor">@color/background_color</item>

        <item name="android:navigationBarDividerColor">@color/blocked_numbers_divider_color</item>

        <item name="android:windowLightNavigationBar">true</item>

        <item name="android:windowLightNavigationBar">true</item>

        <item name="android:windowContentOverlay">@null</item>

        <item name="android:windowContentOverlay">@null</item>

    </style>

    </style>





    <style name="Theme.Telecom.BlockedNumbers" parent="@android:style/Theme.DeviceDefault.Light">

    <style name="Theme.Telecom.BlockedNumbers" parent="@android:style/Theme.DeviceDefault.Light">

        <item name="android:forceDarkAllowed">true</item>

        <item name="android:forceDarkAllowed">true</item>

        <item name="android:tint">@color/blocked_numbers_secondary_text_color</item>

        <item name="android:actionBarStyle">@style/TelecomDialerSettingsActionBarStyle</item>

        <item name="android:actionBarStyle">@style/TelecomDialerSettingsActionBarStyle</item>

        <item name="android:colorPrimaryDark">@color/background_color</item>

        <item name="android:windowLightStatusBar">true</item>

        <item name="android:windowLightStatusBar">true</item>

        <item name="android:navigationBarColor">@color/background_color</item>

        <item name="android:navigationBarDividerColor">@color/blocked_numbers_divider_color</item>

        <item name="android:windowLightNavigationBar">true</item>

        <item name="android:windowLightNavigationBar">true</item>

        <item name="android:windowContentOverlay">@null</item>

        <item name="android:windowContentOverlay">@null</item>

        <item name="android:colorAccent">@color/theme_color</item>

        <item name="android:listDivider">@null</item>

        <item name="android:listDivider">@null</item>

    </style>

    </style>





    <style name="TelecomDialerSettingsActionBarStyle" parent="android:Widget.DeviceDefault.ActionBar">

    <style name="TelecomDialerSettingsActionBarStyle" parent="android:Widget.DeviceDefault.ActionBar">

        <item name="android:background">@color/background_color</item>

        <item name="android:forceDarkAllowed">true</item>

        <item name="android:titleTextStyle">@style/BlockedNumbersTextHead1</item>

        <item name="android:titleTextStyle">@style/BlockedNumbersTextHead1</item>

        <item name="android:elevation">@dimen/dialer_settings_actionbar_elevation</item>

        <item name="android:elevation">@dimen/dialer_settings_actionbar_elevation</item>

        <!-- Empty icon -->

        <!-- Empty icon -->
@@ -63,30 +54,28 @@ 




    <style name="TelecomDialerSettingsActionOverflowButtonStyle"

    <style name="TelecomDialerSettingsActionOverflowButtonStyle"

            parent="@android:style/Widget.DeviceDefault.Light.ActionButton.Overflow">

            parent="@android:style/Widget.DeviceDefault.Light.ActionButton.Overflow">

        <item name="android:forceDarkAllowed">true</item>

        <item name="android:src">@drawable/ic_more_vert_24dp</item>

        <item name="android:src">@drawable/ic_more_vert_24dp</item>

    </style>

    </style>





    <style name="BlockedNumbersButton" parent="BlockedNumbersTextPrimary2">

    <style name="BlockedNumbersButton" parent="BlockedNumbersTextPrimary2">

        <item name="android:textColor">@color/theme_color</item>

    </style>

    </style>





    <style name="BlockedNumbersTextHead1"

    <style name="BlockedNumbersTextHead1"

           parent="@android:style/TextAppearance.DeviceDefault.Widget.ActionBar.Title">

           parent="@android:style/TextAppearance.DeviceDefault.Widget.ActionBar.Title">

        <item name="android:textColor">@color/blocked_numbers_primary_text_color</item>

        <item name="android:forceDarkAllowed">true</item>

        <item name="android:textSize">@dimen/blocked_numbers_head1_font_size</item>

        <item name="android:textSize">@dimen/blocked_numbers_head1_font_size</item>

        <item name="android:fontFamily">sans-serif-regular</item>

        <item name="android:fontFamily">sans-serif-regular</item>

    </style>

    </style>





    <style name="BlockedNumbersTextPrimary2">

    <style name="BlockedNumbersTextPrimary2" parent="Theme.Telecom.BlockedNumbers">

        <item name="android:textColor">@color/blocked_numbers_primary_text_color</item>

        <item name="android:textSize">@dimen/blocked_numbers_primary2_font_size</item>

        <item name="android:textSize">@dimen/blocked_numbers_primary2_font_size</item>

        <item name="android:fontFamily">sans-serif-regular</item>

        <item name="android:fontFamily">sans-serif-regular</item>

        <item name="android:lineSpacingExtra">@dimen/blocked_numbers_line_spacing</item>

        <item name="android:lineSpacingExtra">@dimen/blocked_numbers_line_spacing</item>

        <item name="android:capitalize">sentences</item>

        <item name="android:capitalize">sentences</item>

    </style>

    </style>





    <style name="BlockedNumbersTextSecondary">

    <style name="BlockedNumbersTextSecondary" parent="Theme.Telecom.BlockedNumbers">

        <item name="android:textColor">@color/blocked_numbers_secondary_text_color</item>

        <item name="android:textSize">@dimen/blocked_numbers_secondary_font_size</item>

        <item name="android:textSize">@dimen/blocked_numbers_secondary_font_size</item>

        <item name="android:fontFamily">sans-serif-regular</item>

        <item name="android:fontFamily">sans-serif-regular</item>

        <item name="android:lineSpacingExtra">@dimen/blocked_numbers_secondary_line_spacing</item>

        <item name="android:lineSpacingExtra">@dimen/blocked_numbers_secondary_line_spacing</item>

src/com/android/server/telecom/CallsManager.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -2198,7 +2198,7 @@ public class CallsManager extends Call.ListenerBase 
     * @param callId The ID of the call to show the redirection dialog for.

     * @param callId The ID of the call to show the redirection dialog for.

     */

     */

    private void showRedirectionDialog(@NonNull String callId, @NonNull CharSequence appName) {

    private void showRedirectionDialog(@NonNull String callId, @NonNull CharSequence appName) {

        AlertDialog confirmDialog = FrameworksUtils.makeAlertDialogBuilder(mContext).create();

        AlertDialog confirmDialog = (new AlertDialog.Builder(mContext)).create();

        LayoutInflater layoutInflater = LayoutInflater.from(mContext);

        LayoutInflater layoutInflater = LayoutInflater.from(mContext);

        View dialogView = layoutInflater.inflate(R.layout.call_redirection_confirm_dialog, null);

        View dialogView = layoutInflater.inflate(R.layout.call_redirection_confirm_dialog, null);

src/com/android/server/telecom/FrameworksUtils.java

deleted100644 → 0
+0 −38
Original line number Original line Diff line number Diff line 
/*

 * Copyright (C) 2021 The Android Open Source Project

 *

 * 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.

 */



package com.android.server.telecom;



import android.app.AlertDialog;

import android.content.Context;

import android.content.res.Configuration;



/**

 * This class provides utility functions over framework APIs

 */

public class FrameworksUtils {

    /**

     * Create a new instance of {@link AlertDialog.Builder}.

     * @param context reference to a Context

     * @return an instance of AlertDialog.Builder

     */

    public static AlertDialog.Builder makeAlertDialogBuilder(Context context) {

        boolean isDarkTheme = (context.getResources().getConfiguration().uiMode

                & Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES;

        return new AlertDialog.Builder(context, isDarkTheme

                ? android.R.style.Theme_DeviceDefault_Dialog_Alert : 0);

    }

}
 
 No newline at end of file

src/com/android/server/telecom/components/ErrorDialogActivity.java

+2 −3
Original line number Original line Diff line number Diff line
@@ -16,7 +16,6 @@ 




package com.android.server.telecom.components;

package com.android.server.telecom.components;





import com.android.server.telecom.FrameworksUtils;

import com.android.server.telecom.R;

import com.android.server.telecom.R;





import android.app.Activity;

import android.app.Activity;
@@ -85,7 +84,7 @@ public class ErrorDialogActivity extends Activity { 
            }

            }

        };

        };





        final AlertDialog errorDialog = FrameworksUtils.makeAlertDialogBuilder(this)

        final AlertDialog errorDialog = new AlertDialog.Builder(this)

                .setMessage(msg).setPositiveButton(android.R.string.ok, clickListener)

                .setMessage(msg).setPositiveButton(android.R.string.ok, clickListener)

                        .setOnCancelListener(cancelListener).create();

                        .setOnCancelListener(cancelListener).create();
@@ -98,7 +97,7 @@ public class ErrorDialogActivity extends Activity { 
    }

    }





    private void showMissingVoicemailErrorDialog() {

    private void showMissingVoicemailErrorDialog() {

        FrameworksUtils.makeAlertDialogBuilder(this)

        final AlertDialog errorDialog = new AlertDialog.Builder(this)

                .setTitle(R.string.no_vm_number)

                .setTitle(R.string.no_vm_number)

                .setMessage(R.string.no_vm_number_msg)

                .setMessage(R.string.no_vm_number_msg)

                .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {

                .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {