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

Commit 655437b7 authored by Luca Stefani's avatar Luca Stefani Committed by Michael Bestas
Browse files

SystemUI: Clock position customization 



Co-authored-by: default avatarAditya Eka Pranata <aepranata@gmail.com>
Co-authored-by: default avatarHendrik Hagendorn <git@finnq.de>
Co-authored-by: default avatarkxxt <rsworktech@outlook.com>
Co-authored-by: default avatarLuK1337 <priv.luk@gmail.com>
Co-authored-by: default avatarMichael W <baddaemon87@gmail.com>
Co-authored-by: default avatarPranav Vashi <neobuddy89@gmail.com>
Co-authored-by: default avatarVolodymyr Zhdanov <wight554@gmail.com>
Co-authored-by: default avatarkxxt <rsworktech@outlook.com>
Change-Id: Icdc039d13fd2676c1eb979a81fb77f9a6ec59b4a
parent 62cd2e66

packages/SystemUI/res/layout/status_bar.xml

+19 −0
Original line number Diff line number Diff line
@@ -167,4 +167,23 @@ 
        </FrameLayout>

    </LinearLayout>



    <com.android.keyguard.AlphaOptimizedLinearLayout

        android:id="@+id/centered_area"

        android:gravity="center"

        android:orientation="horizontal"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:paddingTop="@dimen/status_bar_padding_top"

        >

        <com.android.systemui.statusbar.policy.Clock

            android:id="@+id/clock_center"

            android:textAppearance="@style/TextAppearance.StatusBar.Default.Clock"

            android:layout_width="wrap_content"

            android:layout_height="@dimen/status_bar_system_icons_height"

            android:singleLine="true"

            android:gravity="center"

            android:visibility="gone"

        />

    </com.android.keyguard.AlphaOptimizedLinearLayout>



</com.android.systemui.statusbar.phone.PhoneStatusBarView>

packages/SystemUI/res/layout/system_icons.xml

+18 −0
Original line number Diff line number Diff line
@@ -47,4 +47,22 @@ 
        android:visibility="gone"

        systemui:textAppearance="@style/TextAppearance.StatusBar.Default" />



    <com.android.keyguard.AlphaOptimizedLinearLayout

        android:id="@+id/right_clock_layout"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:orientation="horizontal"

        >

        <com.android.systemui.statusbar.policy.Clock

            android:id="@+id/clock_right"

            android:layout_width="wrap_content"

            android:layout_height="@dimen/status_bar_system_icons_height"

            android:textAppearance="@style/TextAppearance.StatusBar.Default.Clock"

            android:singleLine="true"

            android:paddingStart="@dimen/status_bar_clock_starting_padding"

            android:paddingEnd="@dimen/status_bar_clock_end_padding"

            android:gravity="center_vertical"

            android:visibility="gone"

        />

    </com.android.keyguard.AlphaOptimizedLinearLayout>

</LinearLayout>

packages/SystemUI/res/values/cm_strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -47,6 +47,9 @@ 
    <string name="global_action_current_user">Current</string>

    <string name="global_action_users">Users</string>



    <!-- Name of the clock in status bar [CHAR LIMIT=30] -->

    <string name="clock">Clock</string>



    <!-- Status bar - icons -->

    <string name="status_bar_icons_title">Status bar icons</string>

packages/SystemUI/res/xml/status_bar_prefs.xml

+3 −4
Original line number Diff line number Diff line
@@ -121,11 +121,10 @@ 


    <!-- secure -->



    <com.android.systemui.tuner.ClockPreference

    <com.android.systemui.tuner.StatusBarSwitch

        android:icon="@drawable/ic_statusbar_clock"

        android:title="@string/tuner_time"

        android:summary="%s"

        android:entries="@array/clock_options" />

        android:key="clock"

        android:title="@string/clock" />



    <com.android.systemui.tuner.TunerSwitch

        android:icon="@drawable/ic_statusbar_priority"

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java

+12 −0
Original line number Diff line number Diff line
@@ -23,8 +23,10 @@ import android.graphics.Insets; 
import android.graphics.Rect;

import android.util.AttributeSet;

import android.util.Log;

import android.view.Display;

import android.view.DisplayCutout;

import android.view.MotionEvent;

import android.view.Surface;

import android.view.View;

import android.view.ViewGroup;

import android.view.WindowInsets;
@@ -366,6 +368,16 @@ public class PhoneStatusBarView extends FrameLayout { 
                insets.top,

                insets.right,

                getPaddingBottom());



        // Apply negative paddings to centered area layout so that we'll actually be on the center.

        Display display = getDisplay();

        final int winRotation = display != null ? display.getRotation() : Surface.ROTATION_0;

        LayoutParams centeredAreaParams =

                (LayoutParams) findViewById(R.id.centered_area).getLayoutParams();

        centeredAreaParams.leftMargin =

                winRotation == Surface.ROTATION_0 ? -insets.left : 0;

        centeredAreaParams.rightMargin =

                winRotation == Surface.ROTATION_0 ? -insets.right : 0;

    }



    private void updateWindowHeight() {