35032 Commits

Author SHA1 Message Date
Jeff Sharkey
c85e16cafb Merge "Make RegisteredServicesCache multi-user aware." into jb-mr1-dev 2012-10-09 23:47:01 -07:00
Satoshi Kataoka
0aaffb14c8 Merge "Don't update the text services locale in the main thread" into jb-mr1-dev 2012-10-09 23:36:50 -07:00
Matthew Xie
563e414784 Reduce android.bluetooth package debug messages
bug 7174712

Change-Id: I8d3fdc8edbe42068b5a550660d7b24854c3c4af4
2012-10-09 22:10:37 -07:00
Svetoslav Ganov
a726e23d7b Merge "Cannot force a shown item from an ActionMode into the overflow menu." into jb-mr1-dev 2012-10-09 22:01:55 -07:00
Jeff Sharkey
6ab72d74b8 Make RegisteredServicesCache multi-user aware.
RegisteredServicesCache is used to track account authenticators and
sync adapters, which can vary based on user.  This change requires
that callers now provide a userId when making cache requests.  It
continues persisting into a single file for now, which is keyed based
on UID.

It now watches for package broadcasts from all users, and scans
packages on-demand.  It changes cache callers to provide a relevant
userId, and evicts cache entries when users are stopped.

Changes SyncManager to only work with accounts from running users,
only kicking off pending syncs once a user is started.

Bug: 7276595, 7316150
Change-Id: I79466a84aa69aa37e4bd9691c5d6221d3662ff29
2012-10-09 21:39:19 -07:00
Svetoslav Ganov
14c4669916 Cannot force a shown item from an ActionMode into the overflow menu.
1. An app showing an action mode with a visible item that decides to move this item
   to the overflow menu cannot do so since the action menu is not updated properly.
   Specifically, ActionMenuPresenter does not clear the "is action button" property
   of a menu item neither requires nor requests an action button, i.e. the item's
   "show as action" property changed to be never shown on the action bar.

bug:7319766

Change-Id: I5cfda6269466fafca1f039a3bab6397392ae9f17
2012-10-09 19:20:27 -07:00
Baligh Uddin
64ad954085 Merge "Revert "Revert "Add config resource to help ATT prepaid""" into jb-mr1-dev 2012-10-09 19:14:37 -07:00
Baligh Uddin
b7c6a62a09 Revert "Revert "Add config resource to help ATT prepaid""
Revert the revert - change is good.

This reverts commit 2133caf515660d957bb7fd05b35e7eb2f2391d48

Change-Id: I987d5533e8ce909a3adfa38bceeac5c42e22da19
2012-10-09 19:13:31 -07:00
Dianne Hackborn
36db9d0879 Merge "Further work on issue #7307399: Framework needs a new pre-user-shutdown..." into jb-mr1-dev 2012-10-09 19:10:49 -07:00
Dianne Hackborn
c0bd747b06 Further work on issue #7307399: Framework needs a new pre-user-shutdown...
...phase & callback API

I realized there were a few things wrong with what was there.  The new
ACTION_USER_STARTING was not being sent for the first user at boot, and
there was an existing problem where ACTION_USER_STARTED was sent every
time there was a user switch.

Also improved some debug output of broadcasts to make it easier to see
what is going on in this stuff, and better reporting of why a service
couldn't be started.

Change-Id: Id8a536defbbad1f73d94a37d13762436b822fbe3
2012-10-09 17:57:14 -07:00
Baligh Uddin
2aee7c1843 Merge "Revert "Add config resource to help ATT prepaid"" into jb-mr1-dev 2012-10-09 17:53:37 -07:00
Baligh Uddin
2133caf515 Revert "Add config resource to help ATT prepaid"
breaking jb-mr1-release

This reverts commit 901ac560cafe0b8d76fd7441cbaf8749be33577c

Change-Id: I5fab4097a40e0ba31dc716967ef921c113a795a7
2012-10-09 17:52:52 -07:00
Svetoslav Ganov
27258209fe Merge "Return true on successful accessiblity action click/long click." into jb-mr1-dev 2012-10-09 17:52:01 -07:00
Dianne Hackborn
840590dd64 Merge "Fix issue #7311376: Add API to allow apps to know if they are..." into jb-mr1-dev 2012-10-09 17:46:36 -07:00
Chris Wren
f966cf3539 Merge "default the screen on during the dream." into jb-mr1-dev 2012-10-09 17:38:30 -07:00
Dianne Hackborn
a8a9bd65bf Fix issue #7311376: Add API to allow apps to know if they are...
...running as the foreground user

Add UserManager.isUserRunning() which is the public version of the
existing method on ActivityManager.

Also add UserManager.isUserRunningOrStopping() since that seems like
it will be useful.

And fix the internal function that returns the array of currently
running users to not include stopped users.

Change-Id: I84672fa8748fc027fd402729586b5603f640e498
2012-10-09 17:00:31 -07:00
Svetoslav Ganov
96985fccdc Return true on successful accessiblity action click/long click.
1. If a view is clickable or long clickable perfroming the corresponding
   accessiblity action should return true no matter whether there is a
   registered on click/long click listener. Currently true is returned
   only if there is a listener but it is also possible that a sub-class
   overrides performClick and does work there. For example CompoundButton.
   Now if the view is clickable or long clickable we will call the
   perfrom* method and return true, which is we clicked.

2. Fixed some JavaDoc indentation.

bug:7318777

Change-Id: Id603fee378b8f7d07f1128b5641ede57640bab53
2012-10-09 16:32:50 -07:00
Christopher Tate
c9c47f821a Merge "Back up / restore the "Avoid poor connections" wifi setting" into jb-mr1-dev 2012-10-09 15:57:06 -07:00
Christopher Tate
16eb7cd457 Back up / restore the "Avoid poor connections" wifi setting
Bug 7318177

Change-Id: I8fdc037f823b8c57727e7d49c5bffdc9b3c10ebb
2012-10-09 15:26:30 -07:00
Eino-Ville Talvala
cbdb213646 Merge "Camera: Query AudioService for shutter sound enforcement." into jb-mr1-dev 2012-10-09 15:21:36 -07:00
Danielle Millett
61413b5ed2 Face Unlock is shown correctly during a phone call - fix b/7271718
If the user was in the middle of a phone call and went to the lock screen
it would show a black box with an X, but Face Unlock wouldn't pop up and
the X was unresponsive.

There were a few issues causing this.  The X on the default view wasn't a
button, so it has been changed to a button which will go to the backup
lock.  The concept of show() and hide() in FaceUnlock.java are obsolete
because Face Unlock is no longer being overlayed on top of the backup so
there's isn't a black box to show or hide. In addition, since it's not being
overlayed, Face Unlock doesn't cover the backup lock so fading to the backup
looks janky.  The flip animation is more appropriate.

Change-Id: I730aa4bbce42b4656ee1bce61352b8aefbd6892d
2012-10-09 18:15:49 -04:00
Robert Greenwalt
64cb35c078 Merge "Add config resource to help ATT prepaid" into jb-mr1-dev 2012-10-09 13:27:45 -07:00
Adam Powell
160621280d Merge "Allow more scaling values to be tuned in resource overlays" into jb-mr1-dev 2012-10-09 13:25:12 -07:00
Victoria Lease
c0c0c0e612 Merge "Multiuser love for LocationManager" into jb-mr1-dev 2012-10-09 12:22:03 -07:00
Robert Greenwalt
901ac560ca Add config resource to help ATT prepaid
bug:7306353
Change-Id: I8da9e7591ad5e28d5b319df11435333da44fb7d3
2012-10-09 12:20:08 -07:00
Eric Laurent
14dfe4e0ab Merge "enforce camera sound according to country code" into jb-mr1-dev 2012-10-09 11:29:11 -07:00
Adam Powell
3307958c6b Allow more scaling values to be tuned in resource overlays
Bug 7267507

Change-Id: I3fba6882a0ac4cb7d34430ba36dec83c030a73cd
2012-10-09 11:21:08 -07:00
Satoshi Kataoka
8fa0838bf8 Don't update the text services locale in the main thread
Bug: 6761326
Change-Id: I9f8a81d3c9261a6cfc00292b9f5cb06053b9112d
2012-10-09 19:20:27 +09:00
Jeff Brown
8f4baad387 Merge "Blank or unblank all displays as need." into jb-mr1-dev 2012-10-09 00:02:46 -07:00
Eino-Ville Talvala
4f8e5ce21d Camera: Query AudioService for shutter sound enforcement.
The AudioService now tracks the shutter sound enforcement status, in
addition to the existing approach. Check with it when doing shutter
sound operations.

Bug: 7032634
Change-Id: Ief855d3a36ca5679832cf439f5638b10f70b8636
2012-10-08 23:53:48 -07:00
Jeff Brown
9e316a1a2a Blank or unblank all displays as need.
Ensures that both the internal display and HDMI are blanked
or unblanked in tandem.

Bug: 7309812
Change-Id: Ie8b96d393e8bb20d23c92f3320142d9f7cf42aff
2012-10-08 19:23:15 -07:00
Jim Miller
0c9b5359bd Merge "Fix "checking account" string" into jb-mr1-dev 2012-10-08 17:26:22 -07:00
Chris Wren
a934fd142e default the screen on during the dream.
Bug: 7295909
Change-Id: Ic629bd08bdade8dba2b92124c56cab1bb438bec2
2012-10-08 17:23:36 -07:00
Victoria Lease
b711d57ca4 Multiuser love for LocationManager
LocationManagerService now keeps track of the current user ID and
denies location requests made by all but the foreground user.

Additionally, location settings are now user-specific, rather than
global to the device. Location provider services now run as specific
users, and when the device's foreground user changes, we rebind to
appropriately-owned providers.

Bug: 6926385
Bug: 7247203
Change-Id: I346074959e96e52bcc77eeb188dffe322b690879
2012-10-08 17:19:43 -07:00
Eric Laurent
dd45d01128 enforce camera sound according to country code
Use mcc config overlay mechanism to enforce camera shutter sounds
in countries where it is mandatory.
Property ro.camera.sound.forced is not needed anymore.
When camera sound is forced, STREAM_SYSTEM_ENFORCED is removed from
streams affected by ringer mode and its volume is
maxed out. AudioSystem.FORCE_SYSTEM_ENFORCED is sent to audio
policy manager to alter the routing policy for STREAM_SYSTEM_ENFORCED.

Also fix streams being unmuted when settings are reloaded
upon user switch while in silent mode.

Add ringer mode to audio service dump.

Bug 7032634.

Change-Id: Iceea5bba3b8d3aabf8e42b222deb33a893dc8f38
2012-10-08 17:00:02 -07:00
Jim Miller
6c5bd361fe Fix "checking account" string
Fixes bug 7309934

Change-Id: Ia665142b8dcd8de424312bd7bf0800d7b871b03b
2012-10-08 16:38:50 -07:00
Dianne Hackborn
4efbab480d Merge "Framework side of issue #7302511: GCM client needs to use new framework API..." into jb-mr1-dev 2012-10-08 15:02:56 -07:00
Baligh Uddin
bd03f5abb7 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-08 14:59:37 -07:00
Baligh Uddin
46c2699824 Import translations. DO NOT MERGE
Change-Id: I8dd8dacad06a9f7be27ac666f7fc4a51308347aa
Auto-generated-cl: translation import
2012-10-08 14:47:48 -07:00
Dianne Hackborn
36d337adff Framework side of issue #7302511: GCM client needs to use new framework API...
...to fix background->shutdown delivery race

Add ACTION_STOPPING and ACTION_STARTING to allow such apps to keep track of
which users are started/stopped, and be involved in the process of stopping
a user.

Also get rid of the scale part of the wallpaper transitions, since it seems
like I have still failed at getting the user switch to wait until the new
wallpaper is displayed.

Change-Id: If7e8fdae3544a9d7987a1b9274dc8b49022f6f62
2012-10-08 14:33:47 -07:00
Jim Miller
8215ddb4f5 Merge "Properly handle cancel event in GlowPadView" into jb-mr1-dev 2012-10-08 13:40:15 -07:00
Raph Levien
9704b563d6 Merge "Fix for 7301594 Html.toHtml creating potentially invalid html" into jb-mr1-dev 2012-10-08 12:40:17 -07:00
Baligh Uddin
0e2aade9f1 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-08 08:29:02 -07:00
Amith Yamasani
9c2a38ed10 Merge "Fix resource reading for secondary users" into jb-mr1-dev 2012-10-07 22:53:18 -07:00
Jim Miller
245b453733 Properly handle cancel event in GlowPadView
There was a workaround used in a previous release where we effectively
ignored cancel events to work around another bug.  This change removes
the workaround and GlowPadView correctly handles the event.

Bug 6903638

Change-Id: I9b510985c6da346a4e10cf2535267c8d5efa5871
2012-10-07 20:16:54 -07:00
Romain Guy
133fcdf44b Merge "Clear draw flags when updating TextureView's layer Bug #7171323" into jb-mr1-dev 2012-10-07 18:00:41 -07:00
Romain Guy
52b307ebc8 Clear draw flags when updating TextureView's layer
Bug #7171323

Finally!

Change-Id: Iefef8fb9a8ef1fe4b374005067145319312c57cf
2012-10-07 17:57:30 -07:00
Raph Levien
286da7b6f5 Fix for 7301594 Html.toHtml creating potentially invalid html
Generate <p dir="rtl"> instead of <p dir=rtl>. The form with the quotes
is cleaner and will reduce warnings in apps that consume the output.

Change-Id: Ic9879c8c882c42079598b741e897a24415d96374
2012-10-07 16:57:27 -07:00
Amith Yamasani
64442c1155 Fix resource reading for secondary users
Bug: 7086881

Load resources for the correct user.

Also clean up package monitoring and locking.
Added dump method to SearchManagerService.

Sneaking in a change to make crash dialogs visible to current user.

Change-Id: Id56dd15428d66084de995e28be242db27c15fda3
2012-10-07 15:56:34 -07:00
Adam Cohen
5745a6763a Merge "Suppress unnecessary calls to update widget size (issue 7287744)" into jb-mr1-dev 2012-10-07 12:38:33 -07:00