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

Commit f5b02eb7 authored by Deepanshu Gupta's avatar Deepanshu Gupta
Browse files

resolved conflicts for a0bc2e7e to lmp-mr1-dev 

The original change wasn't properly merged into lmp-mr1-dev because of
merge conflicts. This change manually resolves the conflicts. The main
reason for the conflict was that TimePickerSpinnerDelegate was swapped
with TimePickerClockDelegate.

This change also fixes the typo in the original change which was fixed
in a subsequent change.

Original commit: 12b6d29b
fix for typo: cb09bc45

Change-Id: I50bf8c2d86318f632465a38adfad16d1382a9319
parent a30fdf79

core/java/android/widget/TimePickerClockDelegate.java

+2 −0
Original line number Diff line number Diff line
@@ -63,6 +63,8 @@ class TimePickerClockDelegate extends TimePicker.AbstractTimePickerDelegate impl 
    // Also NOT a real index, just used for keyboard mode.

    private static final int ENABLE_PICKER_INDEX = 3;



    // LayoutLib relies on these constants. Change TimePickerClockDelegate_Delegate if

    // modifying these.

    static final int AM = 0;

    static final int PM = 1;

tools/layoutlib/bridge/src/android/widget/TimePickerClockDelegate_Delegate.java

0 → 100644
+44 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2014 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package android.widget;



import com.android.tools.layoutlib.annotations.LayoutlibDelegate;



import android.view.KeyEvent;



/**

 * Delegate used to provide new implementation of few methods in {@link TimePickerClockDelegate}.

 */

public class TimePickerClockDelegate_Delegate {



    // Copied from TimePickerClockDelegate.

    private static final int AM = 0;

    private static final int PM = 1;



    @LayoutlibDelegate

    static int getAmOrPmKeyCode(TimePickerClockDelegate tpcd, int amOrPm) {

        // We don't care about locales here.

        if (amOrPm == AM) {

            return KeyEvent.KEYCODE_A;

        } else if (amOrPm == PM) {

            return KeyEvent.KEYCODE_P;

        } else {

            assert false : "amOrPm value in TimePickerSpinnerDelegate can only be 0 or 1";

            return -1;

        }

    }

}

tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java

+1 −0
Original line number Diff line number Diff line
@@ -169,6 +169,7 @@ public final class CreateInfo implements ICreateInfo { 
        "android.view.RenderNode#nSetElevation",

        "android.view.RenderNode#nGetElevation",

        "android.view.ViewGroup#drawChild",

        "android.widget.TimePickerClockDelegate#getAmOrPmKeyCode",

        "com.android.internal.view.menu.MenuBuilder#createNewMenuItem",

        "com.android.internal.util.XmlUtils#convertValueToInt",

        "com.android.internal.textservice.ITextServicesManager$Stub#asInterface",