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

Commit 689d491d authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android (Google) Code Review
Browse files

Merge "Avoid some more layer creations" into lmp-dev

parents b38e0757 e19b1ac5

packages/Keyguard/res/layout/keyguard_pin_view.xml

+3 −3
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
            android:layout_weight="1"

            android:layoutDirection="ltr"

            >

        <RelativeLayout

        <com.android.keyguard.AlphaOptimizedRelativeLayout

                android:id="@+id/row0"

                android:layout_width="match_parent"

                android:layout_height="0dp"
@@ -79,7 +79,7 @@ 
                    android:layout_alignParentBottom="true"

                    android:background="#28FFFFFF"

                    />

        </RelativeLayout>

        </com.android.keyguard.AlphaOptimizedRelativeLayout>

        <LinearLayout

                android:id="@+id/row1"

                android:layout_width="match_parent"
@@ -196,7 +196,7 @@ 
                    androidprv:textView="@+id/pinEntry"

                    androidprv:digit="0"

                    />

            <ImageButton

            <com.android.keyguard.AlphaOptimizedImageButton

                    android:id="@+id/key_enter"

                    android:layout_width="0px"

                    android:layout_height="match_parent"

packages/Keyguard/src/com/android/keyguard/AlphaOptimizedImageButton.java

0 → 100644
+38 −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 com.android.keyguard;



import android.content.Context;

import android.util.AttributeSet;

import android.widget.ImageButton;

import android.widget.RelativeLayout;



/**

 * A frame layout which does not have overlapping renderings commands and therefore does not need a

 * layer when alpha is changed.

 */

public class AlphaOptimizedImageButton extends ImageButton {



    public AlphaOptimizedImageButton(Context context, AttributeSet attrs) {

        super(context, attrs);

    }



    @Override

    public boolean hasOverlappingRendering() {

        return false;

    }

}

packages/SystemUI/src/com/android/systemui/statusbar/AlphaOptimizedLinearLayout.java→packages/Keyguard/src/com/android/keyguard/AlphaOptimizedLinearLayout.java

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License

 */



package com.android.systemui.statusbar;

package com.android.keyguard;



import android.content.Context;

import android.util.AttributeSet;

packages/Keyguard/src/com/android/keyguard/AlphaOptimizedRelativeLayout.java

0 → 100644
+37 −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 com.android.keyguard;



import android.content.Context;

import android.util.AttributeSet;

import android.widget.RelativeLayout;



/**

 * A frame layout which does not have overlapping renderings commands and therefore does not need a

 * layer when alpha is changed.

 */

public class AlphaOptimizedRelativeLayout extends RelativeLayout {



    public AlphaOptimizedRelativeLayout(Context context, AttributeSet attrs) {

        super(context, attrs);

    }



    @Override

    public boolean hasOverlappingRendering() {

        return false;

    }

}

packages/Keyguard/src/com/android/keyguard/EmergencyCarrierArea.java

+1 −3
Original line number Diff line number Diff line
@@ -17,13 +17,11 @@ 
package com.android.keyguard;



import android.content.Context;

import android.content.res.TypedArray;

import android.util.AttributeSet;

import android.view.MotionEvent;

import android.view.View;

import android.widget.LinearLayout;



public class EmergencyCarrierArea extends LinearLayout {

public class EmergencyCarrierArea extends AlphaOptimizedLinearLayout {



    private CarrierText mCarrierText;

    private EmergencyButton mEmergencyButton;