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

Commit 8633ea9b authored by Daniel Sandler's avatar Daniel Sandler
Browse files

Update LockScreen/UnlockScreen for new UX designs. 

This change depends upon relevant layout changes in
frameworks/base/core/res/res.
parent 421db0f0

policy/com/android/internal/policy/impl/LockScreen.java

+0 −2
Original line number Diff line number Diff line
@@ -180,7 +180,6 @@ class LockScreen extends LinearLayout implements KeyguardScreen, KeyguardUpdateM 
        }



        mCarrier = (TextView) findViewById(R.id.carrier);

        mTime = (TextView) findViewById(R.id.time);

        mDate = (TextView) findViewById(R.id.date);

        mStatus1 = (TextView) findViewById(R.id.status1);

        mStatus2 = (TextView) findViewById(R.id.status2);
@@ -371,7 +370,6 @@ class LockScreen extends LinearLayout implements KeyguardScreen, KeyguardUpdateM 


    private void refreshTimeAndDateDisplay() {

        Date now = new Date();

        mTime.setText(mTimeFormat.format(now));

        mDate.setText(mDateFormat.format(now));

    }

policy/com/android/internal/policy/impl/UnlockScreen.java

+0 −6
Original line number Diff line number Diff line
@@ -72,9 +72,7 @@ class UnlockScreen extends LinearLayoutWithDefaultTouchRecepient 
    private boolean mCreatedInPortrait;



    private TextView mCarrier;

    private TextView mCenterDot;

    private TextView mDate;

    private TextView mTime;



    // are we showing battery information?

    private boolean mShowingBatteryInfo = false;
@@ -169,11 +167,8 @@ class UnlockScreen extends LinearLayoutWithDefaultTouchRecepient 
        }



        mCarrier = (TextView) findViewById(R.id.carrier);

        mCenterDot = (TextView) findViewById(R.id.centerDot);

        mDate = (TextView) findViewById(R.id.date);

        mTime = (TextView) findViewById(R.id.time);



        mCenterDot.setText("|");

        refreshTimeAndDateDisplay();



        mStatus1 = (TextView) findViewById(R.id.status1);
@@ -323,7 +318,6 @@ class UnlockScreen extends LinearLayoutWithDefaultTouchRecepient 


    private void refreshTimeAndDateDisplay() {

        Date now = new Date();

        mTime.setText(DateFormat.getTimeFormat(getContext()).format(now));

        mDate.setText(DateFormat.getMediumDateFormat(getContext()).format(now));

    }