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

Commit 7390f58e authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Rename PostureHelper to PostureDeviceStateConverter" into main

parents 5879f8d0 1493cfd0

src/com/android/settings/display/DeviceStateAutoRotateSettingManagerProvider.kt

+5 −3
Original line number Diff line number Diff line
@@ -18,14 +18,13 @@ package com.android.settings.display 


import android.content.Context

import android.hardware.devicestate.DeviceStateManager

import android.os.Build

import android.os.Handler

import android.os.Looper

import com.android.internal.annotations.VisibleForTesting

import com.android.settingslib.devicestate.AndroidSecureSettings

import com.android.settingslib.devicestate.DeviceStateAutoRotateSettingManager

import com.android.settingslib.devicestate.DeviceStateAutoRotateSettingManagerProvider.createInstance

import com.android.settingslib.devicestate.PosturesHelper

import com.android.settingslib.devicestate.PostureDeviceStateConverter

import com.android.settingslib.utils.ThreadUtils

import com.android.window.flags.Flags
@@ -48,7 +47,10 @@ object DeviceStateAutoRotateSettingManagerProvider { 
            ThreadUtils.getBackgroundExecutor(),

            AndroidSecureSettings(context.contentResolver),

            Handler(Looper.getMainLooper()),

            PosturesHelper(context, context.getSystemService(DeviceStateManager::class.java))

            PostureDeviceStateConverter(

                context,

                context.getSystemService(DeviceStateManager::class.java)

            )

        ).also {

            nullableSingletonSettingManager = it

        }

tests/robotests/src/com/android/settings/display/DeviceStateAutoRotateDetailsFragmentTest.java

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ public class DeviceStateAutoRotateDetailsFragmentTest { 
        when(mContext.getResources()).thenReturn(mResources);

    }



    // Sets up posture mappings for PosturesHelper

    // Sets up posture mappings for PostureDeviceStateConverter

    private void setUpPostureMappings() {

        when(mResources.getIntArray(

                com.android.internal.R.array.config_foldedDeviceStates)).thenReturn(

tests/robotests/src/com/android/settings/display/SmartAutoRotatePreferenceFragmentTest.java

+1 −1
Original line number Diff line number Diff line
@@ -266,7 +266,7 @@ public class SmartAutoRotatePreferenceFragmentTest { 
        when(mContext.getResources()).thenReturn(mResources);

    }



    // Sets up posture mappings for PosturesHelper

    // Sets up posture mappings for PostureDeviceStateConverter

    private void setUpPostureMappings() {

        when(mResources.getIntArray(

                com.android.internal.R.array.config_foldedDeviceStates)).thenReturn(