Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 532d5603: Merge change I80022375 into eclair

Browse Source 
Merge commit '532d56034532809da7691059742371c1b4d0656c' into eclair-mr2

* commit '532d56034532809da7691059742371c1b4d0656c':
  Fix issue #2256032: Change CONFIGURATION_CHANGED and add a locale changed broadcast
This commit is contained in:
Dianne Hackborn
2009-11-11 19:13:29 -08:00
committed by Android Git Automerger
parent fb745d2790 532d560345
commit 823edb7666
4 changed files with 33 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
api/current.xml
View File

@@ -35290,6 +35290,17 @@
visibility="public"
>
</field>
<field name="ACTION_LOCALE_CHANGED"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;android.intent.action.LOCALE_CHANGED&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="ACTION_MAIN"
type="java.lang.String"
transient="false"

14
core/java/android/content/Intent.java
View File

@@ -1344,6 +1344,12 @@ public class Intent implements Parcelable {
* can not be restarted will need to watch for this action and handle it
* appropriately.
*
* <p class="note">
* You can <em>not</em> receive this through components declared
* in manifests, only by explicitly registering for it with
* {@link Context#registerReceiver(BroadcastReceiver, IntentFilter)
* Context.registerReceiver()}.
*
* <p class="note">This is a protected intent that can only be sent
* by the system.
*
@@ -1351,6 +1357,14 @@ public class Intent implements Parcelable {
*/
@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
public static final String ACTION_CONFIGURATION_CHANGED = "android.intent.action.CONFIGURATION_CHANGED";
/**
* Broadcast Action: The current device's locale has changed.
*
* <p class="note">This is a protected intent that can only be sent
* by the system.
*/
@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
public static final String ACTION_LOCALE_CHANGED = "android.intent.action.LOCALE_CHANGED";
/**
* Broadcast Action: This is a <em>sticky broadcast</em> containing the
* charging state, level, and other information about the battery.

1
core/res/AndroidManifest.xml
View File

@@ -41,6 +41,7 @@
<protected-broadcast android:name="android.intent.action.PACKAGE_DATA_CLEARED" />
<protected-broadcast android:name="android.intent.action.UID_REMOVED" />
<protected-broadcast android:name="android.intent.action.CONFIGURATION_CHANGED" />
<protected-broadcast android:name="android.intent.action.LOCALE_CHANGED" />
<protected-broadcast android:name="android.intent.action.BATTERY_CHANGED" />
<protected-broadcast android:name="android.intent.action.BATTERY_LOW" />
<protected-broadcast android:name="android.intent.action.BATTERY_OKAY" />

7
services/java/com/android/server/am/ActivityManagerService.java
View File

@@ -12834,8 +12834,15 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
}
}
Intent intent = new Intent(Intent.ACTION_CONFIGURATION_CHANGED);
intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY);
broadcastIntentLocked(null, null, intent, null, null, 0, null, null,
null, false, false, MY_PID, Process.SYSTEM_UID);
if ((changes&ActivityInfo.CONFIG_LOCALE) != 0) {
broadcastIntentLocked(null, null,
new Intent(Intent.ACTION_LOCALE_CHANGED),
null, null, 0, null, null,
null, false, false, MY_PID, Process.SYSTEM_UID);
}
AttributeCache ac = AttributeCache.instance();
if (ac != null) {