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

Commit 26ff47ea authored by Flamefire's avatar Flamefire Committed by Adnan Begovic
Browse files

[2/2] Add option to change size of QS ribbon bar 

PS2: Use narrow for 2nd size and decrease margins for smaller tiles
PS3: Remove trailing WS + rebase
PS4: Rebase and fix unchanged dimen use
PS5: Fix renamed dimen missing
PS6: Change narrow to automatic and move applying of settings down
PS7: Make small be narrow instead. "Small" is actually Auto (Narrow)
PS8: Use measuredWidth and modify HorScrollView, otherwise layout changes will be ignored
     (Orientation switches were a big problem)

Change-Id: I6dbe2d165398a8142e024db827208dc778003431
parent 203fdae0

core/java/android/provider/Settings.java

+7 −0
Original line number Original line Diff line number Diff line
@@ -2940,6 +2940,13 @@ public final class Settings { 
         */

         */

        public static final String QS_QUICK_ACCESS = "qs_quick_access";

        public static final String QS_QUICK_ACCESS = "qs_quick_access";





        /**

         * Quick Settings Quick access ribbon - size

         *

         * @hide

         */

        public static final String QS_QUICK_ACCESS_SIZE = "qs_quick_access_size";



        /**

        /**

         * Quick Settings Quick access ribbon - linked layout

         * Quick Settings Quick access ribbon - linked layout

         *

         *

packages/SystemUI/res/layout/ribbon_settings.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -20,7 +20,7 @@ 
    android:layout_width="match_parent"

    android:layout_width="match_parent"

    android:fadingEdgeLength="30dp"

    android:fadingEdgeLength="30dp"

    android:requiresFadingEdge="horizontal"

    android:requiresFadingEdge="horizontal"

    android:layout_height="@dimen/notification_min_height"

    android:layout_height="@dimen/qs_ribbon_height_big"

    android:scrollbars="none">

    android:scrollbars="none">

        <com.android.systemui.statusbar.phone.QuickSettingsContainerView

        <com.android.systemui.statusbar.phone.QuickSettingsContainerView

            android:id="@+id/quick_settings_ribbon_container"

            android:id="@+id/quick_settings_ribbon_container"

packages/SystemUI/res/layout/status_bar_expanded.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -75,7 +75,7 @@ 
        <ViewStub android:id="@+id/ribbon_settings_stub"

        <ViewStub android:id="@+id/ribbon_settings_stub"

            android:layout="@layout/ribbon_settings"

            android:layout="@layout/ribbon_settings"

            android:layout_width="match_parent"

            android:layout_width="match_parent"

            android:layout_height="@dimen/notification_min_height"

            android:layout_height="@dimen/qs_ribbon_height_big"

            />

            />





        <TextView

        <TextView

packages/SystemUI/res/values/dimens.xml

+10 −2
Original line number Original line Diff line number Diff line
@@ -214,8 +214,6 @@ 
    <dimen name="qs_tile_margin_above_icon">27dp</dimen>

    <dimen name="qs_tile_margin_above_icon">27dp</dimen>

    <!-- Quick Settings tile geometry: gap between icon and text -->

    <!-- Quick Settings tile geometry: gap between icon and text -->

    <dimen name="qs_tile_margin_below_icon">17dp</dimen>

    <dimen name="qs_tile_margin_below_icon">17dp</dimen>

    <!-- Quick Settings tile geometry: interior margin, above and below icon (ribbon mode) -->

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

    <!-- Quick Settings tile geometry: icon size -->

    <!-- Quick Settings tile geometry: icon size -->

    <dimen name="qs_tile_icon_size">32dp</dimen>

    <dimen name="qs_tile_icon_size">32dp</dimen>

    <!-- Quick Settings CA Cert Warning tile geometry: gap between icon and text -->

    <!-- Quick Settings CA Cert Warning tile geometry: gap between icon and text -->
@@ -229,4 +227,14 @@ 




    <!-- Padding under status bar battery icon -->

    <!-- Padding under status bar battery icon -->

    <dimen name="status_bar_battery_bottom_padding">1px</dimen>

    <dimen name="status_bar_battery_bottom_padding">1px</dimen>



    <!-- Quick Settings tile geometry: width and height (ribbon mode) -->

    <dimen name="qs_ribbon_width_min">40dp</dimen>

    <dimen name="qs_ribbon_width_max">128dp</dimen>

    <dimen name="qs_ribbon_width_big">64dp</dimen>

    <dimen name="qs_ribbon_height_small">40dp</dimen>

    <dimen name="qs_ribbon_height_big">64dp</dimen>

    <!-- Quick Settings tile geometry: interior margin, above and below icon (ribbon mode) -->

    <dimen name="qs_tile_ribbon_icon_margin_small">4dp</dimen>

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

</resources>
 
</resources>

packages/SystemUI/src/com/android/systemui/quicksettings/QuickSettingsTile.java

+4 −2
Original line number Original line Diff line number Diff line
@@ -76,11 +76,13 @@ public class QuickSettingsTile implements OnClickListener { 
        if (tv != null) {

        if (tv != null) {

            tv.setVisibility(View.GONE);

            tv.setVisibility(View.GONE);

        }

        }

        // Image margins are set by the controller, so no need to set them here

    }



    public void setImageMargins(int margin) {

        View image = getImageView();

        View image = getImageView();

        if (image != null) {

        if (image != null) {

            MarginLayoutParams params = (MarginLayoutParams) image.getLayoutParams();

            MarginLayoutParams params = (MarginLayoutParams) image.getLayoutParams();

            int margin = mContext.getResources().getDimensionPixelSize(

                    R.dimen.qs_tile_ribbon_icon_margin);

            params.topMargin = params.bottomMargin = margin;

            params.topMargin = params.bottomMargin = margin;

            image.setLayoutParams(params);

            image.setLayoutParams(params);

        }

        }