am 753a00e0: am 06ddf97c: am e8a868f2: Merge "Add SIM notification pop-ups." into lmp-mr1-dev

* commit '753a00e057201ad319bf85487beb1c6329bf1a05': Add SIM notification pop-ups.
2014-12-05 00:14:10 +00:00
parent 1324cb3561 753a00e057
commit 2b2019255e
5 changed files with 358 additions and 3 deletions
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2038,6 +2038,15 @@
                android:resource="@id/sim_settings" />
        </activity>

+        <activity android:name=".sim.SimDialogActivity"
+                android:theme="@android:style/Theme.Material.Light.Dialog.NoActionBar"
+                android:label="@string/sim_settings_title">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
        <provider
            android:name=".search.SettingsSearchIndexablesProvider"
            android:authorities="com.android.settings"