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

Commit 0b094670 authored by Ricardo Cerqueira's avatar Ricardo Cerqueira
Browse files

Fix various broken bits from the rebase 

Change-Id: I2db072751de7d4e583594774b1bfa0c2a65ebf8a
parent ddadc655

core/java/com/android/internal/util/cm/DevUtils.java

0 → 100644
+63 −0
Original line number Diff line number Diff line 
package com.android.internal.util.cm;



import android.app.ActivityManagerNative;

import android.app.IActivityManager;

import android.app.ActivityManager.RunningAppProcessInfo;

import android.content.Context;

import android.content.Intent;

import android.content.pm.ResolveInfo;

import android.os.Process;

import android.os.RemoteException;

import android.os.UserHandle;

import android.provider.Settings;



import java.util.List;



public class DevUtils {



    /**

     * Kills the top most / most recent user application, but leaves out the launcher.

     * This is function governed by {@link Settings.Secure.KILL_APP_LONGPRESS_BACK}.

     *

     * @param context the current context, used to retrieve the package manager.

     * @return {@code true} when a user application was found and closed.

     */

    public static boolean killForegroundApplication(Context context) {

        boolean targetKilled = false;

        try {

            final Intent intent = new Intent(Intent.ACTION_MAIN);

            String defaultHomePackage = "com.android.launcher";

            intent.addCategory(Intent.CATEGORY_HOME);

            final ResolveInfo res = context.getPackageManager().resolveActivity(intent, 0);

            if (res.activityInfo != null && !res.activityInfo.packageName.equals("android")) {

                defaultHomePackage = res.activityInfo.packageName;

            }

            IActivityManager am = ActivityManagerNative.getDefault();

            List<RunningAppProcessInfo> apps = am.getRunningAppProcesses();

            for (RunningAppProcessInfo appInfo : apps) {

                int uid = appInfo.uid;

                // Make sure it's a foreground user application (not system,

                // root, phone, etc.)

                if (uid >= Process.FIRST_APPLICATION_UID && uid <= Process.LAST_APPLICATION_UID

                        && appInfo.importance == RunningAppProcessInfo.IMPORTANCE_FOREGROUND) {

                    if (appInfo.pkgList != null && (appInfo.pkgList.length > 0)) {

                        for (String pkg : appInfo.pkgList) {

                            if (!pkg.equals("com.android.systemui") && !pkg.equals(defaultHomePackage)) {

                                am.forceStopPackage(pkg, UserHandle.USER_CURRENT);

                                targetKilled = true;

                                break;

                            }

                        }

                    } else {

                        Process.killProcess(appInfo.pid);

                        targetKilled = true;

                        break;

                    }

                }

            }

        } catch (RemoteException remoteException) {

            // Do nothing; just let it go.

        }

        return targetKilled;

    }

}

core/res/res/layout-sw600dp/keyguard_screen_status_land.xml

deleted100644 → 0
+0 −123
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

**

** Copyright 2010, The Android Open Source Project

** Copyright 2012, The CyanogenMod Project (Weather, Calendar)

**

** 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.

*/

-->



<!-- Status to show on the left side of lock screen -->

<LinearLayout

        xmlns:android="http://schemas.android.com/apk/res/android"

        android:orientation="vertical"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:gravity="end">



    <TextView

        android:id="@+id/carrier"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:textAppearance="?android:attr/textAppearanceMedium"

        android:textSize="16sp"

        android:drawablePadding="4dip"

        android:layout_marginTop="32dip"

        android:singleLine="true"

        android:ellipsize="marquee"

        android:visibility="gone"

        />



    <com.android.internal.widget.DigitalClock android:id="@+id/time"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginBottom="8dip" >



        <!-- Because we can't have multi-tone fonts, we render two TextViews, one on

        top of the other. Hence the redundant layout... -->

        <TextView android:id="@+id/timeDisplayBackground"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:singleLine="true"

            android:ellipsize="none"

            android:textSize="@dimen/keyguard_pattern_unlock_clock_font_size"

            android:textAppearance="?android:attr/textAppearanceMedium"

            android:textColor="@color/lockscreen_clock_background"

            android:layout_marginBottom="6dip"

            />



        <TextView android:id="@+id/timeDisplayForeground"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:singleLine="true"

            android:ellipsize="none"

            android:textSize="@dimen/keyguard_pattern_unlock_clock_font_size"

            android:textAppearance="?android:attr/textAppearanceMedium"

            android:textColor="@color/lockscreen_clock_foreground"

            android:layout_alignStart="@id/timeDisplayBackground"

            android:layout_alignTop="@id/timeDisplayBackground"

            android:layout_marginBottom="6dip"

            />



    </com.android.internal.widget.DigitalClock>



    <LinearLayout

        android:orientation="horizontal"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_below="@id/time"

        android:layout_marginTop="10dip">



        <TextView

            android:id="@+id/date"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:textAppearance="?android:attr/textAppearanceMedium"

            android:textSize="16sp"/>



        <TextView

            android:id="@+id/alarm_status"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginStart="16dip"

            android:textAppearance="?android:attr/textAppearanceMedium"

            android:drawablePadding="4dip"

            android:textSize="16sp"/>



    </LinearLayout>



    <!-- Status1 is generally battery status and informational messages -->

    <TextView

        android:id="@+id/status1"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginTop="10dip"

        android:textSize="16sp"

        android:textAppearance="?android:attr/textAppearanceMedium"

        />



    <TextView

        android:id="@+id/owner_info"

        android:lineSpacingExtra="8dip"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:textAppearance="?android:attr/textAppearanceMedium"

        android:textSize="16sp"

        android:layout_marginTop="20dip"

        android:singleLine="false"

        android:textColor="@color/lockscreen_owner_info"

        android:visibility="invisible"

        />



</LinearLayout>

core/res/res/layout-sw600dp/keyguard_screen_status_port.xml

deleted100644 → 0
+0 −124
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

**

** Copyright 2010, The Android Open Source Project

** Copyright 2012, The CyanogenMod Project (Weather, Calendar)

**

** 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.

*/

-->



<!-- Status to show on the left side of lock screen -->

<LinearLayout

        xmlns:android="http://schemas.android.com/apk/res/android"

        android:orientation="vertical"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginTop="20dip"

        android:gravity="end"

        >



    <TextView

        android:id="@+id/carrier"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:textAppearance="?android:attr/textAppearanceMedium"

        android:textSize="16sp"

        android:drawablePadding="4dip"

        android:layout_marginTop="32dip"

        android:singleLine="true"

        android:ellipsize="marquee"

        android:visibility="gone"

        />



    <com.android.internal.widget.DigitalClock android:id="@+id/time"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginBottom="8dip" >



        <!-- Because we can't have multi-tone fonts, we render two TextViews, one on

        top of the other. Hence the redundant layout... -->

        <TextView android:id="@+id/timeDisplayBackground"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:singleLine="true"

            android:ellipsize="none"

            android:textSize="@dimen/keyguard_pattern_unlock_clock_font_size"

            android:textAppearance="?android:attr/textAppearanceMedium"

            android:textColor="@color/lockscreen_clock_background"

            android:layout_marginBottom="6dip"

            />



        <TextView android:id="@+id/timeDisplayForeground"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:singleLine="true"

            android:ellipsize="none"

            android:textSize="@dimen/keyguard_pattern_unlock_clock_font_size"

            android:textAppearance="?android:attr/textAppearanceMedium"

            android:textColor="@color/lockscreen_clock_foreground"

            android:layout_marginBottom="6dip"

            android:layout_alignStart="@id/timeDisplayBackground"

            android:layout_alignTop="@id/timeDisplayBackground"

            />



    </com.android.internal.widget.DigitalClock>



    <LinearLayout

        android:orientation="horizontal"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_below="@id/time"

        android:layout_marginTop="10dip">



        <TextView

            android:id="@+id/date"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:textAppearance="?android:attr/textAppearanceMedium"

            android:textSize="16sp"/>



        <TextView

            android:id="@+id/alarm_status"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginStart="16dip"

            android:textAppearance="?android:attr/textAppearanceMedium"

            android:drawablePadding="4dip"

            android:textSize="16sp"/>



    </LinearLayout>



    <TextView

        android:id="@+id/status1"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginTop="10dip"

        android:textSize="16sp"

        android:textAppearance="?android:attr/textAppearanceMedium"

        />



    <TextView

        android:id="@+id/owner_info"

        android:lineSpacingExtra="8dip"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginTop="20dip"

        android:textAppearance="?android:attr/textAppearanceMedium"

        android:textSize="16sp"

        android:singleLine="false"

        android:visibility="invisible"

        android:textColor="@color/lockscreen_owner_info"

        />



</LinearLayout>

core/res/res/values/symbols.xml

+3 −0
Original line number Diff line number Diff line
@@ -1760,6 +1760,9 @@ 
   =============================================================== -->

  <eat-comment />



  <!-- Reboot confirmation string -->

  <java-symbol type="string" name="reboot_confirm" />



  <!-- Config.xml entries -->

  <java-symbol type="bool" name="config_forceDisableHardwareKeyboard" />

  <java-symbol type="bool" name="config_hasRotationLockSwitch" />

media/java/android/media/AudioService.java.orig

deleted100644 → 0
+0 −4725

File deleted.

Preview size limit exceeded, changes collapsed.