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

Commit d303f567 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 93700a07 on remote branch 

Change-Id: Iac685ca46840d4f174b46e2aab3f8d23030b5af4
parents 9594712c 93700a07

Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -15,8 +15,8 @@ LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res 


LOCAL_SRC_FILES += \

        src/com/android/location/XT/IXTSrv.aidl \

        src/com/android/location/XT/IXTSrvCb.aidl \

        src/com/android/display/IPPService.aidl

        src/com/android/location/XT/IXTSrvCb.aidl



LOCAL_PACKAGE_NAME := Settings

LOCAL_CERTIFICATE := platform

LOCAL_PRIVILEGED_MODULE := true

AndroidManifest.xml

+0 −10
Original line number Diff line number Diff line
@@ -87,16 +87,6 @@ 
            android:supportsRtl="true"

            android:allowBackup="false">



      <!-- screen color Settings Controls -->

        <activity android:name=".ScreenColorSettings" android:label="@string/screencolor"

            android:configChanges="orientation|keyboardHidden|screenSize"

            android:screenOrientation="nosensor">

        </activity>

        <activity android:name=".CustomScreenColor" android:label="@string/custom_screencolor"

            android:configChanges="orientation|keyboardHidden|screenSize"

            android:screenOrientation="nosensor">

        </activity>



        <!-- Settings -->



        <activity android:name="Settings"

res/drawable-hdpi/btn_default.9.png

deleted100644 → 0
−1.19 KiB
Loading image diff...

res/drawable-hdpi/btn_default_disabled.9.png

deleted100644 → 0
−1.18 KiB
Loading image diff...

res/drawable-hdpi/btn_default_disabled_focused_holo_dark.9.png

deleted100644 → 0
−421 B
Loading image diff...