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

Commit 73816051 authored by Keyan Mobli's avatar Keyan Mobli Committed by Gerrit Code Review
Browse files

Merge "Lockscreen fix: AM/PM string always shown - ignoring 24h format" into gingerbread

parents ae910c18 f008241d

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

+7 −0
Original line number Diff line number Diff line
@@ -129,6 +129,10 @@ class LockScreen extends LinearLayout implements KeyguardScreen, KeyguardUpdateM 
    private String mDateFormatString;

    private boolean mEnableMenuKeyInLockScreen;



    // time format from system settings - contains 12 or 24

    private int mTime12_24 = (Settings.System.getInt(mContext.getContentResolver(),

            Settings.System.TIME_12_24, 12));



    private boolean mTrackballUnlockScreen = (Settings.System.getInt(mContext.getContentResolver(),

            Settings.System.TRACKBALL_UNLOCK_SCREEN, 0) == 1);
@@ -1284,6 +1288,9 @@ class LockScreen extends LinearLayout implements KeyguardScreen, KeyguardUpdateM 
        mAlbumArt.setVisibility(visibility);

        mStatus1.setVisibility(visibility);

        mStatus2.setVisibility(visibility);



        mNowPlayingScreen=(visibility == View.VISIBLE);

        if(mTime12_24 == 24)

            mAmPm.setVisibility(View.GONE);

    }

}