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

Commit 58953910 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5117340 from 0eea3b6c to pi-qpr2-release 

Change-Id: Ie37868f13ec5507a77ea14ec542e3677912edc0b
parents 6a2725ba 0eea3b6c

res/values-zh-rCN/strings.xml

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


<resources xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>、<xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>

    <string name="yes" msgid="4676390750360727396">"是"</string>

    <string name="no" msgid="6731231425810196216">"否"</string>

    <string name="create" msgid="3578857613172647409">"创建"</string>

src/com/android/settings/dream/CurrentDreamPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ public class CurrentDreamPreferenceController extends AbstractPreferenceControll 
    private void launchScreenSaverSettings() {

        Optional<DreamInfo> info = getActiveDreamInfo();

        if (!info.isPresent()) return;

        mBackend.launchSettings(info.get());

        mBackend.launchSettings(mContext, info.get());

    }



    private Optional<DreamInfo> getActiveDreamInfo() {