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

Commit f6a2b87e authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Android (Google) Code Review
Browse files

Merge "Flags for qs labels"

parents 0d98528c d908739d

packages/SystemUI/res/layout/qs_paged_page_side_labels.xml

+1 −7
Original line number Diff line number Diff line
@@ -14,10 +14,4 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

<com.android.systemui.qs.SideLabelTileLayout

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

    android:id="@+id/tile_page"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:clipChildren="false"

    android:clipToPadding="false" />
 
<include layout="@layout/qs_paged_page" />

packages/SystemUI/res/layout/qs_tile_label_divider.xml

+1 −10
Original line number Diff line number Diff line
@@ -15,13 +15,4 @@ 
  ~ limitations under the License.

  -->



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

      android:layout_width="1px"

      android:layout_height="match_parent"

      android:layout_gravity="center_vertical"

      android:layout_marginBottom="10dp"

      android:layout_marginTop="10dp"

      android:layout_marginStart="0dp"

      android:layout_marginEnd="0dp"

      android:background="?android:attr/textColorSecondary"

/>
 
 No newline at end of file
 
<View />
 
 No newline at end of file

packages/SystemUI/res/values/flags.xml

+2 −0
Original line number Diff line number Diff line
@@ -24,4 +24,6 @@ 


    <!-- b/171917882 -->

    <bool name="flag_notification_twocolumn">false</bool>



    <bool name="flag_qs_labels">false</bool>

</resources>

packages/SystemUI/res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -2823,4 +2823,7 @@ 
    <!-- Text to display in a notification when ACTION_BATTERY_CHANGED.EXTRA_PRESENT field is false

    [CHAR LIMIT=NONE] -->

    <string name="battery_state_unknown_notification_text">Tap for more information</string>



    <!-- No translation [CHAR LIMIT=0] -->

    <string name="qs_remove_labels" translatable="false"></string>

</resources>

packages/SystemUI/src/com/android/systemui/qs/QSPanel.java

+6 −4
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ import android.content.res.Resources; 
import android.os.Bundle;

import android.os.Handler;

import android.os.Message;

import android.provider.Settings;

import android.util.AttributeSet;

import android.util.Pair;

import android.view.Gravity;
@@ -113,7 +112,7 @@ public class QSPanel extends LinearLayout implements Tunable { 
    private int mMediaTotalBottomMargin;

    private int mFooterMarginStartHorizontal;

    private Consumer<Boolean> mMediaVisibilityChangedListener;

    private final boolean mSideLabels;

    private boolean mSideLabels;



    public QSPanel(Context context, AttributeSet attrs) {

        super(context, attrs);
@@ -121,12 +120,15 @@ public class QSPanel extends LinearLayout implements Tunable { 
        mMediaTotalBottomMargin = getResources().getDimensionPixelSize(

                R.dimen.quick_settings_bottom_margin_media);

        mContext = context;

        mSideLabels = Settings.Secure.getInt(

                mContext.getContentResolver(), "sysui_side_labels", 0) != 0;



        setOrientation(VERTICAL);



        mMovableContentStartIndex = getChildCount();



    }



    void initialize(boolean sideLabels) {

        mSideLabels = sideLabels;

        mRegularTileLayout = createRegularTileLayout();

        mTileLayout = mRegularTileLayout;