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

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

Merge "Remove dependency on ChooserActivity resources" into udc-qpr-dev am:... 

Merge "Remove dependency on ChooserActivity resources" into udc-qpr-dev am: 39715d30 am: 3362abc5

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24265323



Change-Id: I95a7256b5488b7847ebd348c455162fa08a2c3cd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 317bfca1 3362abc5

res/drawable/action_button_bg.xml

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

<!--

  ~ Copyright (C) 2023 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="?android:attr/colorControlHighlight">

    <item>

        <inset

            android:insetLeft="0dp"

            android:insetTop="8dp"

            android:insetRight="0dp"

            android:insetBottom="8dp">

            <shape android:shape="rectangle">

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

                <stroke android:width="1dp"

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

            </shape>

        </inset>

    </item>

</ripple>

res/layout/action_button.xml

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

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

  -->



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

    android:gravity="center_vertical|start"

    android:paddingStart="12dp"

    android:paddingEnd="12dp"

    android:drawablePadding="8dp"

    android:textColor="?android:attr/textColorPrimary"

    android:textSize="12sp"

    android:maxWidth="192dp"

    android:singleLine="true"

    android:clickable="true"

    android:background="@drawable/action_button_bg"

    android:drawableTint="?android:attr/textColorPrimary"

    android:drawableTintMode="src_in"

    style="?android:attr/borderlessButtonStyle"

    />

res/values/dimens.xml

+3 −0
Original line number Diff line number Diff line
@@ -410,6 +410,9 @@ 
    <!-- Margin for SD card setup completion Image -->

    <dimen name="setup_completion_margin_top">88dp</dimen>



    <!-- QR code action button -->

    <dimen name="action_button_icon_size">18dp</dimen>



    <!-- Biometrics Face enroll education dimensions-->

    <dimen name="face_enroll_icon_large_width">300dp</dimen>

    <dimen name="face_enroll_icon_large_height">300dp</dimen>

src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragment.java

+2 −4
Original line number Diff line number Diff line
@@ -226,11 +226,9 @@ public class WifiDppQrCodeGeneratorFragment extends WifiDppQrCodeBaseFragment { 


    private Button createActionButton(Drawable icon, CharSequence title, View.OnClickListener r) {

        final Button b = (Button) LayoutInflater.from(getContext()).inflate(

                com.android.internal.R.layout.chooser_action_button, null);

                R.layout.action_button, null);

        if (icon != null) {

            final int size = getResources()

                    .getDimensionPixelSize(

                            com.android.internal.R.dimen.chooser_action_button_icon_size);

            final int size = getResources().getDimensionPixelSize(R.dimen.action_button_icon_size);

            icon.setBounds(0, 0, size, size);

            b.setCompoundDrawablesRelative(icon, null, null, null);

        }