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

Unverified Commit e4581380 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 dc62e653

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/HeadsUpAppearanceControllerTest.kt

+5 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ import com.android.systemui.statusbar.notification.row.NotificationTestHelper 
import com.android.systemui.statusbar.notification.row.shared.AsyncGroupHeaderViewInflation

import com.android.systemui.statusbar.notification.stack.NotificationRoundnessManager

import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayoutController

import com.android.systemui.statusbar.phone.PhoneStatusBarView

import com.android.systemui.statusbar.policy.Clock

import com.android.systemui.statusbar.policy.keyguardStateController

import com.android.systemui.testKosmos
@@ -114,6 +115,8 @@ class HeadsUpAppearanceControllerTest : SysuiTestCase() { 
                Clock(mContext, null),

                kosmos.headsUpNotificationIconInteractor,

                Optional.of(operatorNameView),

                mock<PhoneStatusBarView>(),

                kosmos.phoneStatusBarViewController,

            )

        underTest.setAppearFraction(0.0f, 0.0f)

    }
@@ -359,6 +362,8 @@ class HeadsUpAppearanceControllerTest : SysuiTestCase() { 
                Clock(mContext, null),

                mock<HeadsUpNotificationIconInteractor>(),

                Optional.empty(),

                mock<PhoneStatusBarView>(),

                kosmos.phoneStatusBarViewController,

            )



        assertThat(newController.mExpandedHeight).isEqualTo(expandedHeight)

packages/SystemUI/res/layout/status_bar.xml

+19 −0
Original line number Diff line number Diff line
@@ -166,4 +166,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
@@ -18,6 +18,9 @@ 
 */

-->

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

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

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



    <!-- Advanced restart menu -->

    <!-- Button to indicate more options -->

    <string name="global_action_restart_more">Restart\u2026</string>

packages/SystemUI/res/xml/status_bar_prefs.xml

+3 −4
Original line number Diff line number Diff line
@@ -116,11 +116,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"