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

Commit dd06c94d authored by Matt Casey's avatar Matt Casey Committed by Automerger Merge Worker
Browse files

Merge "Style fixes for mini resolver" into tm-dev am: 2f6f3aa7 

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



Change-Id: I7194386513b574b0314dfc0f2f2d83b7f22f3f25
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8a8b12f8 2f6f3aa7

core/java/com/android/internal/app/ResolverActivity.java

+2 −1
Original line number Diff line number Diff line
@@ -642,7 +642,8 @@ public class ResolverActivity extends Activity implements 


        if (shouldUseMiniResolver()) {

            View buttonContainer = findViewById(R.id.button_bar_container);

            buttonContainer.setPadding(0, 0, 0, mSystemWindowInsets.bottom);

            buttonContainer.setPadding(0, 0, 0, mSystemWindowInsets.bottom

                    + getResources().getDimensionPixelOffset(R.dimen.resolver_button_bar_spacing));

        }



        // Need extra padding so the list can fully scroll up

core/res/res/color-night/resolver_button_text.xml

0 → 100644
+20 −0
Original line number Diff line number Diff line 
<!--

  ~ 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:androidprv="http://schemas.android.com/apk/prv/res/android">

    <item android:color="?androidprv:attr/textColorPrimaryInverse" />

</selector>

core/res/res/color/resolver_button_text.xml

0 → 100644
+20 −0
Original line number Diff line number Diff line 
<!--

  ~ 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:androidprv="http://schemas.android.com/apk/prv/res/android">

    <item android:color="?androidprv:attr/textColorPrimary" />

</selector>

core/res/res/drawable/resolver_button_bg.xml

0 → 100644
+40 −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.

  -->

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

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

        android:color="@color/resolver_accent_ripple">



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

        <shape android:shape="rectangle">

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

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

        </shape>

    </item>



    <item>

        <inset

            android:insetLeft="0dp"

            android:insetTop="6dp"

            android:insetRight="0dp"

            android:insetBottom="6dp">

            <shape android:shape="rectangle">

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

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

            </shape>

        </inset>

    </item>



</ripple>
 
 No newline at end of file

core/res/res/drawable/resolver_outlined_button_bg.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.

  -->

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

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

    <item>

        <inset

            android:insetLeft="0dp"

            android:insetTop="6dp"

            android:insetRight="0dp"

            android:insetBottom="6dp">

            <shape android:shape="rectangle">

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

                <stroke android:width="1dp"

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

            </shape>

        </inset>

    </item>

</ripple>