PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: d9b3709fc1

Change-Id: I4f10d79d7dcd29a59c1ac0823f394cbb3e76256d
This commit is contained in:
Youhan Wang
2016-12-21 00:37:24 +00:00
committed by android-build-merger
parent 1fed0c6ae7 d9b3709fc1
commit 70b47859fa
4 changed files with 50 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
AndroidManifest.xml
View File

@@ -6,6 +6,9 @@
<original-package android:name="com.android.settings" /> <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_MEDIA_STORAGE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

18
res/layout/radio_info.xml
View File

@@ -302,5 +302,23 @@
android:textSize="12sp" /> android:textSize="12sp" />
</LinearLayout> </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> </LinearLayout>
</ScrollView> </ScrollView>

6
res/values/strings.xml
View File

@@ -7875,4 +7875,10 @@
<!-- Warning when activating the automatic storage manager on legacy devices. [CHAR LIMIT=NONE] --> <!-- 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> <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> </resources>

23
src/com/android/settings/RadioInfo.java
View File

@@ -195,6 +195,8 @@ public class RadioInfo extends Activity {
private Button updateSmscButton; private Button updateSmscButton;
private Button refreshSmscButton; private Button refreshSmscButton;
private Button oemInfoButton; private Button oemInfoButton;
private Button carrierProvisioningButton;
private Button triggercarrierProvisioningButton;
private Switch imsVolteProvisionedSwitch; private Switch imsVolteProvisionedSwitch;
private Switch imsVtProvisionedSwitch; private Switch imsVtProvisionedSwitch;
private Switch imsWfcProvisionedSwitch; private Switch imsWfcProvisionedSwitch;
@@ -414,6 +416,11 @@ public class RadioInfo extends Activity {
refreshSmscButton.setOnClickListener(mRefreshSmscButtonHandler); refreshSmscButton.setOnClickListener(mRefreshSmscButtonHandler);
dnsCheckToggleButton = (Button) findViewById(R.id.dns_check_toggle); dnsCheckToggleButton = (Button) findViewById(R.id.dns_check_toggle);
dnsCheckToggleButton.setOnClickListener(mDnsCheckButtonHandler); 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 = (Button) findViewById(R.id.oem_info);
oemInfoButton.setOnClickListener(mOemInfoButtonHandler); 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 = AdapterView.OnItemSelectedListener mPreferredNetworkHandler =
new AdapterView.OnItemSelectedListener() { new AdapterView.OnItemSelectedListener() {