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

Commit caef7818 authored by Roy Chou's avatar Roy Chou Committed by Automerger Merge Worker
Browse files

Merge "chore(#AlwaysOnMagnification): hardcode the feature flag default true"... 

Merge "chore(#AlwaysOnMagnification): hardcode the feature flag default true" into udc-dev am: 419aa759

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23195159



Change-Id: I8c70a7c663f007d6176a8e7731cef96844ba3d25
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2820ef3c 419aa759

core/res/res/values/config.xml

+4 −0
Original line number Original line Diff line number Diff line
@@ -3718,6 +3718,10 @@ 
         magnification settings and adjust the default magnification capability.  -->

         magnification settings and adjust the default magnification capability.  -->

    <bool name="config_magnification_area">true</bool>

    <bool name="config_magnification_area">true</bool>





    <!-- The default value for always on magnification feature flag if the remote feature

         flag does not exist -->

    <bool name="config_magnification_always_on_enabled">true</bool>



    <!-- If true, the display will be shifted around in ambient mode. -->

    <!-- If true, the display will be shifted around in ambient mode. -->

    <bool name="config_enableBurnInProtection">false</bool>

    <bool name="config_enableBurnInProtection">false</bool>

core/res/res/values/symbols.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -4536,6 +4536,7 @@ 
  <java-symbol type="string" name="dismiss_action" />

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





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

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

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





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

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

  <!-- FullScreenMagnification thumbnail -->

  <!-- FullScreenMagnification thumbnail -->

services/accessibility/java/com/android/server/accessibility/magnification/AlwaysOnMagnificationFeatureFlag.java

+11 −1
Original line number Original line Diff line number Diff line
@@ -16,6 +16,8 @@ 




package com.android.server.accessibility.magnification;

package com.android.server.accessibility.magnification;





import android.annotation.NonNull;

import android.content.Context;

import android.provider.DeviceConfig;

import android.provider.DeviceConfig;





/**

/**
@@ -29,6 +31,13 @@ public class AlwaysOnMagnificationFeatureFlag extends MagnificationFeatureFlagBa 
    private static final String FEATURE_NAME_ENABLE_ALWAYS_ON_MAGNIFICATION =

    private static final String FEATURE_NAME_ENABLE_ALWAYS_ON_MAGNIFICATION =

            "AlwaysOnMagnifier__enable_always_on_magnifier";

            "AlwaysOnMagnifier__enable_always_on_magnifier";





    private @NonNull Context mContext;



    AlwaysOnMagnificationFeatureFlag(@NonNull Context context) {

        super();

        mContext = context;

    }



    @Override

    @Override

    String getNamespace() {

    String getNamespace() {

        return NAMESPACE;

        return NAMESPACE;
@@ -41,6 +50,7 @@ public class AlwaysOnMagnificationFeatureFlag extends MagnificationFeatureFlagBa 




    @Override

    @Override

    boolean getDefaultValue() {

    boolean getDefaultValue() {

        return false;

        return mContext.getResources().getBoolean(

                com.android.internal.R.bool.config_magnification_always_on_enabled);

    }

    }

}
 
}

services/accessibility/java/com/android/server/accessibility/magnification/MagnificationController.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -156,7 +156,7 @@ public class MagnificationController implements WindowMagnificationManager.Callb 
        mSupportWindowMagnification = context.getPackageManager().hasSystemFeature(

        mSupportWindowMagnification = context.getPackageManager().hasSystemFeature(

                FEATURE_WINDOW_MAGNIFICATION);

                FEATURE_WINDOW_MAGNIFICATION);





        mAlwaysOnMagnificationFeatureFlag = new AlwaysOnMagnificationFeatureFlag();

        mAlwaysOnMagnificationFeatureFlag = new AlwaysOnMagnificationFeatureFlag(context);

        mAlwaysOnMagnificationFeatureFlag.addOnChangedListener(

        mAlwaysOnMagnificationFeatureFlag.addOnChangedListener(

                mBackgroundExecutor, mAms::updateAlwaysOnMagnification);

                mBackgroundExecutor, mAms::updateAlwaysOnMagnification);

    }

    }