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

Commit eac42583 authored by Mady Mellor's avatar Mady Mellor Committed by Android (Google) Code Review
Browse files

Merge "qt-r1-bubbles-dev @ build 5835883" into qt-qpr1-dev

parents 1ae748b0 91ba8e9b

res/values-bs/arrays.xml

+2 −2
Original line number Diff line number Diff line
@@ -362,9 +362,9 @@ 
    <item msgid="1319652728542138112">"Zadano"</item>

    <item msgid="1016452621833735880">"Sans-serif"</item>

    <item msgid="2496277987934654454">"Sans-serif kondenzovani"</item>

    <item msgid="7247838127505318669">"Sans-serif fiksnog razmaka"</item>

    <item msgid="7247838127505318669">"Sans-serif monospace"</item>

    <item msgid="4478414822462359763">"Serif"</item>

    <item msgid="7502451783483660829">"Serif fiksnog razmaka"</item>

    <item msgid="7502451783483660829">"Serif monospace"</item>

    <item msgid="639503332147461010">"Casual"</item>

    <item msgid="7967169925231332424">"Kurziv"</item>

    <item msgid="561832997193039673">"Mala početna slova"</item>

res/values-ca/arrays.xml

+1 −1
Original line number Diff line number Diff line
@@ -380,7 +380,7 @@ 
    <item msgid="4733815704128258753">"Predeterminat"</item>

    <item msgid="3217099060748617005">"Cap"</item>

    <item msgid="7467615139904599420">"Contorn"</item>

    <item msgid="5623165557468608975">"Ombra paral·lela"</item>

    <item msgid="5623165557468608975">"Ombra"</item>

    <item msgid="8088451174058214588">"Elevat"</item>

    <item msgid="3821418743395480313">"Enfonsat"</item>

  </string-array>

res/values-eu/arrays.xml

+2 −2
Original line number Diff line number Diff line
@@ -350,7 +350,7 @@ 
    <item msgid="2404067308793740341">"Idatzi memorian"</item>

    <item msgid="5832543806893763620">"Aktibatu pantaila"</item>

    <item msgid="5258373962467495905">"Lortu kontuak"</item>

    <item msgid="334625385979270703">"Abiarazi atzeko planoan"</item>

    <item msgid="334625385979270703">"Exekutatu atzeko planoan"</item>

    <item msgid="9039213578110332702">"Erabilerraztasun-eginbideen bolumena"</item>

  </string-array>

  <string-array name="long_press_timeout_selector_titles">
@@ -443,7 +443,7 @@ 
    <item msgid="3396458970745718652">"Garrantzitsua (atzeko planokoa)"</item>

    <item msgid="5214825238247511992">"Babeskopiak"</item>

    <item msgid="311372689168254967">"Handia"</item>

    <item msgid="7438189122367820362">"Zerbitzua (abian)"</item>

    <item msgid="7438189122367820362">"Zerbitzua (exekutatzen)"</item>

    <item msgid="918687422516982498">"Zerbitzua (berrabiarazten)"</item>

    <item msgid="6807727069641853029">"Hargailua"</item>

    <item msgid="6782857406100845127">"Hasiera"</item>

res/values-ne/arrays.xml

+1 −1
Original line number Diff line number Diff line
@@ -473,7 +473,7 @@ 
  </string-array>

  <string-array name="wifi_metered_entries">

    <item msgid="5200910605264415911">"स्वतः पत्ता लगाउनुहोस्"</item>

    <item msgid="8745603368609022803">"सशुल्क वाइफाइका रूपमा लिनुहोस्"</item>

    <item msgid="8745603368609022803">"मिटर गरिएको रूपमा व्यवहार गर्नुहोस्"</item>

    <item msgid="2266114985518865625">"मिटर नगरिएको रूपमा व्यवहार गर्नुहोस्"</item>

  </string-array>

  <string-array name="wifi_privacy_entries">

src/com/android/settings/development/BubbleGlobalPreferenceController.java

+5 −7
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


package com.android.settings.development;



import static android.provider.Settings.Secure.NOTIFICATION_BUBBLES;



import android.content.Context;

import android.provider.Settings;
@@ -42,7 +40,7 @@ public class BubbleGlobalPreferenceController extends DeveloperOptionsPreference 


    @Override

    public String getPreferenceKey() {

        return NOTIFICATION_BUBBLES;

        return Settings.Global.NOTIFICATION_BUBBLES;

    }



    @Override
@@ -64,12 +62,12 @@ public class BubbleGlobalPreferenceController extends DeveloperOptionsPreference 
    }



    private boolean isEnabled() {

        return Settings.Secure.getInt(mContext.getContentResolver(),

                NOTIFICATION_BUBBLES, OFF) == ON;

        return Settings.Global.getInt(mContext.getContentResolver(),

                Settings.Global.NOTIFICATION_BUBBLES, OFF) == ON;

    }



    private void writeSetting(boolean isEnabled) {

        Settings.Secure.putInt(mContext.getContentResolver(),

                NOTIFICATION_BUBBLES, isEnabled ? ON : OFF);

        Settings.Global.putInt(mContext.getContentResolver(),

                Settings.Global.NOTIFICATION_BUBBLES, isEnabled ? ON : OFF);

    }

}