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

Commit cba5c9b8 authored by Daniel Sandler's avatar Daniel Sandler Committed by Automerger Merge Worker
Browse files

Merge changes from topic "egg12" into sc-dev am: 51204c44 am: 6b414510 

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

Change-Id: I258dd2c449133be0ffef274324d2e7d4c3d91477
parents 6c3848c5 6b414510

core/java/android/widget/AnalogClock.java

+17 −3
Original line number Diff line number Diff line
@@ -740,8 +740,22 @@ public class AnalogClock extends View { 
        }

    }



    private void onTimeChanged() {

        Instant now = mClock.instant();

    /**

     * Return the current Instant to be used for drawing the clockface. Protected to allow

     * subclasses to override this to show a different time from the system clock.

     *

     * @return the Instant to be shown on the clockface

     * @hide

     */

    protected Instant now() {

        return mClock.instant();

    }



    /**

     * @hide

     */

    protected void onTimeChanged() {

        Instant now = now();

        onTimeChanged(now.atZone(mClock.getZone()).toLocalTime(), now.toEpochMilli());

    }
@@ -789,7 +803,7 @@ public class AnalogClock extends View { 
                return;

            }



            Instant now = mClock.instant();

            Instant now = now();

            ZonedDateTime zonedDateTime = now.atZone(mClock.getZone());

            LocalTime localTime = zonedDateTime.toLocalTime();

core/java/com/android/internal/app/PlatLogoActivity.java

+229 −247

File changed.

Preview size limit exceeded, changes collapsed.

core/res/AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -5904,8 +5904,8 @@ 
                android:process=":ui">

        </activity>

        <activity android:name="com.android.internal.app.PlatLogoActivity"

                android:theme="@style/Theme.DeviceDefault.DayNight"

                android:configChanges="orientation|keyboardHidden"

                android:theme="@style/Theme.DeviceDefault.Wallpaper.NoTitleBar"

                android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"

                android:icon="@drawable/platlogo"

                android:process=":ui">

        </activity>

core/res/res/drawable-hdpi/clock_dial.png

deleted100644 → 0
−10.3 KiB
Loading image diff...

core/res/res/drawable-hdpi/clock_hand_hour.png

deleted100644 → 0
−2.14 KiB
Loading image diff...