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

Commit 70b47859 authored by Youhan Wang's avatar Youhan Wang Committed by android-build-merger
Browse files

DO NOT MERGE OMADM Trigger in *#*#INFO#*#* hidden menu. 

am: d9b3709f

Change-Id: I4f10d79d7dcd29a59c1ac0823f394cbb3e76256d
parents 1fed0c6a d9b3709f

AndroidManifest.xml

+3 −0
Original line number Diff line number Diff line
@@ -6,6 +6,9 @@ 


    <original-package android:name="com.android.settings" />



    <protected-broadcast android:name="com.android.settings.CARRIER_PROVISIONING" />

    <protected-broadcast android:name="com.android.settings.TRIGGER_CARRIER_PROVISIONING" />



    <uses-permission android:name="android.permission.WRITE_MEDIA_STORAGE" />

    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

res/layout/radio_info.xml

+18 −0
Original line number Diff line number Diff line
@@ -302,5 +302,23 @@ 
                      android:textSize="12sp" />

        </LinearLayout>



        <!-- Carrier Provisioning -->

        <LinearLayout style="@style/entry_layout">

            <Button android:id="@+id/carrier_provisioning"

                    android:textSize="14sp"

                    android:layout_marginTop="8dip"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:text="@string/carrier_provisioning"

            />

            <Button android:id="@+id/trigger_carrier_provisioning"

                    android:textSize="14sp"

                    android:layout_marginTop="8dip"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:text="@string/trigger_carrier_provisioning"

            />

        </LinearLayout>



    </LinearLayout>

</ScrollView>

res/values/strings.xml

+6 −0
Original line number Diff line number Diff line
@@ -7875,4 +7875,10 @@ 








    <!-- Warning when activating the automatic storage manager on legacy devices. [CHAR LIMIT=NONE] -->









    <string name="automatic_storage_manager_activation_warning">Your storage is now being managed by the storage manager</string>

















    <!-- Carrier Provisioning Info [CHAR LIMIT=NONE] -->









    <string name="carrier_provisioning">Carrier Provisioning Info</string>









    <!-- Trigger Carrier Provisioning [CHAR LIMIT=NONE] -->









    <string name="trigger_carrier_provisioning">Trigger Carrier Provisioning</string>

















</resources>

























src/com/android/settings/RadioInfo.java



+23
−0






























Original line number
Diff line number
Diff line







@@ -195,6 +195,8 @@ public class RadioInfo extends Activity {







    private Button updateSmscButton;









    private Button refreshSmscButton;









    private Button oemInfoButton;









    private Button carrierProvisioningButton;









    private Button triggercarrierProvisioningButton;









    private Switch imsVolteProvisionedSwitch;









    private Switch imsVtProvisionedSwitch;









    private Switch imsWfcProvisionedSwitch;








@@ -414,6 +416,11 @@ public class RadioInfo extends Activity {







        refreshSmscButton.setOnClickListener(mRefreshSmscButtonHandler);









        dnsCheckToggleButton = (Button) findViewById(R.id.dns_check_toggle);









        dnsCheckToggleButton.setOnClickListener(mDnsCheckButtonHandler);









        carrierProvisioningButton = (Button) findViewById(R.id.carrier_provisioning);









        carrierProvisioningButton.setOnClickListener(mCarrierProvisioningButtonHandler);









        triggercarrierProvisioningButton = (Button) findViewById(R.id.trigger_carrier_provisioning);









        triggercarrierProvisioningButton.setOnClickListener(









                mTriggerCarrierProvisioningButtonHandler);



















        oemInfoButton = (Button) findViewById(R.id.oem_info);









        oemInfoButton.setOnClickListener(mOemInfoButtonHandler);








@@ -1295,6 +1302,22 @@ public class RadioInfo extends Activity {







        }









    };



















    OnClickListener mCarrierProvisioningButtonHandler = new OnClickListener() {









        public void onClick(View v) {









            Intent intent = new Intent("com.android.settings.CARRIER_PROVISIONING");









            getApplicationContext().sendBroadcast(









                    intent, android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE);









        }









    };



















    OnClickListener mTriggerCarrierProvisioningButtonHandler = new OnClickListener() {









        public void onClick(View v) {









            Intent intent = new Intent("com.android.settings.TRIGGER_CARRIER_PROVISIONING");









            getApplicationContext().sendBroadcast(









                    intent, android.Manifest.permission.MODIFY_PHONE_STATE);









        }









    };



















    AdapterView.OnItemSelectedListener mPreferredNetworkHandler =









            new AdapterView.OnItemSelectedListener() {