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

Commit c652de81 authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

Implement display overscan support. 

The window manager now keeps track of the overscan of
each display, with an API to set it.  The overscan impacts
how it positions windows in the display.  There is a new set
of APIs for windows to say they would like to go into the
overscan region.  There is a call into the window manager to
set the overscan region for a display, and it now has a
concept of display settings that it stores presistently.

Also added a new "wm" command, moving the window manager
specific commands from the "am" command to there and adding
a new now to set the overscan region.

Change-Id: Id2c8092db64fd0a982274fedac7658d82f30f9ff
parent 736ef1e9

api/current.txt

+9 −0
Original line number Diff line number Diff line
@@ -1174,6 +1174,7 @@ package android { 
    field public static final int windowMinWidthMinor = 16843607; // 0x1010357

    field public static final int windowNoDisplay = 16843294; // 0x101021e

    field public static final int windowNoTitle = 16842838; // 0x1010056

    field public static final int windowOverscan = 16843727; // 0x10103cf

    field public static final int windowShowAnimation = 16842934; // 0x10100b6

    field public static final int windowShowWallpaper = 16843410; // 0x1010292

    field public static final int windowSoftInputMode = 16843307; // 0x101022b
@@ -1693,6 +1694,7 @@ package android { 
    field public static final int Theme_Black = 16973832; // 0x1030008

    field public static final int Theme_Black_NoTitleBar = 16973833; // 0x1030009

    field public static final int Theme_Black_NoTitleBar_Fullscreen = 16973834; // 0x103000a

    field public static final int Theme_Black_NoTitleBar_Overscan = 16974303; // 0x10301df

    field public static final int Theme_DeviceDefault = 16974120; // 0x1030128

    field public static final int Theme_DeviceDefault_Dialog = 16974126; // 0x103012e

    field public static final int Theme_DeviceDefault_DialogWhenLarge = 16974134; // 0x1030136
@@ -1711,9 +1713,11 @@ package android { 
    field public static final int Theme_DeviceDefault_Light_Dialog_NoActionBar_MinWidth = 16974133; // 0x1030135

    field public static final int Theme_DeviceDefault_Light_NoActionBar = 16974124; // 0x103012c

    field public static final int Theme_DeviceDefault_Light_NoActionBar_Fullscreen = 16974125; // 0x103012d

    field public static final int Theme_DeviceDefault_Light_NoActionBar_Overscan = 16974307; // 0x10301e3

    field public static final int Theme_DeviceDefault_Light_Panel = 16974139; // 0x103013b

    field public static final int Theme_DeviceDefault_NoActionBar = 16974121; // 0x1030129

    field public static final int Theme_DeviceDefault_NoActionBar_Fullscreen = 16974122; // 0x103012a

    field public static final int Theme_DeviceDefault_NoActionBar_Overscan = 16974306; // 0x10301e2

    field public static final int Theme_DeviceDefault_Panel = 16974138; // 0x103013a

    field public static final int Theme_DeviceDefault_Wallpaper = 16974140; // 0x103013c

    field public static final int Theme_DeviceDefault_Wallpaper_NoTitleBar = 16974141; // 0x103013d
@@ -1736,9 +1740,11 @@ package android { 
    field public static final int Theme_Holo_Light_Dialog_NoActionBar_MinWidth = 16973942; // 0x1030076

    field public static final int Theme_Holo_Light_NoActionBar = 16974064; // 0x10300f0

    field public static final int Theme_Holo_Light_NoActionBar_Fullscreen = 16974065; // 0x10300f1

    field public static final int Theme_Holo_Light_NoActionBar_Overscan = 16974305; // 0x10301e1

    field public static final int Theme_Holo_Light_Panel = 16973948; // 0x103007c

    field public static final int Theme_Holo_NoActionBar = 16973932; // 0x103006c

    field public static final int Theme_Holo_NoActionBar_Fullscreen = 16973933; // 0x103006d

    field public static final int Theme_Holo_NoActionBar_Overscan = 16974304; // 0x10301e0

    field public static final int Theme_Holo_Panel = 16973947; // 0x103007b

    field public static final int Theme_Holo_Wallpaper = 16973949; // 0x103007d

    field public static final int Theme_Holo_Wallpaper_NoTitleBar = 16973950; // 0x103007e
@@ -1746,12 +1752,14 @@ package android { 
    field public static final int Theme_Light = 16973836; // 0x103000c

    field public static final int Theme_Light_NoTitleBar = 16973837; // 0x103000d

    field public static final int Theme_Light_NoTitleBar_Fullscreen = 16973838; // 0x103000e

    field public static final int Theme_Light_NoTitleBar_Overscan = 16974302; // 0x10301de

    field public static final int Theme_Light_Panel = 16973914; // 0x103005a

    field public static final int Theme_Light_WallpaperSettings = 16973922; // 0x1030062

    field public static final int Theme_NoDisplay = 16973909; // 0x1030055

    field public static final int Theme_NoTitleBar = 16973830; // 0x1030006

    field public static final int Theme_NoTitleBar_Fullscreen = 16973831; // 0x1030007

    field public static final int Theme_NoTitleBar_OverlayActionModes = 16973930; // 0x103006a

    field public static final int Theme_NoTitleBar_Overscan = 16974301; // 0x10301dd

    field public static final int Theme_Panel = 16973913; // 0x1030059

    field public static final int Theme_Translucent = 16973839; // 0x103000f

    field public static final int Theme_Translucent_NoTitleBar = 16973840; // 0x1030010
@@ -26245,6 +26253,7 @@ package android.view { 
    field public static final int FLAG_IGNORE_CHEEK_PRESSES = 32768; // 0x8000

    field public static final int FLAG_KEEP_SCREEN_ON = 128; // 0x80

    field public static final int FLAG_LAYOUT_INSET_DECOR = 65536; // 0x10000

    field public static final int FLAG_LAYOUT_IN_OVERSCAN = 33554432; // 0x2000000

    field public static final int FLAG_LAYOUT_IN_SCREEN = 256; // 0x100

    field public static final int FLAG_LAYOUT_NO_LIMITS = 512; // 0x200

    field public static final int FLAG_NOT_FOCUSABLE = 8; // 0x8

cmds/am/src/com/android/commands/am/Am.java

+1 −89
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ import android.app.IInstrumentationWatcher; 
import android.app.Instrumentation;

import android.app.UiAutomationConnection;

import android.content.ComponentName;

import android.content.Context;

import android.content.IIntentReceiver;

import android.content.Intent;

import android.content.pm.IPackageManager;
@@ -39,7 +38,6 @@ import android.os.ServiceManager; 
import android.os.SystemProperties;

import android.os.UserHandle;

import android.util.AndroidException;

import android.view.Display;

import android.view.IWindowManager;



import java.io.BufferedReader;
@@ -134,10 +132,6 @@ public class Am { 
            runMonitor();

        } else if (op.equals("screen-compat")) {

            runScreenCompat();

        } else if (op.equals("display-size")) {

            runDisplaySize();

        } else if (op.equals("display-density")) {

            runDisplayDensity();

        } else if (op.equals("to-uri")) {

            runToUri(false);

        } else if (op.equals("to-intent-uri")) {
@@ -1201,82 +1195,6 @@ public class Am { 
        } while (packageName != null);

    }



    private void runDisplaySize() throws Exception {

        String size = nextArgRequired();

        int w, h;

        if ("reset".equals(size)) {

            w = h = -1;

        } else {

            int div = size.indexOf('x');

            if (div <= 0 || div >= (size.length()-1)) {

                System.err.println("Error: bad size " + size);

                return;

            }

            String wstr = size.substring(0, div);

            String hstr = size.substring(div+1);

            try {

                w = Integer.parseInt(wstr);

                h = Integer.parseInt(hstr);

            } catch (NumberFormatException e) {

                System.err.println("Error: bad number " + e);

                return;

            }

        }



        IWindowManager wm = IWindowManager.Stub.asInterface(ServiceManager.checkService(

                Context.WINDOW_SERVICE));

        if (wm == null) {

            System.err.println(NO_SYSTEM_ERROR_CODE);

            throw new AndroidException("Can't connect to window manager; is the system running?");

        }



        try {

            if (w >= 0 && h >= 0) {

                // TODO(multidisplay): For now Configuration only applies to main screen.

                wm.setForcedDisplaySize(Display.DEFAULT_DISPLAY, w, h);

            } else {

                wm.clearForcedDisplaySize(Display.DEFAULT_DISPLAY);

            }

        } catch (RemoteException e) {

        }

    }



    private void runDisplayDensity() throws Exception {

        String densityStr = nextArgRequired();

        int density;

        if ("reset".equals(densityStr)) {

            density = -1;

        } else {

            try {

                density = Integer.parseInt(densityStr);

            } catch (NumberFormatException e) {

                System.err.println("Error: bad number " + e);

                return;

            }

            if (density < 72) {

                System.err.println("Error: density must be >= 72");

                return;

            }

        }



        IWindowManager wm = IWindowManager.Stub.asInterface(ServiceManager.checkService(

                Context.WINDOW_SERVICE));

        if (wm == null) {

            System.err.println(NO_SYSTEM_ERROR_CODE);

            throw new AndroidException("Can't connect to window manager; is the system running?");

        }



        try {

            if (density > 0) {

                // TODO(multidisplay): For now Configuration only applies to main screen.

                wm.setForcedDisplayDensity(Display.DEFAULT_DISPLAY, density);

            } else {

                wm.clearForcedDisplayDensity(Display.DEFAULT_DISPLAY);

            }

        } catch (RemoteException e) {

        }

    }



    private void runToUri(boolean intentScheme) throws Exception {

        Intent intent = makeIntent(UserHandle.USER_CURRENT);

        System.out.println(intent.toUri(intentScheme ? Intent.URI_INTENT_SCHEME : 0));
@@ -1454,8 +1372,6 @@ public class Am { 
                "       am clear-debug-app\n" +

                "       am monitor [--gdb <port>]\n" +

                "       am screen-compat [on|off] <PACKAGE>\n" +

                "       am display-size [reset|WxH]\n" +

                "       am display-density [reset|DENSITY]\n" +

                "       am to-uri [INTENT]\n" +

                "       am to-intent-uri [INTENT]\n" +

                "       am switch-user <USER_ID>\n" +
@@ -1524,17 +1440,13 @@ public class Am { 
                "am clear-debug-app: clear the previously set-debug-app.\n" +

                "\n" +

                "am bug-report: request bug report generation; will launch UI\n" +

                "    when done to select where it should be delivered." +

                "    when done to select where it should be delivered.\n" +

                "\n" +

                "am monitor: start monitoring for crashes or ANRs.\n" +

                "    --gdb: start gdbserv on the given port at crash/ANR\n" +

                "\n" +

                "am screen-compat: control screen compatibility mode of <PACKAGE>.\n" +

                "\n" +

                "am display-size: override display size.\n" +

                "\n" +

                "am display-density: override display density.\n" +

                "\n" +

                "am to-uri: print the given Intent specification as a URI.\n" +

                "\n" +

                "am to-intent-uri: print the given Intent specification as an intent: URI.\n" +

cmds/wm/Android.mk

0 → 100644
+28 −0
Original line number Diff line number Diff line 
# Copyright 2013 The Android Open Source Project

#

LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)



LOCAL_SRC_FILES := $(call all-subdir-java-files)

LOCAL_MODULE := wm

include $(BUILD_JAVA_LIBRARY)



include $(CLEAR_VARS)



NOTICE_FILE := NOTICE

files_noticed := bin/wm



# Generate rules for a single file. The argument is the file path relative to

# the installation root

define make-notice-file



$(TARGET_OUT_NOTICE_FILES)/src/$(1).txt: $(LOCAL_PATH)/$(NOTICE_FILE)

	@echo Notice file: $$< -- $$@

	@mkdir -p $$(dir $$@)

	@cat $$< >> $$@



$(TARGET_OUT_NOTICE_FILES)/hash-timestamp: $(TARGET_OUT_NOTICE_FILES)/src/$(1).txt



endef



$(foreach file,$(files_noticed),$(eval $(call make-notice-file,$(file))))

cmds/wm/MODULE_LICENSE_APACHE2

0 → 100644
+0 −0

Empty file added.

cmds/wm/NOTICE

0 → 100644
+190 −0
Original line number Diff line number Diff line 


   Copyright (c) 2005-2008, 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.



   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.





                                 Apache License

                           Version 2.0, January 2004

                        http://www.apache.org/licenses/



   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION



   1. Definitions.



      "License" shall mean the terms and conditions for use, reproduction,

      and distribution as defined by Sections 1 through 9 of this document.



      "Licensor" shall mean the copyright owner or entity authorized by

      the copyright owner that is granting the License.



      "Legal Entity" shall mean the union of the acting entity and all

      other entities that control, are controlled by, or are under common

      control with that entity. For the purposes of this definition,

      "control" means (i) the power, direct or indirect, to cause the

      direction or management of such entity, whether by contract or

      otherwise, or (ii) ownership of fifty percent (50%) or more of the

      outstanding shares, or (iii) beneficial ownership of such entity.



      "You" (or "Your") shall mean an individual or Legal Entity

      exercising permissions granted by this License.



      "Source" form shall mean the preferred form for making modifications,

      including but not limited to software source code, documentation

      source, and configuration files.



      "Object" form shall mean any form resulting from mechanical

      transformation or translation of a Source form, including but

      not limited to compiled object code, generated documentation,

      and conversions to other media types.



      "Work" shall mean the work of authorship, whether in Source or

      Object form, made available under the License, as indicated by a

      copyright notice that is included in or attached to the work

      (an example is provided in the Appendix below).



      "Derivative Works" shall mean any work, whether in Source or Object

      form, that is based on (or derived from) the Work and for which the

      editorial revisions, annotations, elaborations, or other modifications

      represent, as a whole, an original work of authorship. For the purposes

      of this License, Derivative Works shall not include works that remain

      separable from, or merely link (or bind by name) to the interfaces of,

      the Work and Derivative Works thereof.



      "Contribution" shall mean any work of authorship, including

      the original version of the Work and any modifications or additions

      to that Work or Derivative Works thereof, that is intentionally

      submitted to Licensor for inclusion in the Work by the copyright owner

      or by an individual or Legal Entity authorized to submit on behalf of

      the copyright owner. For the purposes of this definition, "submitted"

      means any form of electronic, verbal, or written communication sent

      to the Licensor or its representatives, including but not limited to

      communication on electronic mailing lists, source code control systems,

      and issue tracking systems that are managed by, or on behalf of, the

      Licensor for the purpose of discussing and improving the Work, but

      excluding communication that is conspicuously marked or otherwise

      designated in writing by the copyright owner as "Not a Contribution."



      "Contributor" shall mean Licensor and any individual or Legal Entity

      on behalf of whom a Contribution has been received by Licensor and

      subsequently incorporated within the Work.



   2. Grant of Copyright License. Subject to the terms and conditions of

      this License, each Contributor hereby grants to You a perpetual,

      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

      copyright license to reproduce, prepare Derivative Works of,

      publicly display, publicly perform, sublicense, and distribute the

      Work and such Derivative Works in Source or Object form.



   3. Grant of Patent License. Subject to the terms and conditions of

      this License, each Contributor hereby grants to You a perpetual,

      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

      (except as stated in this section) patent license to make, have made,

      use, offer to sell, sell, import, and otherwise transfer the Work,

      where such license applies only to those patent claims licensable

      by such Contributor that are necessarily infringed by their

      Contribution(s) alone or by combination of their Contribution(s)

      with the Work to which such Contribution(s) was submitted. If You

      institute patent litigation against any entity (including a

      cross-claim or counterclaim in a lawsuit) alleging that the Work

      or a Contribution incorporated within the Work constitutes direct

      or contributory patent infringement, then any patent licenses

      granted to You under this License for that Work shall terminate

      as of the date such litigation is filed.



   4. Redistribution. You may reproduce and distribute copies of the

      Work or Derivative Works thereof in any medium, with or without

      modifications, and in Source or Object form, provided that You

      meet the following conditions:



      (a) You must give any other recipients of the Work or

          Derivative Works a copy of this License; and



      (b) You must cause any modified files to carry prominent notices

          stating that You changed the files; and



      (c) You must retain, in the Source form of any Derivative Works

          that You distribute, all copyright, patent, trademark, and

          attribution notices from the Source form of the Work,

          excluding those notices that do not pertain to any part of

          the Derivative Works; and



      (d) If the Work includes a "NOTICE" text file as part of its

          distribution, then any Derivative Works that You distribute must

          include a readable copy of the attribution notices contained

          within such NOTICE file, excluding those notices that do not

          pertain to any part of the Derivative Works, in at least one

          of the following places: within a NOTICE text file distributed

          as part of the Derivative Works; within the Source form or

          documentation, if provided along with the Derivative Works; or,

          within a display generated by the Derivative Works, if and

          wherever such third-party notices normally appear. The contents

          of the NOTICE file are for informational purposes only and

          do not modify the License. You may add Your own attribution

          notices within Derivative Works that You distribute, alongside

          or as an addendum to the NOTICE text from the Work, provided

          that such additional attribution notices cannot be construed

          as modifying the License.



      You may add Your own copyright statement to Your modifications and

      may provide additional or different license terms and conditions

      for use, reproduction, or distribution of Your modifications, or

      for any such Derivative Works as a whole, provided Your use,

      reproduction, and distribution of the Work otherwise complies with

      the conditions stated in this License.



   5. Submission of Contributions. Unless You explicitly state otherwise,

      any Contribution intentionally submitted for inclusion in the Work

      by You to the Licensor shall be under the terms and conditions of

      this License, without any additional terms or conditions.

      Notwithstanding the above, nothing herein shall supersede or modify

      the terms of any separate license agreement you may have executed

      with Licensor regarding such Contributions.



   6. Trademarks. This License does not grant permission to use the trade

      names, trademarks, service marks, or product names of the Licensor,

      except as required for reasonable and customary use in describing the

      origin of the Work and reproducing the content of the NOTICE file.



   7. Disclaimer of Warranty. Unless required by applicable law or

      agreed to in writing, Licensor provides the Work (and each

      Contributor provides its Contributions) on an "AS IS" BASIS,

      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or

      implied, including, without limitation, any warranties or conditions

      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A

      PARTICULAR PURPOSE. You are solely responsible for determining the

      appropriateness of using or redistributing the Work and assume any

      risks associated with Your exercise of permissions under this License.



   8. Limitation of Liability. In no event and under no legal theory,

      whether in tort (including negligence), contract, or otherwise,

      unless required by applicable law (such as deliberate and grossly

      negligent acts) or agreed to in writing, shall any Contributor be

      liable to You for damages, including any direct, indirect, special,

      incidental, or consequential damages of any character arising as a

      result of this License or out of the use or inability to use the

      Work (including but not limited to damages for loss of goodwill,

      work stoppage, computer failure or malfunction, or any and all

      other commercial damages or losses), even if such Contributor

      has been advised of the possibility of such damages.



   9. Accepting Warranty or Additional Liability. While redistributing

      the Work or Derivative Works thereof, You may choose to offer,

      and charge a fee for, acceptance of support, warranty, indemnity,

      or other liability obligations and/or rights consistent with this

      License. However, in accepting such obligations, You may act only

      on Your own behalf and on Your sole responsibility, not on behalf

      of any other Contributor, and only if You agree to indemnify,

      defend, and hold each Contributor harmless for any liability

      incurred by, or claims asserted against, such Contributor by reason

      of your accepting any such warranty or additional liability.



   END OF TERMS AND CONDITIONS