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

Commit 66274fc9 authored by Steve Kondik's avatar Steve Kondik
Browse files

Revert "Show custom app name on LockScreen" 

This reverts commit a3eecd88.
parent 725dddea

core/java/com/android/internal/widget/SlidingTab.java

+1 −11
Original line number Diff line number Diff line
@@ -230,10 +230,6 @@ public class SlidingTab extends ViewGroup { 
            text.setText(resId);

        }



        void setHintText(CharSequence charText) {

            text.setText(charText);

        }



        void hide() {

            boolean horiz = alignment == ALIGN_LEFT || alignment == ALIGN_RIGHT;

            int dx = horiz ? (alignment == ALIGN_LEFT ? alignment_value - tab.getRight()
@@ -800,12 +796,6 @@ public class SlidingTab extends ViewGroup { 
        }

    }



    public void setRightHintText(CharSequence charText) {

       if (isHorizontal()) {

           mRightSlider.setHintText(charText);

       }

    }



    public void setHoldAfterTrigger(boolean holdLeft, boolean holdRight) {

        mHoldLeftOnTransition = holdLeft;

        mHoldRightOnTransition = holdRight;

policy/src/com/android/internal/policy/impl/LockScreen.java

+2 −15
Original line number Diff line number Diff line
@@ -54,8 +54,6 @@ import android.os.SystemClock; 
import android.os.SystemProperties;

import android.os.Vibrator;

import android.provider.Settings;

import android.content.pm.ActivityInfo;

import android.content.pm.PackageManager;



import java.util.ArrayList;

import java.util.Date;
@@ -336,19 +334,8 @@ class LockScreen extends LinearLayout implements KeyguardScreen, KeyguardUpdateM 
        if (mSelector2 != null) {

            mSelector2.setHoldAfterTrigger(true, false);

            mSelector2.setLeftHintText(R.string.lockscreen_phone_label);



            if (mCustomAppActivity != null) {

                Intent i;

                try {

                    i = Intent.parseUri(mCustomAppActivity, 0);

                    PackageManager pm = context.getPackageManager();

                    ActivityInfo ai = i.resolveActivityInfo(pm,PackageManager.GET_ACTIVITIES);

                    mSelector2.setRightHintText(ai.loadLabel(pm).toString());

                } catch (URISyntaxException e) {

            mSelector2.setRightHintText(R.string.lockscreen_messaging_label);

        }

            }

        }



        mEmergencyCallText = (TextView) findViewById(R.id.emergencyCallText);

        mEmergencyCallButton = (Button) findViewById(R.id.emergencyCallButton);

        mEmergencyCallButton.setText(R.string.lockscreen_emergency_call);