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

Commit 415c15d9 authored by Chaohui Wang's avatar Chaohui Wang Committed by Automerger Merge Worker
Browse files

Merge "Set placeholder summary for SettingsInjector" into tm-dev am: ae8254a5 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17352243



Change-Id: I935597ac9727f26df911f2caff948c7be3d6c4a6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7ba6ccc2 ae8254a5

packages/SettingsLib/res/values/strings.xml

+3 −1
Original line number Diff line number Diff line
@@ -410,6 +410,8 @@ 
    <string name="launch_defaults_none">No defaults set</string>

    <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->

    <string name="summary_empty" translatable="false"></string>

    <!-- DO NOT TRANSLATE Summary placeholder -->

    <string name="summary_placeholder" translatable="false">&#160;</string>

    <!-- Text-To-Speech (TTS) settings --><skip />

    <!-- Name of the TTS package as listed by the package manager. -->

    <string name="tts_settings">Text-to-speech settings</string>

packages/SettingsLib/src/com/android/settingslib/location/SettingsInjector.java

+12 −6
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ import android.os.Messenger; 
import android.os.SystemClock;

import android.os.UserHandle;

import android.os.UserManager;

import android.text.TextUtils;

import android.util.ArrayMap;

import android.util.ArraySet;

import android.util.AttributeSet;
@@ -449,17 +450,22 @@ public class SettingsInjector { 
            if (setting == null) {

                return;

            }

            final Preference preference = setting.preference;

            Bundle bundle = msg.getData();

            boolean enabled = bundle.getBoolean(SettingInjectorService.ENABLED_KEY, true);

            String summary = bundle.getString(SettingInjectorService.SUMMARY_KEY, null);

            if (Log.isLoggable(TAG, Log.DEBUG)) {

                Log.d(TAG, setting + ": received " + msg + ", bundle: " + bundle);

            }

            boolean enabled = bundle.getBoolean(SettingInjectorService.ENABLED_KEY, true);

            String summary = bundle.getString(SettingInjectorService.SUMMARY_KEY);

            final Preference preference = setting.preference;

            if (TextUtils.isEmpty(summary)) {

                // Set a placeholder summary when received empty summary from injected service.

                // This is necessary to avoid preference height change.

                preference.setSummary(R.string.summary_placeholder);

            } else {

                preference.setSummary(summary);

            }

            preference.setEnabled(enabled);

            mHandler.sendMessage(

                    mHandler.obtainMessage(WHAT_RECEIVED_STATUS, setting));

            mHandler.sendMessage(mHandler.obtainMessage(WHAT_RECEIVED_STATUS, setting));

        }

    }