Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed8361fa authored by Dan Pasanen's avatar Dan Pasanen
Browse files

Merge tag 'android-7.1.1_r4' into cm-14.1 

Android 7.1.1 release 4

Change-Id: I9201f9020a1f6a57ee74cc9004019094132fccc4
parents 259a2f1e 9bdcff7b

AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -178,8 +178,8 @@ 
        <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:parentActivityName="com.android.dialer.calllog.CallLogActivity"

            android:icon="@mipmap/ic_launcher_phone">

            <intent-filter>

                <action android:name="android.intent.action.VIEW"/>

                <category android:name="android.intent.category.DEFAULT"/>

res/layout/call_log_activity.xml

+4 −0
Original line number Diff line number Diff line
@@ -33,4 +33,8 @@ 
        android:layout_width="match_parent"

        android:layout_height="0dp"

        android:layout_weight="1" />

    <RelativeLayout

        android:id="@+id/floating_action_button_container"

        android:layout_width="0dp"

        android:layout_height="0dp" />

</LinearLayout>

src/com/android/dialer/settings/DialerSettingsActivity.java

+18 −4
Original line number Diff line number Diff line
@@ -63,10 +63,12 @@ public class DialerSettingsActivity extends AppCompatPreferenceActivity { 


    @Override

    public void onBuildHeaders(List<Header> target) {

        if (showDisplayOptions()) {

            Header displayOptionsHeader = new Header();

            displayOptionsHeader.titleRes = R.string.display_options_title;

            displayOptionsHeader.fragment = DisplayOptionsSettingsFragment.class.getName();

            target.add(displayOptionsHeader);

        }



        Header soundSettingsHeader = new Header();

        soundSettingsHeader.titleRes = R.string.sounds_and_vibration_title;
@@ -163,6 +165,18 @@ public class DialerSettingsActivity extends AppCompatPreferenceActivity { 
        }

    }



    /**

    * Returns {@code true} or {@code false} based on whether the display options setting should be

    * shown. For languages such as Chinese, Japanese, or Korean, display options aren't useful

    * since contacts are sorted and displayed family name first by default.

    *

    * @return {@code true} if the display options should be shown, {@code false} otherwise.

    */

    private boolean showDisplayOptions() {

        return getResources().getBoolean(R.bool.config_display_order_user_changeable)

                && getResources().getBoolean(R.bool.config_sort_order_user_changeable);

    }



    @Override

    public void onHeaderClick(Header header, int position) {

        if (header.id == R.id.settings_header_sounds_and_vibration) {