diff options
3 files changed, 59 insertions, 2 deletions
diff --git a/java/com/android/dialer/app/settings/DialerSettingsActivity.java b/java/com/android/dialer/app/settings/DialerSettingsActivity.java index fbd6f4808..641095512 100644 --- a/java/com/android/dialer/app/settings/DialerSettingsActivity.java +++ b/java/com/android/dialer/app/settings/DialerSettingsActivity.java @@ -35,7 +35,6 @@ import android.widget.Toast; import com.android.dialer.about.AboutPhoneFragment; import com.android.dialer.app.R; import com.android.dialer.assisteddialing.ConcreteCreator; -import com.android.dialer.assisteddialing.ui.AssistedDialingSettingFragment; import com.android.dialer.blocking.FilteredNumberCompat; import com.android.dialer.common.LogUtil; import com.android.dialer.compat.telephony.TelephonyManagerCompat; @@ -170,7 +169,8 @@ public class DialerSettingsActivity extends AppCompatPreferenceActivity { Header assistedDialingSettingsHeader = new Header(); assistedDialingSettingsHeader.titleRes = com.android.dialer.assisteddialing.ui.R.string.assisted_dialing_setting_title; - assistedDialingSettingsHeader.fragment = AssistedDialingSettingFragment.class.getName(); + assistedDialingSettingsHeader.intent = + new Intent("com.android.dialer.app.settings.SHOW_ASSISTED_DIALING_SETTINGS"); target.add(assistedDialingSettingsHeader); } diff --git a/java/com/android/dialer/assisteddialing/ui/AndroidManifest.xml b/java/com/android/dialer/assisteddialing/ui/AndroidManifest.xml index 724874750..5266b1376 100644 --- a/java/com/android/dialer/assisteddialing/ui/AndroidManifest.xml +++ b/java/com/android/dialer/assisteddialing/ui/AndroidManifest.xml @@ -19,4 +19,17 @@ android:minSdkVersion="23" android:targetSdkVersion="24"/> + <application> + <activity + android:label="@string/assisted_dialing_setting_title" + android:name=".AssistedDialingSettingActivity" + android:parentActivityName="com.android.dialer.app.settings.DialerSettingsActivity" + android:theme="@style/SettingsStyle"> + <intent-filter> + <action android:name="com.android.dialer.app.settings.SHOW_ASSISTED_DIALING_SETTINGS"/> + <category android:name="android.intent.category.DEFAULT"/> + </intent-filter> + </activity> + </application> + </manifest>
\ No newline at end of file diff --git a/java/com/android/dialer/assisteddialing/ui/AssistedDialingSettingActivity.java b/java/com/android/dialer/assisteddialing/ui/AssistedDialingSettingActivity.java new file mode 100644 index 000000000..ca36745b3 --- /dev/null +++ b/java/com/android/dialer/assisteddialing/ui/AssistedDialingSettingActivity.java @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.dialer.assisteddialing.ui; + +import android.os.Bundle; +import android.support.v7.app.AppCompatActivity; +import android.view.MenuItem; + +/** The Settings Activity for Assisted Dialing. */ +public class AssistedDialingSettingActivity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle bundle) { + super.onCreate(bundle); + + getFragmentManager() + .beginTransaction() + .replace(android.R.id.content, new AssistedDialingSettingFragment()) + .commit(); + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + if (item.getItemId() == android.R.id.home) { + onBackPressed(); + return true; + } + return super.onOptionsItemSelected(item); + } +} |