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

Commit 2654a156 authored by Wenyu Zhang's avatar Wenyu Zhang Committed by Android (Google) Code Review
Browse files

Merge "nit: format code" into main

parents a7c44f04 b58c35fe

packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/floatingmenu/AccessibilityTargetAdapterTest.java

+6 −6
Original line number Diff line number Diff line
@@ -152,8 +152,8 @@ public class AccessibilityTargetAdapterTest extends SysuiTestCase { 
    @EnableFlags(

            com.android.settingslib.flags.Flags.FLAG_HEARING_DEVICE_SET_CONNECTION_STATUS_REPORT)

    public void setBadgeOnLeftSide_false_rightBadgeVisibleAndLeftBadgeInvisible() {

        when(mAccessibilityTarget.getId()).thenReturn(

                ACCESSIBILITY_HEARING_AIDS_COMPONENT_NAME.flattenToString());

        when(mAccessibilityTarget.getId())

                .thenReturn(ACCESSIBILITY_HEARING_AIDS_COMPONENT_NAME.flattenToString());



        mAdapter.setBadgeOnLeftSide(false);

        mAdapter.onBindViewHolder(mViewHolder, 0);
@@ -166,8 +166,8 @@ public class AccessibilityTargetAdapterTest extends SysuiTestCase { 
    @EnableFlags(

            com.android.settingslib.flags.Flags.FLAG_HEARING_DEVICE_SET_CONNECTION_STATUS_REPORT)

    public void setBadgeOnLeftSide_rightBadgeInvisibleAndLeftBadgeVisible() {

        when(mAccessibilityTarget.getId()).thenReturn(

                ACCESSIBILITY_HEARING_AIDS_COMPONENT_NAME.flattenToString());

        when(mAccessibilityTarget.getId())

                .thenReturn(ACCESSIBILITY_HEARING_AIDS_COMPONENT_NAME.flattenToString());



        mAdapter.setBadgeOnLeftSide(true);

        mAdapter.onBindViewHolder(mViewHolder, 0);
@@ -180,8 +180,8 @@ public class AccessibilityTargetAdapterTest extends SysuiTestCase { 
    @EnableFlags(

            com.android.settingslib.flags.Flags.FLAG_HEARING_DEVICE_SET_CONNECTION_STATUS_REPORT)

    public void setBadgeOnLeftSide_bindViewHolderPayloads_rightBadgeInvisibleAndLeftBadgeVisible() {

        when(mAccessibilityTarget.getId()).thenReturn(

                ACCESSIBILITY_HEARING_AIDS_COMPONENT_NAME.flattenToString());

        when(mAccessibilityTarget.getId())

                .thenReturn(ACCESSIBILITY_HEARING_AIDS_COMPONENT_NAME.flattenToString());



        mAdapter.setBadgeOnLeftSide(true);

        mAdapter.onBindViewHolder(mViewHolder, 0, List.of(PAYLOAD_HEARING_STATUS_DRAWABLE));

packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/AccessibilityTargetAdapter.java

+1 −2
Original line number Diff line number Diff line
@@ -48,8 +48,7 @@ import java.util.List; 
 * An adapter which shows the set of accessibility targets that can be performed.

 */

public class AccessibilityTargetAdapter extends Adapter<ViewHolder> {

    @VisibleForTesting

    static final int PAYLOAD_HEARING_STATUS_DRAWABLE = 1;

    @VisibleForTesting static final int PAYLOAD_HEARING_STATUS_DRAWABLE = 1;



    private int mIconWidthHeight;

    private int mBadgeWidthHeight;

services/accessibility/java/com/android/server/accessibility/AutoclickController.java

+1 −1

File changed.

Contains only whitespace changes.