Matthew Xie
b6b4f171ff
Merge "Change getName and getAddress permission to BLUETOOTH" into jb-mr1.1-dev
2012-12-04 11:21:55 -08:00
Daniel Sandler
994901ee7f
am d9e46ac5: am d8cb8fa4: Merge "Revised language for notification ringtone picker." into jb-mr1.1-dev
...
* commit 'd9e46ac5ffcd2a1b3abf70bde14af7d10ebf018b':
Revised language for notification ringtone picker.
2012-12-04 11:06:25 -08:00
Daniel Sandler
d9e46ac5ff
am d8cb8fa4: Merge "Revised language for notification ringtone picker." into jb-mr1.1-dev
...
* commit 'd8cb8fa463c9a527aff462f887dbca9fa9843fcf':
Revised language for notification ringtone picker.
2012-12-04 11:03:44 -08:00
Daniel Sandler
d8cb8fa463
Merge "Revised language for notification ringtone picker." into jb-mr1.1-dev
2012-12-04 11:01:04 -08:00
Matthew Xie
af5ddbfcf5
Change getName and getAddress permission to BLUETOOTH
...
The permissions were set as BLUETOOTH_ADMIN by mistake. Correct them
bug 7665249
Change-Id: Ic1bdbeb25e8f55d886f9a8d38920cbb769dd38ca
2012-12-04 10:47:43 -08:00
Craig Mautner
d3b9dd6ca6
am 40627de3: Merge "Remove unnecessary references in WindowManagerService"
...
* commit '40627de3044c4a23c20c2229cab20aab21ff2b03':
Remove unnecessary references in WindowManagerService
2012-12-04 10:38:32 -08:00
Craig Mautner
40627de304
Merge "Remove unnecessary references in WindowManagerService"
2012-12-04 09:45:03 -08:00
You Kim
cb6291c9b1
Remove unnecessary references in WindowManagerService
...
Clean message routines in WindowManagerService.
Change-Id: I3e3106b6499c67d1fd7133c987c0452a73141a3f
Signed-off-by: You Kim <you.kim72@gmail.com>
2012-12-05 00:10:03 +09:00
Daniel Sandler
aa9c5b6e9f
Revised language for notification ringtone picker.
...
Bug: 7659273
Change-Id: I5cb94a24b8ebff96ab5b567efc39a780300ee7ee
2012-12-04 09:06:21 -05:00
Daniel Sandler
59912d40ba
am b8145002: am 9f2532bf: Merge "Reduce false swipe-closed gestures in status bar panels." into jb-mr1.1-dev
...
* commit 'b814500269324bc24de13f974f9564ff176a578f':
Reduce false swipe-closed gestures in status bar panels.
2012-12-04 06:03:18 -08:00
Daniel Sandler
b814500269
am 9f2532bf: Merge "Reduce false swipe-closed gestures in status bar panels." into jb-mr1.1-dev
...
* commit '9f2532bf1215dffb4058d1b01834b3a0a7272fdc':
Reduce false swipe-closed gestures in status bar panels.
2012-12-04 06:00:02 -08:00
Daniel Sandler
9f2532bf12
Merge "Reduce false swipe-closed gestures in status bar panels." into jb-mr1.1-dev
2012-12-04 05:33:16 -08:00
satok
81f8b7c667
Fix an issue on installing 3rd-party IME by a non-primary user
...
Bug: 7573552
Currently IMMS doesn't receive install/uninstall messages. Accordingly enabled IMEs' list is not refreshed properly.
Change-Id: I25e9798a65f528dd270cd6bb1f14b1d887194787
2012-12-04 21:16:59 +09:00
Baligh Uddin
ea71e29a4b
am a468a7e5: am 8ef5660e: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
...
* commit 'a468a7e533add133ffa4cf5aff89163c126307a7':
Import translations. DO NOT MERGE
2012-12-03 21:17:35 -08:00
Baligh Uddin
a468a7e533
am 8ef5660e: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
...
* commit '8ef5660e3ccdd9de41b0d08992bfc2641d9c860b':
Import translations. DO NOT MERGE
2012-12-03 21:15:30 -08:00
Baligh Uddin
333833541c
am 52190903: am d8567b66: am 47ae0b93: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '521909035e0c406ba89c76b67f73cd88f7eb69dd':
Import translations. DO NOT MERGE
2012-12-03 21:13:58 -08:00
Baligh Uddin
8ef5660e3c
Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
2012-12-03 21:11:52 -08:00
Baligh Uddin
521909035e
am d8567b66: am 47ae0b93: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'd8567b661c3197ed4b208141e1c0f0542ae2723a':
Import translations. DO NOT MERGE
2012-12-03 21:11:50 -08:00
Baligh Uddin
d8567b661c
am 47ae0b93: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '47ae0b93c3a3b4fcb32cd46ad3b8313959344912':
Import translations. DO NOT MERGE
2012-12-03 21:09:55 -08:00
Baligh Uddin
47ae0b93c3
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-12-03 21:04:42 -08:00
Baligh Uddin
2306bec585
am 4ca5fbaa: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
...
* commit '4ca5fbaa91dc002647b2fd5f63b8a162cefc3553':
Import translations. DO NOT MERGE
2012-12-03 21:04:02 -08:00
Baligh Uddin
4ca5fbaa91
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
2012-12-03 21:00:51 -08:00
Jim Miller
147f9568af
Fix ring volume issue by addressing focus regression in keyguard.
...
This fixes a regression where ring volume can be changed in keyguard.
Because KeyguardHostView is now being re-created in onScreenTurnedOff(),
it loses focus and the volume keys get handled by the fallback handler.
The fix is to ensure at least one child under KeyguardHostView has focus
whenever we re-create it.
Fixes bug 7546960
Change-Id: I34b7db402401a824f463d35d7546c05dc2979243
2012-12-03 18:48:52 -08:00
The Android Open Source Project
b89f1ec20b
Reconcile with jb-mr1.1-release - do not merge
...
Change-Id: I3fbcd93e4cef710bf1562bc7844f4a62f3146e02
2012-12-03 16:39:07 -08:00
Dianne Hackborn
f9ae5f75af
am 23307cbb: am e0a676a3: Merge "Fix issue #7649590 : Background windows sometimes not being hidden for secondary users" into jb-mr1.1-dev
...
* commit '23307cbb6b432b658b0fd7437dacfedd6298af94':
Fix issue #7649590 : Background windows sometimes not being hidden for secondary users
2012-12-03 16:08:35 -08:00
Scott Main
dac257cd73
am 9857e246: am cd6ffc82: am a06c2941: docs: revisions to GPS Setup page w/ note about emulator
...
* commit '9857e24612d97f2e4e9145294375ce88029a52b3':
docs: revisions to GPS Setup page w/ note about emulator
2012-12-03 16:08:29 -08:00
Dianne Hackborn
23307cbb6b
am e0a676a3: Merge "Fix issue #7649590 : Background windows sometimes not being hidden for secondary users" into jb-mr1.1-dev
...
* commit 'e0a676a3bb0e7b9aced9359a021e4c5d2ffef752':
Fix issue #7649590 : Background windows sometimes not being hidden for secondary users
2012-12-03 15:54:34 -08:00
The Android Automerger
2cba4f1b56
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-12-03 15:54:28 -08:00
Dianne Hackborn
e0a676a3bb
Merge "Fix issue #7649590 : Background windows sometimes not being hidden for secondary users" into jb-mr1.1-dev
2012-12-03 15:51:47 -08:00
Scott Main
9857e24612
am cd6ffc82: am a06c2941: docs: revisions to GPS Setup page w/ note about emulator
...
* commit 'cd6ffc82ef248dc0260f2b5fb615d0ae727664b9':
docs: revisions to GPS Setup page w/ note about emulator
2012-12-03 15:48:51 -08:00
Scott Main
cd6ffc82ef
am a06c2941: docs: revisions to GPS Setup page w/ note about emulator
...
* commit 'a06c294152bbf2a82161ad778b991d4ffa9ac2a4':
docs: revisions to GPS Setup page w/ note about emulator
2012-12-03 15:46:26 -08:00
Scott Main
a06c294152
docs: revisions to GPS Setup page w/ note about emulator
...
Change-Id: I19400813a0220892654e38fa5142d9f8526a639c
2012-12-03 15:34:51 -08:00
Amith Yamasani
2d332c1e89
am 3533ea3b: am 844884d8: Merge "Fix remote views cache to avoid lockscreen widget crosstalk" into jb-mr1.1-dev
...
* commit '3533ea3bbb0c71f1b7e7ebcb442ac4f3230bceeb':
Fix remote views cache to avoid lockscreen widget crosstalk
2012-12-03 15:15:21 -08:00
Amith Yamasani
3533ea3bbb
am 844884d8: Merge "Fix remote views cache to avoid lockscreen widget crosstalk" into jb-mr1.1-dev
...
* commit '844884d82e1b2339cdbf43f64445c5d550c4691c':
Fix remote views cache to avoid lockscreen widget crosstalk
2012-12-03 15:12:38 -08:00
Amith Yamasani
844884d82e
Merge "Fix remote views cache to avoid lockscreen widget crosstalk" into jb-mr1.1-dev
2012-12-03 15:09:36 -08:00
Dianne Hackborn
bb4ca5271a
Fix issue #7649590 : Background windows sometimes not being hidden for secondary users
...
There are two things going on here:
(1) In secondary users, some times theme information such as whether
the window is full screen opaque was not being retrieved, so the window
manager didn't know that it could hide the windows behind the app.
This would just be a performance problem, except that:
(2) There appear to be a number of applications that declare that they
are full screen opaque, when in fact they are not. Instead they are
using window surfaces with an alpha channel, and setting some pixels
in their window to a non-opaque alpha level. This will allow you to
see whatever is behind the app. If the system happens to completely
remove the windows behind the app, and somebody is filling the frame
buffer with black, then you will see what the app intends -- those
parts of its UI blended with black. If one of those cases doesn't
hold (and though we have never guaranteed they would, in practice this
is generally what happens), then you will see something else.
At any rate, if nothing else than for performance reasons, we need to
fix issue #1 .
It turns out what is happening here is that the AttributeCache used
by the activity manager and window manager to retreive theme and other
information about applications has not yet been updated for multi-user.
One of the things we retrieve from this is the theme information telling
the window manager whether an application's window should be treated
as full screen opaque, allowing it to hide any windows behind it. In
the current implementation, the AttributeCache always retrieves this
information about the application as the primary user (user 0).
So, if you have an application that is installed on a secondary user but
not installed on the primary user, when the AttributeCache tries to retrieve
the requested information for it, then from the perspective of the primary user
it considers the application not installed, and is not able to retrieve that
info.
The change here makes AttributeCache multi-user aware, keeping all of its
data separately per-user, and requiring that callers now provide the user
they want to retrieve information for. Activity manager and window manager
are updated to be able to pass in the user when needed. This required some
fiddling of the window manager to have that information available -- in
particular it needs to be associated with the AppWindowToken.
Change-Id: I4b50b4b3a41bab9d4689e61f3584778e451343c8
2012-12-03 14:09:06 -08:00
Adam Powell
ab38b0f0fc
am 568f923b: Merge "removing ineffective code in WifiService.java"
...
* commit '568f923ba4cf522f699837bee0d8cba318343345':
removing ineffective code in WifiService.java
2012-12-03 13:51:32 -08:00
Amith Yamasani
ac2e6dd590
Fix remote views cache to avoid lockscreen widget crosstalk
...
Bug: 7660973
RemoteViewsAdapter will now store the userId as part of the cache key
when caching remote views to optimize for orientation changes.
Change-Id: I7c4e52b3995d4f56ebfa35aa9516327e182ad892
2012-12-03 13:41:16 -08:00
Adam Powell
568f923ba4
Merge "removing ineffective code in WifiService.java"
2012-12-03 13:37:16 -08:00
Scott Main
c9a1bdf5a0
am a9c3d81f: am ae5b07ca: am 2db56dda: Merge "docs: udpate for google service landing page and capitalize GPS in titles" into jb-mr1-dev
...
* commit 'a9c3d81f02931e220ca0caca99647ca3b4b029ae':
docs: udpate for google service landing page and capitalize GPS in titles
2012-12-03 13:09:14 -08:00
Scott Main
a9c3d81f02
am ae5b07ca: am 2db56dda: Merge "docs: udpate for google service landing page and capitalize GPS in titles" into jb-mr1-dev
...
* commit 'ae5b07cac9d395d0454152d0f8141d162753d6a4':
docs: udpate for google service landing page and capitalize GPS in titles
2012-12-03 13:07:14 -08:00
Scott Main
d586872696
am 3fea139d: am 4d1d0304: am e38980a7: Merge "docs: update dashboard for 12/1, plus misc fixes" into jb-mr1-dev
...
* commit '3fea139d07f1fb8959bfc0b479844d9e90fed0b4':
docs: update dashboard for 12/1, plus misc fixes
2012-12-03 13:06:29 -08:00
Scott Main
ae5b07cac9
am 2db56dda: Merge "docs: udpate for google service landing page and capitalize GPS in titles" into jb-mr1-dev
...
* commit '2db56ddaee71f33f65fe246309531a66bf1d4374':
docs: udpate for google service landing page and capitalize GPS in titles
2012-12-03 13:04:53 -08:00
Scott Main
3fea139d07
am 4d1d0304: am e38980a7: Merge "docs: update dashboard for 12/1, plus misc fixes" into jb-mr1-dev
...
* commit '4d1d03042110092d658b7b53565be881364b34b5':
docs: update dashboard for 12/1, plus misc fixes
2012-12-03 13:04:31 -08:00
Robert Ly
b3aa49c6bd
am 0fba90c9: am 413a208a: am 555c93b2: docs: refresh gms and gcm javadocs
...
* commit '0fba90c980b96e43081350e4f87f57106b235dca':
docs: refresh gms and gcm javadocs
2012-12-03 13:03:44 -08:00
Scott Main
4d1d030421
am e38980a7: Merge "docs: update dashboard for 12/1, plus misc fixes" into jb-mr1-dev
...
* commit 'e38980a767ae8e13214f8ed00629ebb454157d46':
docs: update dashboard for 12/1, plus misc fixes
2012-12-03 13:02:07 -08:00
Scott Main
2db56ddaee
Merge "docs: udpate for google service landing page and capitalize GPS in titles" into jb-mr1-dev
2012-12-03 13:01:19 -08:00
Robert Ly
0fba90c980
am 413a208a: am 555c93b2: docs: refresh gms and gcm javadocs
...
* commit '413a208a7b1dcba4679573ca85a22a466b790de5':
docs: refresh gms and gcm javadocs
2012-12-03 13:00:48 -08:00
Scott Main
03c172e222
docs: udpate for google service landing page and capitalize GPS in titles
...
Change-Id: I8cff9c5bc6eee7a60bc5db88763ad57eb63c7e7d
2012-12-03 13:00:09 -08:00
Robert Ly
413a208a7b
am 555c93b2: docs: refresh gms and gcm javadocs
...
* commit '555c93b2a726d53c70e99835d74d9246dff2206d':
docs: refresh gms and gcm javadocs
2012-12-03 12:59:27 -08:00