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

Commit 00e821a8 authored by Narayan Kamath's avatar Narayan Kamath Committed by android-build-merger
Browse files

am c7e48719: Merge "Remove references to persist.sys.language/country." 

automerge: 8be3724a

* commit '8be3724a':
  Remove references to persist.sys.language/country.
parents c1a5e82c 8be3724a

docs/html/guide/topics/resources/localization.jd

+4 −6
Original line number Diff line number Diff line
@@ -433,8 +433,8 @@ application, however, should localize properly.</p> 
<p>To change the locale in the emulator by using the adb shell. </p>



<ol>

  <li>Pick the locale you want to test and determine its language and region codes, for

example <code>fr</code> for French and <code>CA</code> for Canada.<br>

  <li>Pick the locale you want to test and determine its BCP-47 language tag, for

example, Canadian French would be <code>fr-CA</code>.<br>

  </li>

  <li>Launch an emulator.</li>

  <li>From a command-line shell on the host computer, run the following
@@ -444,16 +444,14 @@ command:<br> 
the <code>-e</code> option:<br>

  <code>adb -e shell</code></li>

  <li>At  the  adb shell prompt (<code>#</code>), run this command: <br>

    <code>setprop persist.sys.language  [<em>language code</em>];setprop

persist.sys.country [<em>country  code</em>];stop;sleep 5;start <br>

    <code>setprop persist.sys.locale [<em>BCP-47 language tag</em>];stop;sleep 5;start <br>

    </code>Replace bracketed sections with the  appropriate codes from Step

1.</li>

</ol>



<p>For instance, to test in Canadian French:</p>



<p><code>setprop persist.sys.language  fr;setprop persist.sys.country

CA;stop;sleep 5;start </code></p>

<p><code>setprop persist.sys.locale fr-CA;stop;sleep 5;start </code></p>



<p>This will cause the emulator  to restart. (It will look like a full reboot,

but it is not.) Once the Home screen appears again, re-launch your application (for

services/core/java/com/android/server/MountService.java

+0 −5
Original line number Diff line number Diff line
@@ -892,11 +892,6 @@ class MountService extends IMountService.Stub 
        // Temporary workaround for http://b/17945169.

        Slog.d(TAG, "Setting system properties to " + systemLocale + " from mount service");

        SystemProperties.set("persist.sys.locale", locale.toLanguageTag());



        // TODO: Stop setting these properties once we've removed all

        // references to them.

        SystemProperties.set("persist.sys.language", locale.getLanguage());

        SystemProperties.set("persist.sys.country", locale.getCountry());

    }



    /**

services/core/java/com/android/server/am/ActivityManagerService.java

+0 −9
Original line number Diff line number Diff line
@@ -16818,15 +16818,6 @@ public final class ActivityManagerService extends ActivityManagerNative 














        if (isPersist) {















            SystemProperties.set("persist.sys.locale", languageTag);

























            // These values are *deprecated*, use persist.sys.locale instead.













            //













            // TODO: Stop setting these values once all code that references













            // them has been removed.













            SystemProperties.set("persist.sys.language", l.getLanguage());













            SystemProperties.set("persist.sys.country", l.getCountry());













            SystemProperties.set("persist.sys.localevar", l.getVariant());



























            mHandler.sendMessage(mHandler.obtainMessage(SEND_LOCALE_TO_MOUNT_DAEMON_MSG, l));















        }















    }