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

Commit 505b28c1 authored by Tim Kilbourn's avatar Tim Kilbourn
Browse files

resolved conflicts for merge of dfd39a7f to master 

Change-Id: I51040a2e7de006a9864127bdff839dbadbf00879
parents e7070b30 1d285b09

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

+18 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import com.android.internal.util.XmlUtils; 
import org.xmlpull.v1.XmlPullParserException;



import java.io.IOException;

import java.io.PrintWriter;



/**

 * Stores a mapping of global keys.
@@ -123,4 +124,21 @@ final class GlobalKeyManager { 
            }

        }

    }



    public void dump(String prefix, PrintWriter pw) {

        final int numKeys = mKeyMapping.size();

        if (numKeys == 0) {

            pw.print(prefix); pw.println("mKeyMapping.size=0");

            return;

        }

        pw.print(prefix); pw.println("mKeyMapping={");

        for (int i = 0; i < numKeys; ++i) {

            pw.print("  ");

            pw.print(prefix);

            pw.print(KeyEvent.keyCodeToString(mKeyMapping.keyAt(i)));

            pw.print("=");

            pw.println(mKeyMapping.valueAt(i).flattenToString());

        }

        pw.print(prefix); pw.println("}");

    }

}

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

+1 −0
Original line number Diff line number Diff line
@@ -5678,6 +5678,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                pw.print(" mDemoHdmiRotationLock="); pw.println(mDemoHdmiRotationLock);

        pw.print(prefix); pw.print("mUndockedHdmiRotation="); pw.println(mUndockedHdmiRotation);



        mGlobalKeyManager.dump(prefix, pw);

        mStatusBarController.dump(pw, prefix);

        mNavigationBarController.dump(pw, prefix);

        PolicyControl.dump(prefix, pw);