diff options
author | Eric Erfanian <erfanian@google.com> | 2017-05-15 14:05:33 -0700 |
---|---|---|
committer | Eric Erfanian <erfanian@google.com> | 2017-05-15 14:48:12 -0700 |
commit | c857f90590e7d7fcffa89511982eb33afd34805f (patch) | |
tree | 9910fb95c6fdb10b06ee8be02a3374d2882005b9 /java/com/android/dialer/app/settings | |
parent | 738bb09adee2b56c99063a0264f8f76de393143b (diff) |
Update Dialer to v10 RC32
This release was created following the instructions at:
go/dialer-aosp-release
Subsequent dialer releases will follow as O bugs are
fixed, until we reach our final RC.
Version: 10
Candidate: RC32
Branch: dialer-android_release_branch/153304843.1
dialer-android_20170416.00/dialer-android_20170416.00_RC32
This release contains the following bug fixes since RC17:
Bug: 33176679 33272455 3646510 36773894 37297649 37413780
37513689 37640315 37680595 37698062 37873639 37901752
37919295 37953423 38062852 38069600 38137349 38173549
38180252 38191514
Test: make, on device
Change-Id: I4e4bb630082758e418ff24892b7db3142c6eb09a
Diffstat (limited to 'java/com/android/dialer/app/settings')
-rw-r--r-- | java/com/android/dialer/app/settings/DialerSettingsActivity.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/java/com/android/dialer/app/settings/DialerSettingsActivity.java b/java/com/android/dialer/app/settings/DialerSettingsActivity.java index fae5ff3ee..f1c270ca9 100644 --- a/java/com/android/dialer/app/settings/DialerSettingsActivity.java +++ b/java/com/android/dialer/app/settings/DialerSettingsActivity.java @@ -32,6 +32,7 @@ import android.telephony.TelephonyManager; import android.view.MenuItem; import android.widget.Toast; import com.android.contacts.common.compat.TelephonyManagerCompat; +import com.android.dialer.about.AboutPhoneFragment; import com.android.dialer.app.R; import com.android.dialer.blocking.FilteredNumberCompat; import com.android.dialer.common.LogUtil; @@ -136,6 +137,11 @@ public class DialerSettingsActivity extends AppCompatPreferenceActivity { accessibilitySettingsHeader.intent = accessibilitySettingsIntent; target.add(accessibilitySettingsHeader); } + + Header aboutPhoneHeader = new Header(); + aboutPhoneHeader.titleRes = R.string.about_phone_label; + aboutPhoneHeader.fragment = AboutPhoneFragment.class.getName(); + target.add(aboutPhoneHeader); } private void addVoicemailSettings(List<Header> target, boolean isPrimaryUser) { |