Dianne Hackborn
bfaf16778b
am 441fcb3c: am ef3aab13: am 44251a70: Merge "Work on issue #7343200 : Fails to show wallpaper in the background..." into jb-mr1-dev
...
* commit '441fcb3cab72f6d61c010c0a586461986950fd43':
Work on issue #7343200 : Fails to show wallpaper in the background...
2012-10-30 10:55:01 -07:00
Dianne Hackborn
441fcb3cab
am ef3aab13: am 44251a70: Merge "Work on issue #7343200 : Fails to show wallpaper in the background..." into jb-mr1-dev
...
* commit 'ef3aab130c95fbfb03e056ffdb7819b485c06398':
Work on issue #7343200 : Fails to show wallpaper in the background...
2012-10-30 10:52:22 -07:00
Dianne Hackborn
ef3aab130c
am 44251a70: Merge "Work on issue #7343200 : Fails to show wallpaper in the background..." into jb-mr1-dev
...
* commit '44251a70edba3e950aab1f706e1ff34e2fa4dfae':
Work on issue #7343200 : Fails to show wallpaper in the background...
2012-10-30 10:49:21 -07:00
Dianne Hackborn
44251a70ed
Merge "Work on issue #7343200 : Fails to show wallpaper in the background..." into jb-mr1-dev
2012-10-30 10:45:49 -07:00
Kenny Root
dee8b9d514
am 60b6ae23: am b33588e1: am ca60ba18: Merge "Move app-lib definition up for system app scanning" into jb-mr1-dev
...
* commit '60b6ae23f6a1ef41ea7976c7f6b70b26f13f96b6':
Move app-lib definition up for system app scanning
2012-10-30 10:11:57 -07:00
Amith Yamasani
9679cf72d8
am 91b231e0: am 7fd41276: am 7c258505: Merge "Fix for some downloaded apps showing up on all users" into jb-mr1-dev
...
* commit '91b231e0d63f1de6c93f9d54b34445c4356d360d':
Fix for some downloaded apps showing up on all users
2012-10-30 10:10:29 -07:00
Dianne Hackborn
ef03a7f441
Work on issue #7343200 : Fails to show wallpaper in the background...
...
...for lockscreen sometimes and remains black / blank
Add some debug output to try to track down what is going on.
Change-Id: I98a96c5da9c04b988e948f6fc2766d927db49ebf
2012-10-29 18:46:52 -07:00
Kenny Root
60b6ae23f6
am b33588e1: am ca60ba18: Merge "Move app-lib definition up for system app scanning" into jb-mr1-dev
...
* commit 'b33588e1353076398b081a2ec4c79a04305e256e':
Move app-lib definition up for system app scanning
2012-10-29 17:21:28 -07:00
Kenny Root
b33588e135
am ca60ba18: Merge "Move app-lib definition up for system app scanning" into jb-mr1-dev
...
* commit 'ca60ba1874a6537b42854b52cd766ebf1a8c8189':
Move app-lib definition up for system app scanning
2012-10-29 17:18:04 -07:00
Victoria Lease
edc739db01
am 9348d760: am 4f5561b7: am 167282f1: Merge "Revert "make FLP play nicely with multiuser"" into jb-mr1-dev
...
* commit '9348d76098c941ecaf8b114dc98933e511e3f556':
Revert "make FLP play nicely with multiuser"
2012-10-29 17:15:23 -07:00
Jeff Brown
67f0211bfb
am 76bce54b: am 9531b1c4: am 99e88721: Merge "Don\'t scale screen brightness by electron beam level." into jb-mr1-dev
...
* commit '76bce54bc8c2cbe213c5aa914f45af9ac9022744':
Don't scale screen brightness by electron beam level.
2012-10-29 17:15:07 -07:00
Kenny Root
ca60ba1874
Merge "Move app-lib definition up for system app scanning" into jb-mr1-dev
2012-10-29 17:14:51 -07:00
Victoria Lease
8e32da8ef0
am 5452d232: am cee17140: am 319c7e85: Merge "make FLP play nicely with multiuser" into jb-mr1-dev
...
* commit '5452d2324773ac1738a1c689eef102f005a8ef87':
make FLP play nicely with multiuser
2012-10-29 17:14:50 -07:00
Dianne Hackborn
a5d75aec4e
am 8729671c: am e1ea4d35: am 8a6f6a8c: Merge "Fix issue #7419050 : Time is not getting updated after launching Clock" into jb-mr1-dev
...
* commit '8729671cc0f99a5ca03cc7b6911b2bf98a19bef1':
Fix issue #7419050 : Time is not getting updated after launching Clock
2012-10-29 17:13:36 -07:00
Amith Yamasani
b2c07cba32
am b67f91b6: am 16f18a4c: am 08482454: Merge "Fix the user name for the owner." into jb-mr1-dev
...
* commit 'b67f91b672d898ae20a1e5848a37aadd33ab8167':
Fix the user name for the owner.
2012-10-29 17:13:29 -07:00
Amith Yamasani
91b231e0d6
am 7fd41276: am 7c258505: Merge "Fix for some downloaded apps showing up on all users" into jb-mr1-dev
...
* commit '7fd412767c063ccd2d80a3db6a0d27cf0ff6d261':
Fix for some downloaded apps showing up on all users
2012-10-29 15:05:07 -07:00
Amith Yamasani
7fd412767c
am 7c258505: Merge "Fix for some downloaded apps showing up on all users" into jb-mr1-dev
...
* commit '7c258505ecfbf726c56814963bee798e74ff4cb4':
Fix for some downloaded apps showing up on all users
2012-10-29 15:02:32 -07:00
Amith Yamasani
7c258505ec
Merge "Fix for some downloaded apps showing up on all users" into jb-mr1-dev
2012-10-29 14:57:53 -07:00
Victoria Lease
9348d76098
am 4f5561b7: am 167282f1: Merge "Revert "make FLP play nicely with multiuser"" into jb-mr1-dev
...
* commit '4f5561b71007f0b27f6bb385e7a7f4f67c88ed75':
Revert "make FLP play nicely with multiuser"
2012-10-29 14:31:05 -07:00
Jeff Brown
76bce54bc8
am 9531b1c4: am 99e88721: Merge "Don\'t scale screen brightness by electron beam level." into jb-mr1-dev
...
* commit '9531b1c4889dfb30897eabd4db95364e1f316f44':
Don't scale screen brightness by electron beam level.
2012-10-29 14:23:56 -07:00
Victoria Lease
5452d23247
am cee17140: am 319c7e85: Merge "make FLP play nicely with multiuser" into jb-mr1-dev
...
* commit 'cee171409b4145876328f62823277e35387e66e4':
make FLP play nicely with multiuser
2012-10-29 14:23:38 -07:00
Dianne Hackborn
8729671cc0
am e1ea4d35: am 8a6f6a8c: Merge "Fix issue #7419050 : Time is not getting updated after launching Clock" into jb-mr1-dev
...
* commit 'e1ea4d35d3abc05f2cd7bd961373ef164caf2a5b':
Fix issue #7419050 : Time is not getting updated after launching Clock
2012-10-29 14:22:18 -07:00
Amith Yamasani
b67f91b672
am 16f18a4c: am 08482454: Merge "Fix the user name for the owner." into jb-mr1-dev
...
* commit '16f18a4ce879c53a06cffc552a5d25e73bed5327':
Fix the user name for the owner.
2012-10-29 14:22:11 -07:00
Victoria Lease
4f5561b710
am 167282f1: Merge "Revert "make FLP play nicely with multiuser"" into jb-mr1-dev
...
* commit '167282f19f58ba5271c37bb16c4ea5bcd0bf6303':
Revert "make FLP play nicely with multiuser"
2012-10-29 14:12:25 -07:00
Jeff Brown
9531b1c488
am 99e88721: Merge "Don\'t scale screen brightness by electron beam level." into jb-mr1-dev
...
* commit '99e88721a8bd19f04278e2fdccd224fc7ee705d4':
Don't scale screen brightness by electron beam level.
2012-10-29 14:11:56 -07:00
Victoria Lease
cee171409b
am 319c7e85: Merge "make FLP play nicely with multiuser" into jb-mr1-dev
...
* commit '319c7e85019350e3a5f26c64803900b945130c3b':
make FLP play nicely with multiuser
2012-10-29 14:01:47 -07:00
Dianne Hackborn
e1ea4d35d3
am 8a6f6a8c: Merge "Fix issue #7419050 : Time is not getting updated after launching Clock" into jb-mr1-dev
...
* commit '8a6f6a8ca9824891cc841d8c6ebd72a74c7d2580':
Fix issue #7419050 : Time is not getting updated after launching Clock
2012-10-29 13:56:01 -07:00
Amith Yamasani
16f18a4ce8
am 08482454: Merge "Fix the user name for the owner." into jb-mr1-dev
...
* commit '084824548f9706db8356ed4480c282288ffc0bd0':
Fix the user name for the owner.
2012-10-29 13:55:57 -07:00
Victoria Lease
d50d0c31d4
don't complain about CDMA support on non-CDMA devices
...
GpsLocationProvider emits a message on CDMA phones, warning about
lack of CDMA support. It also emits this message on every other
non-GSM device. I've pulled the conditions in a bit for this so that
it only happens on actual CDMA devices.
Change-Id: I1a122e2599c83c730be014c61385e60ef819b5a1
2012-10-29 13:46:43 -07:00
Jeff Brown
266ca72300
am 46a0ec73: am 14012e1d: am 4e0bf7c4: Merge "Add MediaRouter API to get presentation display." into jb-mr1-dev
...
* commit '46a0ec73b6d4a81dd037d7beef7321f25349bf9c':
Add MediaRouter API to get presentation display.
2012-10-29 13:43:14 -07:00
Jeff Brown
46a0ec73b6
am 14012e1d: am 4e0bf7c4: Merge "Add MediaRouter API to get presentation display." into jb-mr1-dev
...
* commit '14012e1d1b3c96048955e22d2bb73b9c63189a54':
Add MediaRouter API to get presentation display.
2012-10-29 13:37:10 -07:00
Jeff Brown
14012e1d1b
am 4e0bf7c4: Merge "Add MediaRouter API to get presentation display." into jb-mr1-dev
...
* commit '4e0bf7c48638f5c9b222c8781809019df0b39048':
Add MediaRouter API to get presentation display.
2012-10-29 13:32:02 -07:00
Kenny Root
584c4cdbf3
Move app-lib definition up for system app scanning
...
System apps were getting the wrong path because app-lib directory was
defined after the scanning of packages.
Bug: 7425516
Change-Id: I7a7a6b2a74f846c84516440ee950099bdc564d0b
2012-10-29 10:46:42 -07:00
Victoria Lease
269518e83e
Revert "make FLP play nicely with multiuser"
...
This reverts commit e5601ce9bfa4effbddb84186f0fe1bfe4ad50301
Change-Id: Icd12f2d2c18f2eeeb2c367a885fb6d170ce426ae
2012-10-29 08:26:54 -07:00
Jeff Brown
99e88721a8
Merge "Don't scale screen brightness by electron beam level." into jb-mr1-dev
2012-10-28 17:01:38 -07:00
Jeff Brown
356bd4cf2c
Don't scale screen brightness by electron beam level.
...
This change removes the modulation of the screen brightness
by the electron beam level. The screen brightness remains
constant while the electron beam animation is playing.
Previously we were multiplying the screen brightness by the
electron beam level so as to animate both at the same time.
The problem is that when the screen brightness is already dim
to begin with, it may not be possible to see the electron beam
animation because the modulated screen brightness rapidly
converges on 0. This may manifest give the appearance of
an abrupt transition or a flash as the screen turns off.
Bug: 7387800
Change-Id: I27b90f0098bbdc3de1d66fad819548d1301405cd
2012-10-26 18:44:51 -07:00
Victoria Lease
319c7e8501
Merge "make FLP play nicely with multiuser" into jb-mr1-dev
2012-10-26 17:32:02 -07:00
Amith Yamasani
f031f230f5
Fix for some downloaded apps showing up on all users
...
Bug: 7226656
In the case of packages with sharedUserId, the packages were inserted
into mPackages a little later. We were reading the package restrictions
before this happened and so the apps were being removed from the restricted
list, effectively setting installed=true.
Moved the block that reads the restrictions to after the processing of
mPendingPackages.
Also, don't setInstalled for all users in the pending packages processing.
Change-Id: I382787e45fecdb871d80ffb4d854782d8e32e4a7
2012-10-26 17:10:51 -07:00
Dianne Hackborn
8a6f6a8ca9
Merge "Fix issue #7419050 : Time is not getting updated after launching Clock" into jb-mr1-dev
2012-10-26 16:18:30 -07:00
Amith Yamasani
084824548f
Merge "Fix the user name for the owner." into jb-mr1-dev
2012-10-26 15:54:56 -07:00
Victoria Lease
e5601ce9bf
make FLP play nicely with multiuser
...
Frameworks' FusedLocationProvider runs as a specific user so that it
can join a specific process. The solution that works for NLP, run one
copy per user as that user, does not work for FLP.
To make FLP play nicely with multiuser, I've allowed SYSTEM_UID to
operate in the background and included a hardcoded exception to
prevent ServiceWatcher from trying to launch one FLP per user.
Bug: 7279799
Change-Id: I573ea5226d8d00777421b39c5c3fb0899bf09b4d
2012-10-26 15:37:18 -07:00
Dianne Hackborn
db5aca9aa6
Fix issue #7419050 : Time is not getting updated after launching Clock
...
Change-Id: Iaa8de2d3732bffd63fcd4fafba50955d1776611d
2012-10-26 13:39:41 -07:00
Amith Yamasani
6f34b41114
Fix the user name for the owner.
...
Use a version number to update the name to Owner, from Primary.
For new installations, use the correct localized string.
Bug: 7417150
Fix a typo in the permission description.
Bug: 7333304
Change-Id: I123741e581c6a02d4597b3cd81f2ca48a8587e2a
2012-10-26 10:06:22 -07:00
Jeff Brown
92130f6407
Add MediaRouter API to get presentation display.
...
This new API makes it possible for an application to ask on
which Display it should show a Presentation based on the currently
selected media route.
Also added a new API on DisplayManager to query displays that
support a certain category of uses.
Improved the documentation of the Presentation class to explain
how to choose an appropriate Display for presentation.
Bug: 7409073
Change-Id: Iab451215e570ae55f3718fc228303143c800fe51
2012-10-25 20:31:21 -07:00
Svetoslav Ganov
21ab20916e
am 1abaa2cb: am b8ee636a: am 324cfc54: Merge "Accessibility layer in inconsistent state after running UI test automation tests." into jb-mr1-dev
...
* commit '1abaa2cb693743df9a24da265c9c6bd58991ff2c':
Accessibility layer in inconsistent state after running UI test automation tests.
2012-10-25 11:18:10 -07:00
Svetoslav Ganov
1abaa2cb69
am b8ee636a: am 324cfc54: Merge "Accessibility layer in inconsistent state after running UI test automation tests." into jb-mr1-dev
...
* commit 'b8ee636a864577c08a53bf4b1ba8120d952eb5d8':
Accessibility layer in inconsistent state after running UI test automation tests.
2012-10-25 11:15:12 -07:00
Svetoslav Ganov
b8ee636a86
am 324cfc54: Merge "Accessibility layer in inconsistent state after running UI test automation tests." into jb-mr1-dev
...
* commit '324cfc54ed3527b98069f87665504a423bab63e4':
Accessibility layer in inconsistent state after running UI test automation tests.
2012-10-25 11:13:14 -07:00
Svetoslav Ganov
7fd9882ba3
Accessibility layer in inconsistent state after running UI test automation tests.
...
1. The accessibility layer has a back door for a UI test automation code running
from the shell to attach. The unregister code does an incorrect identity check
and as a result the register UI test automation service is not disconnected
until its process is killed. The fix is super safe and simple.
bug:7409261
Change-Id: I4b1da18be6c5619dadd4a58fca6724529bc59dea
2012-10-25 09:41:11 -07:00
Jeff Brown
5e3f246189
am bf3c2898: am b21b4fdc: am 900e0ba5: Merge "Dim the screen quickly in response to user activity timeout." into jb-mr1-dev
...
* commit 'bf3c28982c3b487f516b1b118944818426fc5fed':
Dim the screen quickly in response to user activity timeout.
2012-10-24 15:02:58 -07:00
Jeff Brown
bf3c28982c
am b21b4fdc: am 900e0ba5: Merge "Dim the screen quickly in response to user activity timeout." into jb-mr1-dev
...
* commit 'b21b4fdcea2d3ff4186f4c8dbcd89493cc4fd2bf':
Dim the screen quickly in response to user activity timeout.
2012-10-24 15:00:31 -07:00