From 59b1a51d8a0be236f08a841fac21fcc79613d0ef Mon Sep 17 00:00:00 2001 From: zachh Date: Tue, 12 Jun 2018 09:55:21 -0700 Subject: Reorganized activities in manifests. Bug: 109931227 Test: manual PiperOrigin-RevId: 200232293 Change-Id: Id82ce87014a2a16b6b27398b7de2019e96c5d95b --- .../app/manifests/activities/AndroidManifest.xml | 93 ++-------------------- .../main/impl/AndroidManifest-withoutActivity.xml | 17 ++++ .../android/dialer/main/impl/AndroidManifest.xml | 79 ++++++++++++++++++ 3 files changed, 103 insertions(+), 86 deletions(-) create mode 100644 java/com/android/dialer/main/impl/AndroidManifest-withoutActivity.xml diff --git a/java/com/android/dialer/app/manifests/activities/AndroidManifest.xml b/java/com/android/dialer/app/manifests/activities/AndroidManifest.xml index edf0f1c8c..779687727 100644 --- a/java/com/android/dialer/app/manifests/activities/AndroidManifest.xml +++ b/java/com/android/dialer/app/manifests/activities/AndroidManifest.xml @@ -17,101 +17,22 @@ Google Dialer. TODO: Need to stop subclassing activities and move this back into the main manifest file. --> + package="com.android.dialer.app"> + android:name="com.android.dialer.app.settings.DialerSettingsActivity" + android:exported="false" + android:label="@string/dialer_settings_label" + android:parentActivityName="com.android.dialer.main.impl.MainActivity" + android:theme="@style/SettingsStyle"> - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/java/com/android/dialer/main/impl/AndroidManifest-withoutActivity.xml b/java/com/android/dialer/main/impl/AndroidManifest-withoutActivity.xml new file mode 100644 index 000000000..c273a579d --- /dev/null +++ b/java/com/android/dialer/main/impl/AndroidManifest-withoutActivity.xml @@ -0,0 +1,17 @@ + + + diff --git a/java/com/android/dialer/main/impl/AndroidManifest.xml b/java/com/android/dialer/main/impl/AndroidManifest.xml index 064390707..a1ed5eb9e 100644 --- a/java/com/android/dialer/main/impl/AndroidManifest.xml +++ b/java/com/android/dialer/main/impl/AndroidManifest.xml @@ -20,6 +20,8 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3