am f95f2590: am 0f4254fa: am 26104298: Merge "Adding Sim Status menu to Settings." into lmp-mr1-dev

* commit 'f95f2590c1ea6023c9c88d6fb031d622a609df2a':
  Adding Sim Status menu to Settings.
This commit is contained in:
PauloftheWest
2014-11-14 00:43:19 +00:00
committed by Android Git Automerger
5 changed files with 567 additions and 0 deletions

View File

@@ -1179,6 +1179,18 @@
</intent-filter>
</activity>
<!-- Runs in the phone process since it needs access to the Phone object -->
<activity android:name=".deviceinfo.SimStatus"
android:label="@string/sim_status_title"
android:theme="@style/Theme.SubSettingsDialogWhenLarge"
android:process="com.android.phone">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.VOICE_LAUNCH" />
</intent-filter>
</activity>
<!-- Runs in the phone process since it needs access to the Phone object -->
<activity android:name=".deviceinfo.ImeiInformation"
android:label="@string/imei_information_title"