diff options
author | John Spurlock <jspurlock@google.com> | 2013-03-21 08:27:58 -0400 |
---|---|---|
committer | John Spurlock <jspurlock@google.com> | 2013-03-21 08:27:58 -0400 |
commit | 52452484527238222f03dc9f4bc3018608167306 (patch) | |
tree | a368c4b20548ca3ca3c7f5fd44f6efe256c8fd31 /packages/Keyguard | |
parent | 47f1bea9da873dcb04165553286ad45bc88a1e88 (diff) | |
parent | 2d9305ccc28f00f5263bcaa5cd033ee22ccc8d0b (diff) | |
download | frameworks_base-52452484527238222f03dc9f4bc3018608167306.zip frameworks_base-52452484527238222f03dc9f4bc3018608167306.tar.gz frameworks_base-52452484527238222f03dc9f4bc3018608167306.tar.bz2 |
resolved conflicts for merge of 2d9305cc to master
Change-Id: I9a9672314ef95af09e3f416fa1dc200f7a9d8d4e
Diffstat (limited to 'packages/Keyguard')
-rw-r--r-- | packages/Keyguard/res/layout/keyguard_emergency_carrier_area.xml | 5 | ||||
-rw-r--r-- | packages/Keyguard/src/com/android/keyguard/EmergencyCarrierArea.java | 62 |
2 files changed, 65 insertions, 2 deletions
diff --git a/packages/Keyguard/res/layout/keyguard_emergency_carrier_area.xml b/packages/Keyguard/res/layout/keyguard_emergency_carrier_area.xml index 1e2de92..de673ec 100644 --- a/packages/Keyguard/res/layout/keyguard_emergency_carrier_area.xml +++ b/packages/Keyguard/res/layout/keyguard_emergency_carrier_area.xml @@ -18,7 +18,7 @@ --> <!-- This contains emergency call button and carrier as shared by pin/pattern/password screens --> -<LinearLayout +<com.android.keyguard.EmergencyCarrierArea xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -29,6 +29,7 @@ android:clickable="true"> <com.android.keyguard.CarrierText + android:id="@+id/carrier_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" @@ -72,4 +73,4 @@ android:visibility="gone"/> </LinearLayout> -</LinearLayout> +</com.android.keyguard.EmergencyCarrierArea> diff --git a/packages/Keyguard/src/com/android/keyguard/EmergencyCarrierArea.java b/packages/Keyguard/src/com/android/keyguard/EmergencyCarrierArea.java new file mode 100644 index 0000000..6d392fc --- /dev/null +++ b/packages/Keyguard/src/com/android/keyguard/EmergencyCarrierArea.java @@ -0,0 +1,62 @@ +/* + * Copyright (C) 2013 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.view.MotionEvent; +import android.view.View; +import android.widget.LinearLayout; + +import com.android.keyguard.R; + +public class EmergencyCarrierArea extends LinearLayout { + + private CarrierText mCarrierText; + private EmergencyButton mEmergencyButton; + + public EmergencyCarrierArea(Context context) { + super(context); + } + + public EmergencyCarrierArea(Context context, AttributeSet attrs) { + super(context, attrs); + } + + @Override + protected void onFinishInflate() { + super.onFinishInflate(); + mCarrierText = (CarrierText) findViewById(R.id.carrier_text); + mEmergencyButton = (EmergencyButton) findViewById(R.id.emergency_call_button); + + // The emergency button overlaps the carrier text, only noticeable when highlighted. + // So temporarily hide the carrier text while the emergency button is pressed. + mEmergencyButton.setOnTouchListener(new OnTouchListener(){ + @Override + public boolean onTouch(View v, MotionEvent event) { + switch(event.getAction()) { + case MotionEvent.ACTION_DOWN: + mCarrierText.animate().alpha(0); + break; + case MotionEvent.ACTION_UP: + mCarrierText.animate().alpha(1); + break; + } + return false; + }}); + } +} |