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

Commit 1e980081 authored by Daniel Norman's avatar Daniel Norman Committed by Android (Google) Code Review
Browse files

Merge "Moves BrightnessUtils into SettingsLib DisplayUtils."

parents 55bfed58 7bfe5736

packages/SettingsLib/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ android_library { 
        "SettingsLibAdaptiveIcon",

        "SettingsLibRadioButtonPreference",

        "SettingsLibSelectorWithWidgetPreference",

        "SettingsLibDisplayDensityUtils",

        "SettingsLibDisplayUtils",

        "SettingsLibUtils",

        "SettingsLibEmergencyNumber",

        "SettingsLibTopIntroPreference",

packages/SettingsLib/DisplayDensityUtils/AndroidManifest.xml

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2019 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.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ 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.

  -->



<manifest xmlns:android="http://schemas.android.com/apk/res/android"

          package="com.android.settingslib.display">



</manifest>

packages/SettingsLib/DisplayDensityUtils/Android.bp→packages/SettingsLib/DisplayUtils/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ package { 
}



android_library {

    name: "SettingsLibDisplayDensityUtils",

    name: "SettingsLibDisplayUtils",



    srcs: ["src/**/*.java"],

packages/SettingsLib/DisplayUtils/AndroidManifest.xml

0 → 100644
+21 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  Copyright (C) 2019 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.

  You may obtain a copy of the License at



       http://www.apache.org/licenses/LICENSE-2.0



  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.

  -->



<manifest xmlns:android="http://schemas.android.com/apk/res/android"

          package="com.android.settingslib.display">



</manifest>

packages/SettingsLib/src/com/android/settingslib/display/BrightnessUtils.java→packages/SettingsLib/DisplayUtils/src/com/android/settingslib/display/BrightnessUtils.java

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.settingslib.display; 


import android.util.MathUtils;



/** Utility methods for calculating the display brightness. */

public class BrightnessUtils {



    public static final int GAMMA_SPACE_MIN = 0;