commit 3663afe2e1afb109e117e5b707e8ed9547ed2103
author Andrew Lee <anwlee@google.com> Sun Oct 04 01:31:28 2015 -0700
committer Andrew Lee <anwlee@google.com> Wed Oct 07 15:39:57 2015 -0700
tree 0442bd232e46d006912366ff169142aa961d0c16
parent 41bf2e4c8c9793d2f218ce1d1835bfa957ba53e4

Combine blocked number fragments into Activity.

Mocks indicate that after adding, the user should be returned to
the management UI and the snackbar should be shown there. This is
kind of pain to do across fragments in different activities. To
help address this, make one Activity the parent of both the blocked
number manage and add/search UI. This also makes sense in terms of
logical organization.

Bug: 24134038
Change-Id: I682342a73c964a5d4eb90469f10d6584b85400f1

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 94333eb..f85f25e 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -142,17 +142,17 @@
         </activity>
 
         <activity android:name="com.android.dialer.settings.DialerSettingsActivity"
-                  android:label="@string/dialer_settings_label"
-                  android:parentActivityName="com.android.dialer.DialtactsActivity"
-                  android:theme="@style/SettingsStyle"
-                  android:exported="false">
+              android:label="@string/dialer_settings_label"
+              android:parentActivityName="com.android.dialer.DialtactsActivity"
+              android:theme="@style/SettingsStyle"
+              android:exported="false">
         </activity>
 
-        <activity android:name="com.android.dialer.filterednumber.BlockedNumberSearchActivity"
-            android:label="@string/dialer_settings_label"
+        <activity android:name="com.android.dialer.filterednumber.ManageBlockedNumbersActivity"
+            android:label="@string/manage_blocked_numbers_label"
             android:parentActivityName="com.android.dialer.settings.DialerSettingsActivity"
-            android:theme="@style/DialtactsActivityTheme"
-            android:windowSoftInputMode="stateVisible">
+            android:theme="@style/ManageBlockedNumbersStyle"
+            android:exported="false">
         </activity>
 
         <activity android:name="com.android.dialer.calllog.CallLogActivity"
@@ -162,11 +162,9 @@
         </activity>
 
         <activity android:name="com.android.dialer.CallDetailActivity"
-                  android:label="@string/callDetailTitle"
-                  android:theme="@style/CallDetailActivityTheme"
-                  android:icon="@mipmap/ic_launcher_phone"
-                  android:parentActivityName="com.android.dialer.calllog.CallLogActivity"
-            >
+            android:label="@string/callDetailTitle"
+            android:theme="@style/CallDetailActivityTheme"
+            android:icon="@mipmap/ic_launcher_phone">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"/>
                 <category android:name="android.intent.category.DEFAULT"/>