drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
93,820 Commits 1 Branch 0 Tags
Commit Graph

93820 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Scott Main
e38980a767 Merge "docs: update dashboard for 12/1, plus misc fixes" into jb-mr1-dev 2012-12-03 12:58:59 -08:00
Irfan Sheriff
9648a484e0 am cdd03f54: Merge "Try go-negotiation when invocation request is deferred." 
* commit 'cdd03f5487d3d0a088651c90fc5122b5fc3f62b3':
  Try go-negotiation when invocation request is deferred.
 2012-12-03 12:39:00 -08:00
Robert Ly
555c93b2a7 docs: refresh gms and gcm javadocs 
Change-Id: I5532eb9f87e2ab87488884e70102e8b4cbadf255
 2012-12-03 12:34:42 -08:00
Irfan Sheriff
cdd03f5487 Merge "Try go-negotiation when invocation request is deferred." 2012-12-03 11:59:53 -08:00
Zhihai Xu
e398d2323d am fb9947ad: am 40973c53: Merge "BT is still on after enable flight mode, and reboot the DUT" into jb-mr1.1-dev 
* commit 'fb9947ad77e9d1d2ea259d7fbc170c275810b2b9':
  BT is still on after enable flight mode, and reboot the DUT
 2012-12-03 11:52:43 -08:00
Zhihai Xu
fb9947ad77 am 40973c53: Merge "BT is still on after enable flight mode, and reboot the DUT" into jb-mr1.1-dev 
* commit '40973c53acc86b576081fb720d7d6b23c55202ad':
  BT is still on after enable flight mode, and reboot the DUT
 2012-12-03 11:50:25 -08:00
The Android Open Source Project
da13b894ec Reconcile with jb-mr1.1-release - do not merge 
Change-Id: I60d1dd7a490e86c1194da929483347f99b9f421d
 2012-12-03 11:47:35 -08:00
Zhihai Xu
40973c53ac Merge "BT is still on after enable flight mode, and reboot the DUT" into jb-mr1.1-dev 2012-12-03 11:47:34 -08:00
Jeff Sharkey
ae6428d707 am 1f8f2839: am ed3fba65: Merge "Avoid null mobile interfaces." into jb-mr1.1-dev 
* commit '1f8f283975c7cf51081acd3ea494de2b5f431607':
  Avoid null mobile interfaces.
 2012-12-03 11:40:23 -08:00
Jeff Sharkey
1f8f283975 am ed3fba65: Merge "Avoid null mobile interfaces." into jb-mr1.1-dev 
* commit 'ed3fba653864101d3dd335941f082104aad8f532':
  Avoid null mobile interfaces.
 2012-12-03 11:38:31 -08:00
Zhihai Xu
401202b5fe BT is still on after enable flight mode, and reboot the DUT 
bug 7275625
Change-Id: I4f8952a06152eb5f5775c1f616f6383e4f20e352
 2012-12-03 11:36:21 -08:00
Jeff Sharkey
ed3fba6538 Merge "Avoid null mobile interfaces." into jb-mr1.1-dev 2012-12-03 11:32:51 -08:00
Adam Powell
e4db4e2b9d am 05c8f17f: Merge "resolver list is not cleared on rebuild" 
* commit '05c8f17f05ca83573f7670191e6dec91497dc742':
  resolver list is not cleared on rebuild
 2012-12-03 11:32:39 -08:00
Matthew Xie
3b5c43825e am b8e80eb5: am 4fd38e8d: Merge "Clean up debug messages" into jb-mr1.1-dev 
* commit 'b8e80eb566aa5afb744db84a0067e144de831f45':
  Clean up debug messages
 2012-12-03 11:29:21 -08:00
Scott Main
aaaa15653b docs: update dashboard for 12/1, plus misc fixes 
Change-Id: I7f06b6c66476aee2bd69b8017b5707c483b252b7
 2012-12-03 11:28:23 -08:00
Matthew Xie
b8e80eb566 am 4fd38e8d: Merge "Clean up debug messages" into jb-mr1.1-dev 
* commit '4fd38e8d13697cd1b169487719982f32cc5fb425':
  Clean up debug messages
 2012-12-03 11:26:38 -08:00
Matthew Xie
4fd38e8d13 Merge "Clean up debug messages" into jb-mr1.1-dev 2012-12-03 11:23:57 -08:00
Guang Zhu
5732aaf1bb am 8732bee8: am fdc0d929: Merge "app launch test fixes and improvements" into jb-mr1.1-dev 
* commit '8732bee8d1e2ffc7a163769904bd799ac2730b4e':
  app launch test fixes and improvements
 2012-12-03 11:22:29 -08:00
Guang Zhu
8732bee8d1 am fdc0d929: Merge "app launch test fixes and improvements" into jb-mr1.1-dev 
* commit 'fdc0d9295fbe855b14e1730447b079191f2a4f8c':
  app launch test fixes and improvements
 2012-12-03 11:19:50 -08:00
Guang Zhu
fdc0d9295f Merge "app launch test fixes and improvements" into jb-mr1.1-dev 2012-12-03 11:17:25 -08:00