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

Commit 094913c5 authored by Daniel Bright's avatar Daniel Bright
Browse files

Revert "Move base resources to telephony" 

Revert "Remove overlapping resources"

Revert submission 10319574-telephony_res_cleanup

Reason for revert: build issue
Reverted Changes:
I5caec1dc3: Remove overlapping resources
I6b389f4f1: Move base resources to telephony

Change-Id: Ib42ce5983bb158e6680e5da5fa85faedbcbe0a64
parent 25f1022e

apct-tests/perftests/core/src/android/app/ResourcesPerfTest.java

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ public class ResourcesPerfTest { 
        final BenchmarkState state = mPerfStatusReporter.getBenchmarkState();

        TypedValue value = new TypedValue();

        while (state.keepRunning()) {

            mRes.getValue(com.android.internal.R.string.android_upgrading_apk, value,

            mRes.getValue(com.android.internal.R.string.mmcc_illegal_me, value,

                    false /* resolve_refs */);

        }

    }

core/res/res/layout/sms_short_code_confirmation_dialog.xml

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

<!--

/*

** Copyright 2012 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.

*/

-->



<LinearLayout

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

    android:id="@+id/parentPanel"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_marginLeft="8dip"

    android:layout_marginRight="8dip"

    android:orientation="vertical">



    <TextView android:id="@+id/sms_short_code_confirm_message"

        style="?android:attr/textAppearanceMedium"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:paddingLeft="20dip"

        android:paddingRight="20dip"

        android:paddingTop="16dip"

        android:paddingBottom="16dip" />



    <TableLayout android:id="@+id/sms_short_code_detail_layout"

        android:shrinkColumns="1"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:paddingLeft="16dip"

        android:paddingRight="16dip">



        <TableRow

            android:layout_width="wrap_content"

            android:layout_height="wrap_content" >



            <ImageView android:id="@+id/sms_short_code_coins_icon"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:paddingLeft="8dip"

                android:paddingRight="8dip"

                android:src="@drawable/ic_coins_l" />

            <TextView android:id="@+id/sms_short_code_detail_message"

                android:layout_width="match_parent"

                android:layout_height="wrap_content" />

        </TableRow>



        <TableRow

            android:layout_width="wrap_content"

            android:layout_height="wrap_content" >

            <RelativeLayout android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:paddingTop="12dip"

                android:paddingLeft="8dip" >

            <CheckBox android:id="@+id/sms_short_code_remember_choice_checkbox"

                android:paddingTop="11dip"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content" />

            </RelativeLayout>

            <TextView android:id="@+id/sms_short_code_remember_choice_text"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:paddingTop="18dip"

                android:text="@string/sms_short_code_remember_choice" />

        </TableRow>



        <TableRow

            android:layout_width="wrap_content"

            android:layout_height="wrap_content" >



            <Space android:layout_gravity="fill" />

            <TextView android:id="@+id/sms_short_code_remember_undo_instruction"

                android:paddingTop="10dip"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content" />

        </TableRow>



    </TableLayout>



</LinearLayout>

core/res/res/values-mcc001-mnc01/strings.xml

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

<!--

/* //device/apps/common/assets/res/any/strings.xml

**

** Copyright 2006, 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.

*/

-->

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="mmcc_illegal_me">Phone not allowed MM#6</string>

</resources>

core/res/res/values-mcc001/config.xml

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

<!--

/*

** Copyright 2016, 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.

*/

-->

<resources>

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

</resources>

core/res/res/values-mcc204-mnc04/config.xml

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

<!--

/*

** Copyright 2013, 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 my 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.

*/

-->



<!-- These resources are around just to allow their values to be customized

     for different hardware and product builds. -->

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">



    <!-- Configure mobile network MTU. Carrier specific value is set here.

    -->

    <integer name="config_mobile_mtu">1358</integer>



    <string translatable="false" name="prohibit_manual_network_selection_in_gobal_mode">true;BAE0000000000000</string>

</resources>