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

Commit cf89f23e authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Settings: OSS build is failing."

parents 7aae8a8f 93504a08

Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ LOCAL_PACKAGE_NAME := Settings 
LOCAL_CERTIFICATE := platform

LOCAL_PRIVILEGED_MODULE := true



LOCAL_JAVA_LIBRARIES += qcrilhook

LOCAL_PROGUARD_FLAG_FILES := proguard.flags



include frameworks/opt/setupwizard/navigationbar/common.mk

AndroidManifest.xml

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

            android:allowBackup="false">



      <uses-library

            android:name="com.qualcomm.qcrilhook"

            android:required="true" />



      <!-- screen color Settings Controls -->

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

            android:configChanges="orientation|keyboardHidden|screenSize"
@@ -1603,26 +1599,6 @@ 
            </intent-filter>

        </receiver>



       <activity

            android:name="FactoryTest"

            android:clearTaskOnLaunch="true"

            android:configChanges="orientation|screenSize"

            android:label="@string/factory_test_info"

            android:parentActivityName="Settings" />

        <activity

            android:name="NetworkDebugInfoActivity"

            android:clearTaskOnLaunch="true"

            android:configChanges="orientation|screenSize"

            android:label="@string/factory_test_info"

            android:parentActivityName="Settings" />



        <receiver android:name="FactoryTestBroadcastReceiver" >

            <intent-filter>

                <action android:name="android.provider.Telephony.SECRET_CODE" />

                <data  android:scheme="android_secret_code" android:host="38378"/>

            </intent-filter>

        </receiver>



        <service android:name=".wifi.HotsoptService" >

            <intent-filter>

                <action android:name="com.android.settings.wifi.HotsoptService" />

res/values/strings.xml

+0 −13
Original line number Diff line number Diff line
@@ -6200,19 +6200,6 @@ 
    <!-- hotsopt working mode title-->

    <string name="wifi_hotsopt_mode_title">Keep WiFi Hotspot on</string>

    <string name="factory_test_info">Factory test</string>

    <string name="factory_test">Factory test mode</string>

    <string name="network_debug_info">Network debug info</string>

    <string name="info_pn">PN</string>

    <string name="info_channel">Channel</string>

    <string name="info_band">Band Class</string>

    <string name="info_rssi">RSSI</string>

    <string name="info_rx_agc">RX AGC</string>

    <string name="info_rx_dbm">RX dbm</string>

    <string name="info_tx_agc">TX AGC</string>

    <string name="info_tx_dbm">TX dbm</string>

    <string name="info_sid">SID</string>

    <string name="info_nid">NID</string>

    <string name="info_ec_io">EC/io</string>

    <string name="secure_deactivate_device">Go to Secure to deactivate Device Admin</string>

    <string name="wifi_auto_connect_type_title">Auto connect type</string>

    <string name="wifi_auto_connect_type_summary">Specify network connection type</string>

res/xml/factory_test.xml

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



<!--

    Copyright (c) 2014, The Linux Foundation. All rights reserved.



    Redistribution and use in source and binary forms, with or without

    modification, are permitted provided that the following conditions are

    met:

        * Redistributions of source code must retain the above copyright

          notice, this list of conditions and the following disclaimer.

        * Redistributions in binary form must reproduce the above

          copyright notice, this list of conditions and the following

          disclaimer in the documentation and/or other materials provided

          with the distribution.

        * Neither the name of The Linux Foundation nor the names of its

          contributors may be used to endorse or promote products derived

          from this software without specific prior written permission.



    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED

    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF

    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT

    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS

    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR

    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,

    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE

    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN

    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-->



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



    <PreferenceScreen android:title="@string/factory_test" >

        <intent

            android:action="android.intent.action.MAIN"

            android:targetClass="com.qti.factory.Framework.Framework"

            android:targetPackage="com.qti.factory" />

    </PreferenceScreen>

    <PreferenceScreen android:title="@string/network_debug_info" >

        <intent

            android:action="android.intent.action.MAIN"

            android:targetClass="com.android.settings.NetworkDebugInfoActivity"

            android:targetPackage="com.android.settings" />

    </PreferenceScreen>



</PreferenceScreen>

res/xml/network_debug_info.xml

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

<!--

    Copyright (c) 2014, The Linux Foundation. All rights reserved.



    Redistribution and use in source and binary forms, with or without

    modification, are permitted provided that the following conditions are

    met:

        * Redistributions of source code must retain the above copyright

          notice, this list of conditions and the following disclaimer.

        * Redistributions in binary form must reproduce the above

          copyright notice, this list of conditions and the following

          disclaimer in the documentation and/or other materials provided

          with the distribution.

        * Neither the name of The Linux Foundation nor the names of its

          contributors may be used to endorse or promote products derived

          from this software without specific prior written permission.



    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED

    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF

    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT

    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS

    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR

    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,

    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE

    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN

    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-->

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



    <Preference

        android:key="info_pn"

        android:title="@string/info_pn" />

    <Preference

        android:key="info_channel"

        android:title="@string/info_channel" />

    <Preference

        android:key="info_band"

        android:title="@string/info_band" />

    <Preference

        android:key="info_rssi"

        android:title="@string/info_rssi" />

    <Preference

        android:key="info_rx_agc"

        android:title="@string/info_rx_agc" />

    <Preference

        android:key="info_rx_dbm"

        android:title="@string/info_rx_dbm" />

    <Preference

        android:key="info_tx_agc"

        android:title="@string/info_tx_agc" />

    <Preference

        android:key="info_tx_dbm"

        android:title="@string/info_tx_dbm" />

    <Preference

        android:key="info_sid"

        android:title="@string/info_sid" />

    <Preference

        android:key="info_nid"

        android:title="@string/info_nid" />

    <Preference

        android:key="info_ec_io"

        android:title="@string/info_ec_io" />



</PreferenceScreen>