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

Commit e06f238c authored by Sherry Zhou's avatar Sherry Zhou Committed by Automerger Merge Worker
Browse files

Merge "Fix clock showing 12 hour format when 24 hour format is chosen" into... 

Merge "Fix clock showing 12 hour format when 24 hour format is chosen" into udc-dev am: 01ef8eff am: 04efc315

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22561123



Change-Id: I0358ad699e2766f4696f00d49ff8fca8de8f927e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e8c5b1ca 04efc315

packages/SystemUI/src/com/android/keyguard/ClockEventController.kt

+19 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.graphics.Rect 
import android.text.format.DateFormat

import android.util.TypedValue

import android.view.View

import android.view.View.OnAttachStateChangeListener

import android.view.ViewTreeObserver

import android.widget.FrameLayout

import androidx.annotation.VisibleForTesting
@@ -105,6 +106,24 @@ constructor( 
                }

                updateFontSizes()

                updateTimeListeners()

                value.smallClock.view.addOnAttachStateChangeListener(

                    object : OnAttachStateChangeListener {

                        override fun onViewAttachedToWindow(p0: View?) {

                            value.events.onTimeFormatChanged(DateFormat.is24HourFormat(context))

                        }



                        override fun onViewDetachedFromWindow(p0: View?) {

                        }

                })

                value.largeClock.view.addOnAttachStateChangeListener(

                    object : OnAttachStateChangeListener {

                        override fun onViewAttachedToWindow(p0: View?) {

                            value.events.onTimeFormatChanged(DateFormat.is24HourFormat(context))

                        }



                        override fun onViewDetachedFromWindow(p0: View?) {

                        }

                })

            }

        }