Merge "Hide carrier string when emergency call button pressed." into jb-mr2-dev (62a4858b) · Commits · e / os / android_frameworks_base

core/res/res/layout/keyguard_emergency_carrier_area.xml

+3 −2

Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@
		-->

		<!-- This contains emergency call button and carrier as shared by pin/pattern/password screens -->
		<LinearLayout
		<com.android.internal.policy.impl.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.internal.policy.impl.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.internal.policy.impl.keyguard.EmergencyCarrierArea>

core/res/res/values/symbols.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -1324,6 +1324,7 @@
		<java-symbol type="id" name="keyguard_bouncer_frame" />
		<java-symbol type="id" name="app_widget_container" />
		<java-symbol type="id" name="view_flipper" />
		<java-symbol type="id" name="carrier_text" />
		<java-symbol type="id" name="emergency_call_button" />
		<java-symbol type="id" name="keyguard_host_view" />
		<java-symbol type="id" name="delete_button" />

policy/src/com/android/internal/policy/impl/keyguard/EmergencyCarrierArea.java

0 → 100644

+62 −0

Original line number	Diff line number	Diff line
		/*
		* 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.internal.policy.impl.keyguard;

		import android.content.Context;
		import android.util.AttributeSet;
		import android.view.MotionEvent;
		import android.view.View;
		import android.widget.LinearLayout;

		import com.android.internal.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;
		}});
		}
		}