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

Commit 650e3b70 authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge "Re-enabling fade-in of header bar icons."

parents 63ac65c5 bbb3d3de

packages/SystemUI/res/drawable/recents_button_bg.xml

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

<!-- Copyright (C) 2014 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.

-->



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

    android:color="#40ffffff">

</ripple>

packages/SystemUI/res/drawable/recents_task_view_header_bg.xml

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

<!-- Copyright (C) 2014 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.

-->



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

    android:color="?android:attr/colorControlHighlight">

    <item android:drawable="@android:color/transparent" />

</ripple>
 
 No newline at end of file

packages/SystemUI/res/drawable/recents_task_view_header_bg_color.xml

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

<!-- Copyright (C) 2014 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">

    <corners android:topLeftRadius="@dimen/recents_task_view_rounded_corners_radius"

             android:topRightRadius="@dimen/recents_task_view_rounded_corners_radius"/>

    <solid android:color="#00000000" />

</shape>
 
 No newline at end of file

packages/SystemUI/res/layout/recents_task_view_header.xml

+6 −4
Original line number Diff line number Diff line
@@ -49,8 +49,9 @@ 
        android:layout_marginEnd="@dimen/recents_task_view_header_button_width"

        android:layout_gravity="center_vertical|end"

        android:padding="15dp"

        android:background="@drawable/recents_button_bg"

        android:src="@drawable/star"

        android:background="?android:selectableItemBackground"

        android:alpha="0"

        android:visibility="gone" />

    <com.android.systemui.recents.views.FixedSizeImageView

        android:id="@+id/dismiss_task"
@@ -58,9 +59,10 @@ 
        android:layout_height="@dimen/recents_task_view_header_button_height"

        android:layout_gravity="center_vertical|end"

        android:padding="15dp"

        android:background="@drawable/recents_button_bg"

        android:visibility="invisible"

        android:src="@drawable/recents_dismiss_light" />

        android:src="@drawable/recents_dismiss_light"

        android:background="?android:selectableItemBackground"

        android:alpha="0"

        android:visibility="gone" />



    <!-- The progress indicator shows if auto-paging is enabled -->

    <ViewStub android:id="@+id/focus_timer_indicator_stub"

packages/SystemUI/res/layout/recents_task_view_header_overlay.xml

+1 −1
Original line number Diff line number Diff line
@@ -45,6 +45,6 @@ 
        android:layout_height="@dimen/recents_task_bar_height"

        android:layout_gravity="center_vertical|end"

        android:padding="15dp"

        android:background="@drawable/recents_button_bg"

        android:background="?android:selectableItemBackground"

        android:src="@drawable/recents_info_light" />

</FrameLayout>
 
 No newline at end of file