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

Commit 720a3086 authored by Aayush Gupta's avatar Aayush Gupta
Browse files

Merge branch 'lineage-18.1' of gitlab.e.foundation:e/os/android_packages_apps_Dialer into v1-r 

 Conflicts:
	java/com/android/dialer/main/impl/res/values/styles.xml
	java/com/android/dialer/main/impl/toolbar/res/layout/toolbar_layout.xml
	java/com/android/dialer/theme/hidden/res/values/colors_dialer_light.xml
parents fc4a745f 2f5b5ea4

java/com/android/dialer/main/impl/res/values-night/styles.xml

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

<!--

  ~ Copyright (C) 2017 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="LaunchTheme" parent="Theme.AppCompat.DayNight.DarkActionBar">

    <item name="android:colorPrimary">@color/dialer_theme_color</item>

    <item name="colorPrimary">@color/dialer_theme_color</item>

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

    <item name="colorPrimaryDark">@color/dialer_theme_color_dark</item>

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

  </style>



</resources>

java/com/android/dialer/main/impl/res/values/styles.xml

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 
    <!-- This is used for statusbar and Navigation bar color in recents -->

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

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



  </style>



  <!-- Activities should use this theme as their style -->

java/com/android/dialer/main/impl/toolbar/res/drawable/search_bar_background_rounded_corners.xml

+12 −5
Original line number Diff line number Diff line
@@ -14,8 +14,15 @@ 
  ~ See the License for the specific language governing permissions and

  ~ limitations under the License

  -->

<shape xmlns:android="http://schemas.android.com/apk/res/android"

  android:shape="rectangle">

  <solid android:color="?android:attr/colorBackgroundFloating"/>

  <corners android:radius="2dp"/>

<ripple xmlns:android="http://schemas.android.com/apk/res/android"

    android:color="@color/dialer_ripple_color">



    <item android:id="@android:id/mask">

        <shape android:shape="rectangle">

            <solid android:color="@android:color/white" />

            <corners android:radius="8dp" />

        </shape>

    </item>



  <item android:drawable="@drawable/search_bar_background_rounded_corners_shape" />

</ripple>

java/com/android/dialer/main/impl/toolbar/res/drawable/search_bar_background_rounded_corners_shape.xml

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

<!--

  ~ Copyright (C) 2018 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

  -->

<shape xmlns:android="http://schemas.android.com/apk/res/android"

  android:shape="rectangle">

  <solid android:color="?attr/colorBackgroundSearchBar"/>

  <corners android:radius="8dp"/>

</shape>

java/com/android/dialer/main/impl/toolbar/res/layout/expanded_search_bar.xml

+3 −3
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/search_box_expanded"

    android:layout_width="match_parent"

    android:layout_height="@dimen/expanded_search_bar_height"

    android:layout_height="@dimen/collapsed_search_bar_height"

    android:visibility="invisible">



  <ImageButton
@@ -29,7 +29,7 @@ 
      android:background="?attr/selectableItemBackgroundBorderless"

      android:contentDescription="@string/action_menu_back_from_search"

      android:src="@drawable/quantum_ic_arrow_back_vd_theme_24"

      android:tint="?android:attr/colorPrimary"/>

      android:tint="?colorIcon"/>



  <EditText

      android:id="@+id/search_view"