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

Commit 0af2ade3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove "See more" from wifi/bluetooth slices"

parents f19a9840 4b08270d

res/layout/homepage_slice_tile.xml

+3 −3
Original line number Diff line number Diff line
@@ -24,9 +24,9 @@ 
    <androidx.slice.widget.SliceView

        android:id="@+id/slice_view"

        android:layout_width="match_parent"

        android:layout_height="@dimen/homepage_slice_card_max_height"

        android:layout_marginBottom="@dimen/homepage_card_bottom_margin"

        android:layout_marginTop="@dimen/homepage_card_top_margin"

        android:layout_height="wrap_content"

        android:layout_marginBottom="@dimen/homepage_card_vertical_margin"

        android:layout_marginTop="@dimen/homepage_card_vertical_margin"

        android:paddingStart="@dimen/homepage_card_padding_start"

        android:paddingEnd="@dimen/homepage_card_padding_end"/>

res/values/dimens.xml

+1 −8
Original line number Diff line number Diff line
@@ -327,17 +327,10 @@ 
    <!-- Homepage cards size and padding -->

    <dimen name="homepage_card_corner_radius">8dp</dimen>

    <dimen name="homepage_card_elevation">2dp</dimen>

    <dimen name="homepage_card_top_margin">6dp</dimen>

    <dimen name="homepage_card_bottom_margin">6dp</dimen>

    <dimen name="homepage_card_vertical_margin">6dp</dimen>

    <dimen name="homepage_card_side_margin">16dp</dimen>

    <dimen name="homepage_card_padding_start">16dp</dimen>

    <dimen name="homepage_card_padding_end">16dp</dimen>

    <dimen name="homepage_card_padding_top">6dp</dimen>

    <dimen name="homepage_card_padding_bottom">6dp</dimen>



    <!-- Slice cards maximum height (4 rows + show more)

        MODE_LARGE height(3 rows + show more) 240dp + two lines text(1 row) 60dp = 300dp -->

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



    <!-- Signal icon in NetworkSelectSetting -->

    <dimen name="signal_strength_icon_size">24dp</dimen>

res/values/styles.xml

+2 −2
Original line number Diff line number Diff line
@@ -455,8 +455,8 @@ 
    </style>



    <style name="ContextualCardStyle">

        <item name="android:layout_marginTop">@dimen/homepage_card_top_margin</item>

        <item name="android:layout_marginBottom">@dimen/homepage_card_bottom_margin</item>

        <item name="android:layout_marginTop">@dimen/homepage_card_vertical_margin</item>

        <item name="android:layout_marginBottom">@dimen/homepage_card_vertical_margin</item>

        <item name="android:layout_marginStart">@dimen/homepage_card_side_margin</item>

        <item name="android:layout_marginEnd">@dimen/homepage_card_side_margin</item>

        <item name="cardCornerRadius">@dimen/homepage_card_corner_radius</item>

src/com/android/settings/homepage/contextualcards/slices/ConnectedDeviceSlice.java

+0 −9
Original line number Diff line number Diff line
@@ -95,8 +95,6 @@ public class ConnectedDeviceSlice implements CustomSliceable { 
    private static final Comparator<CachedBluetoothDevice> COMPARATOR

            = Comparator.naturalOrder();



    private static final int DEFAULT_EXPANDED_ROW_COUNT = 4;



    private static final String TAG = "ConnectedDeviceSlice";



    private final Context mContext;
@@ -162,13 +160,6 @@ public class ConnectedDeviceSlice implements CustomSliceable { 
        for (ListBuilder.RowBuilder rowBuilder : rows) {

            listBuilder.addRow(rowBuilder);

        }



        // Only show "see more" button when the number of data row is more than or equal to 4.

        // TODO(b/118465996): SHOW MORE button won't work properly when having two data rows

        if (rows.size() >= DEFAULT_EXPANDED_ROW_COUNT) {

            listBuilder.setSeeMoreAction(primaryActionIntent);

        }



        return listBuilder.build();

    }

src/com/android/settings/wifi/WifiSlice.java

+2 −5
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ public class WifiSlice implements CustomSliceable { 
            .build();



    @VisibleForTesting

    static final int DEFAULT_EXPANDED_ROW_COUNT = 4;

    static final int DEFAULT_EXPANDED_ROW_COUNT = 3;



    private final Context mContext;
@@ -137,10 +137,7 @@ public class WifiSlice implements CustomSliceable { 
                        .setSubtitle(placeholder));

            }

        }

        // Add more button

        return listBuilder

                .setSeeMoreAction(primaryAction)

                .build();

        return listBuilder.build();

    }



    private RowBuilder getAccessPointRow(AccessPoint accessPoint) {