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

Commit 9e865f88 authored by Julia Reynolds's avatar Julia Reynolds Committed by android-build-merger
Browse files

Merge "Fix a11y readout of notification importance buttons" into qt-dev 

am: 1b25f986

Change-Id: I7c94082364ef16412ef2613003c91881905ba12a
parents dd7133e5 1b25f986

res/layout/notif_importance_preference.xml

+2 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
    android:padding="@dimen/notification_importance_toggle_marginTop"

    android:orientation="vertical">



    <RelativeLayout

    <com.android.settings.notification.NotificationButtonRelativeLayout

        android:id="@+id/alert"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"
@@ -65,7 +65,7 @@ 
            android:layout_below="@id/alert_icon"

            android:textAppearance="@style/TextAppearance.NotificationImportanceDetail"

            android:visibility="gone" />

    </RelativeLayout>

    </com.android.settings.notification.NotificationButtonRelativeLayout>



    <RelativeLayout

        android:id="@+id/silence"

src/com/android/settings/notification/ImportancePreference.java

+2 −0
Original line number Diff line number Diff line
@@ -117,11 +117,13 @@ public class ImportancePreference extends Preference { 
            case IMPORTANCE_LOW:

                mAlertButton.setBackground(unselectedBackground);

                mSilenceButton.setBackground(selectedBackground);

                mSilenceButton.setSelected(true);

                break;

            case IMPORTANCE_HIGH:

            default:

                mSilenceButton.setBackground(unselectedBackground);

                mAlertButton.setBackground(selectedBackground);

                mAlertButton.setSelected(true);

                break;

        }

        setImportanceSummary((ViewGroup) holder.itemView, mImportance, false);

src/com/android/settings/notification/NotificationButtonRelativeLayout.java

0 → 100644
+33 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2019 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.

 */



package com.android.settings.notification;





import android.content.Context;

import android.util.AttributeSet;

import android.widget.Button;

import android.widget.RelativeLayout;



public class NotificationButtonRelativeLayout extends RelativeLayout {



    public NotificationButtonRelativeLayout(Context context, AttributeSet attrs) {

        super(context, attrs);

    }



    @Override

    public CharSequence getAccessibilityClassName() {

        return Button.class.getName();

    }

}
 
 No newline at end of file