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

Commit 3965264d authored by Diogo Ferreira's avatar Diogo Ferreira Committed by Steve Kondik
Browse files

watermark: Place watermark in the bottom-right when both deltax and deltaty are 0 

The default behavior is to replicate the watermark all over the screen but this can
be too intrusive. The repetition is controlled by deltax and deltay and if they are
both 0 the watermark will actually be drawn off-screen and thus not shown.

We take advantage of this to add a special behavior when they are both 0 that simply
places them in the bottom right. This patch doesn't take UI elements into account and
may actually overlay soft-buttons and other chrome.

Change-Id: I4cff1326b8aaecdbc471eaf48e95bc2865181366
parent 6999138c

services/core/java/com/android/server/wm/Watermark.java

+33 −19
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.graphics.PorterDuff; 
import android.graphics.Rect;

import android.graphics.Typeface;

import android.graphics.Paint.FontMetricsInt;

import android.os.SystemProperties;

import android.util.DisplayMetrics;

import android.util.Log;

import android.util.TypedValue;
@@ -76,6 +77,14 @@ class Watermark { 
            else c2 -= '0';

            builder.append((char)(255-((c1*16)+c2)));

        }



        int appendDisplayVersion = (WindowManagerService.getPropertyInt(tokens, 10,

                TypedValue.COMPLEX_UNIT_PX, 0, dm));

        if (appendDisplayVersion != 0) {

            builder.append(" - ");

            builder.append(SystemProperties.get("ro.cm.display.version"));

        }



        mText = builder.toString();

        if (false) {

            Log.i(WindowManagerService.TAG, "Final text: " + mText);
@@ -149,6 +158,7 @@ class Watermark { 
            if (c != null) {

                c.drawColor(0, PorterDuff.Mode.CLEAR);



                if (mDeltaX != 0 || mDeltaY != 0) {

                    int deltaX = mDeltaX;

                    int deltaY = mDeltaY;
@@ -171,6 +181,10 @@ class Watermark { 
                            y += deltaY;

                        }

                    }

                } else {

                    c.drawText(mText, dw - mTextWidth,

                        dh - mTextHeight*4, mTextPaint);

                }

                mSurface.unlockCanvasAndPost(c);

            }

        }