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

Commit b771c1a5 authored by Garfield Tan's avatar Garfield Tan Committed by Automerger Merge Worker
Browse files

Merge changes from topic "caption_in_wm_shell" into tm-qpr-dev am: 20f893dd am: 5d73e23e 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18699935



Change-Id: I3a23ad6d3b7c91db34af2543fbd8a9fca3ac4a66
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f6a7444d 5d73e23e

libs/WindowManager/Shell/res/color/decor_button_dark_color.xml

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

<!--

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

  -->

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

          xmlns:app="http://schemas.android.com/apk/res-auto">

    <item app:state_task_focused="true" android:color="#FF000000" />

    <item android:color="#33000000" />

</selector>

libs/WindowManager/Shell/res/color/decor_button_light_color.xml

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

<!--

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

  -->

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

        xmlns:app="http://schemas.android.com/apk/res-auto">

    <item app:state_task_focused="true" android:color="#FFFFFFFF" />

    <item android:color="#33FFFFFF" />

</selector>
 
 No newline at end of file

libs/WindowManager/Shell/res/color/decor_caption_title_color.xml

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

<!--

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

  -->

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

        xmlns:app="http://schemas.android.com/apk/res-auto">

     <!-- Fading the to 85% blackness -->

    <item app:state_task_focused="true" android:color="#D8D8D8" />

    <!-- Fading the to 95% blackness -->

    <item android:color="#F2F2F2" />

</selector>

libs/WindowManager/Shell/res/drawable/decor_caption_title.xml

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

<!--

  ~ Copyright (C) 2022 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 android:shape="rectangle"

       android:tintMode="multiply"

       android:tint="@color/decor_caption_title_color"

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

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

</shape>

libs/WindowManager/Shell/res/drawable/decor_close_button_dark.xml

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

<!--

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

  -->

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

        android:width="32.0dp"

        android:height="32.0dp"

        android:viewportWidth="32.0"

        android:viewportHeight="32.0"

        android:tint="@color/decor_button_dark_color"

        >

    <group android:scaleX="0.5"

            android:scaleY="0.5"

            android:translateX="8.0"

            android:translateY="8.0" >

        <path

            android:fillColor="@android:color/white"

            android:pathData="M6.9,4.0l-2.9,2.9 9.1,9.1 -9.1,9.200001 2.9,2.799999 9.1,-9.1 9.1,9.1 2.9,-2.799999 -9.1,-9.200001 9.1,-9.1 -2.9,-2.9 -9.1,9.2z"/>

    </group>

</vector>