Commit Graph

86088 Commits

Author SHA1 Message Date
Baligh Uddin
521da7ec67 Import translations. DO NOT MERGE
Change-Id: I57efb052a4003b16c6901ea8af12efcd535d1e4c
Auto-generated-cl: translation import
2012-10-10 13:15:41 -07:00
Zhihai Xu
251445667c Merge "Bluetooth multi-user updates: change bluetooth manager system service to reject background user access. disable and enable Bluetooth when user is switched" into jb-mr1-dev 2012-10-10 09:52:33 -07:00
Ken Wakasa
1a5f387bcf Merge "Revert "Don't update the text services locale in the main thread"" into jb-mr1-dev 2012-10-10 09:32:36 -07:00
Geremy Condra
ba683efa41 am 3f542740: (-s ours) am c2e3be5a: Merge "DO NOT MERGE Control access to inherited methods of jsinterface objects" into jb-dev
* commit '3f542740065f3708f70acb48dd93651ed896e029':
  DO NOT MERGE Control access to inherited methods of jsinterface objects
2012-10-10 09:17:59 -07:00
Geremy Condra
96a294de1f am dadea723: (-s ours) am a22000d2: Merge "DO NOT MERGE remove defunct javascript interface" into jb-dev
* commit 'dadea723a3e4485d2ee450ce76e772da33477f80':
  DO NOT MERGE remove defunct javascript interface
2012-10-10 09:17:56 -07:00
Dirk Dougherty
1ed1a44073 am 0c9c8d0a: am 137b8f4c: am f761a9a6: Merge "Doc change: edits to TV tablet story." into jb-dev-docs
* commit '0c9c8d0a065ca56676e09688c0f643904eac1c69':
  Doc change: edits to TV tablet story.
2012-10-10 09:17:49 -07:00
Dirk Dougherty
8ff081d204 am 8048b9ec: am 28a40e01: am aa0d43ba: Merge "Doc change: Link to AVDs docs from tablet quality checklist." into jb-dev-docs
* commit '8048b9ec0c1ecc7fbe557105b87ba21329fe6169':
  Doc change: Link to AVDs docs from tablet quality checklist.
2012-10-10 09:17:48 -07:00
Ken Wakasa
72fa0b35c5 Revert "Don't update the text services locale in the main thread"
This reverts commit 8fa0838bf8

Change-Id: Ie790ae6dcb33d05d1fbf86c8ef28aec6fe60793a
2012-10-10 09:17:18 -07:00
Marco Nelissen
437e9cc388 Merge "Adjust buffer position after copying" into jb-mr1-dev 2012-10-10 08:06:58 -07:00
Jeff Brown
f6138f0720 Merge "Don't consider the boot completed until the animation is over." into jb-mr1-dev 2012-10-10 00:35:20 -07:00
Jeff Sharkey
0fca2a3e22 Merge "Fix build, only invalidate when creating user." into jb-mr1-dev 2012-10-10 00:09:52 -07:00
Jeff Sharkey
9d0791bf6a Fix build, only invalidate when creating user.
Bug: 7276595
Change-Id: I322f9d76a682b2d45fc556e35381442458168fe5
2012-10-10 00:01:26 -07:00
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
Yu Shan Emily Lau
d175a75d9f Merge "Instead of collecting the procmem output in the test, change it as optional. This is to avoid the tool breakage will block the whole memory test sutie." into jb-mr1-dev 2012-10-09 23:05: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
Geremy Condra
3f54274006 am c2e3be5a: Merge "DO NOT MERGE Control access to inherited methods of jsinterface objects" into jb-dev
* commit 'c2e3be5a8bcd3be2d6cb6fda0cda28bc87d7814d':
  DO NOT MERGE Control access to inherited methods of jsinterface objects
2012-10-09 21:37:23 -07:00
Geremy Condra
c2e3be5a8b Merge "DO NOT MERGE Control access to inherited methods of jsinterface objects" into jb-dev 2012-10-09 21:34:38 -07:00
Geremy Condra
dadea723a3 am a22000d2: Merge "DO NOT MERGE remove defunct javascript interface" into jb-dev
* commit 'a22000d244915df2098619be5fd66bf1c4d019c8':
  DO NOT MERGE remove defunct javascript interface
2012-10-09 21:34:33 -07:00
Geremy Condra
a22000d244 Merge "DO NOT MERGE remove defunct javascript interface" into jb-dev 2012-10-09 21:32:01 -07:00
Daniel Sandler
3041750782 Merge "Fixing issue where Quick Settings user profile was not showing name or default picture. (Bug 7308719)" into jb-mr1-dev 2012-10-09 20:53:44 -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 2133caf515

Change-Id: I987d5533e8ce909a3adfa38bceeac5c42e22da19
2012-10-09 19:13:31 -07:00
Yu Shan Emily Lau
2ffd20753e Instead of collecting the procmem output in
the test, change it as optional. This is to avoid
the tool breakage will block the whole memory test sutie.

Change-Id: Ia7425531ca2151230d7fd98eb710f282e166b4f7
2012-10-09 19:12:46 -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
Zhihai Xu
40874a096b Bluetooth multi-user updates: change bluetooth manager system service
to reject background user access. disable and enable Bluetooth when user is switched

bug 6925422

Change-Id: I52136e707da2d1ba8228c1bb8beef1414ead1893
2012-10-09 19:10:14 -07:00
Jeff Brown
20767b2d1e Don't consider the boot completed until the animation is over.
This fixes a problem where the screen times out shortly after
boot before the user has had a chance to interact with the device.
Now we wait until the boot animation has completed then set
boot completed, poke user activity and start the countdown.

Bug: 7316397
Change-Id: Ie5a0b1012d265e655d33cc8fba49ca349f48f1de
2012-10-09 19:06:25 -07:00
Selim Gurun
534a67c557 DO NOT MERGE Control access to inherited methods of jsinterface objects
Bug: 7073422

Create the plumbing to use an annotation to allow access to
inherited methods of jsinterface objects. The default webview
behavior has not changed yet. However internally an a flag is
introduced to restrict javascript access to methods that have an annotation.

Clean cherry pick of 94740e6c33

Provided @JavascriptInterface to methods that are accessible from
js.

Clean cherry pick of b743a23fc5

Add a glue logic to require use of annotations in injected accessibility
 objects.

Change-Id: I4135bd6787b2084177215302cd2c72afed090dc0
2012-10-09 18:42:15 -07:00
Svetoslav Ganov
64182d8444 Merge "Properly label RecentsActivity for accessibility. Bug: 7229886" into jb-mr1-dev 2012-10-09 18:33:31 -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
Casey Burkhardt
d7059dfb9b Properly label RecentsActivity for accessibility.
Bug: 7229886

Change-Id: I440c7e9b9ef3272e287d5d4d58bcfc0e8d0735ac
2012-10-09 17:53:21 -07:00
Baligh Uddin
2133caf515 Revert "Add config resource to help ATT prepaid"
breaking jb-mr1-release

This reverts commit 901ac560ca

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
Dirk Dougherty
0c9c8d0a06 am 137b8f4c: am f761a9a6: Merge "Doc change: edits to TV tablet story." into jb-dev-docs
* commit '137b8f4c0e8fdc354432231362a0bfbcf11ed96e':
  Doc change: edits to TV tablet story.
2012-10-09 17:36:26 -07:00
Dirk Dougherty
137b8f4c0e am f761a9a6: Merge "Doc change: edits to TV tablet story." into jb-dev-docs
* commit 'f761a9a634a43662525d9c0c537ac5499263fd81':
  Doc change: edits to TV tablet story.
2012-10-09 17:33:52 -07:00
Winson Chung
7a6355b679 Fixing issue where Quick Settings user profile was not showing name or default picture. (Bug 7308719)
Change-Id: Idbaf377d1cd086cf5d8244d6c7ca084145ccf217
2012-10-09 17:33:16 -07:00
Dirk Dougherty
f761a9a634 Merge "Doc change: edits to TV tablet story." into jb-dev-docs 2012-10-09 17:31:35 -07:00
Eric Laurent
6f2cdcdbe4 Merge "fix concurrent headset and HDMI connection" into jb-mr1-dev 2012-10-09 17:25:27 -07:00
John Spurlock
59a9603664 Merge "Disable Camera + Search until USER_SETUP_COMPLETE." into jb-mr1-dev 2012-10-09 17:24:58 -07:00
Craig Mautner
0cd641001a Merge "Remove debugging statements before final ROM." into jb-mr1-dev 2012-10-09 17:18:30 -07:00
Irfan Sheriff
17cf1f2bbc Fix build
had local changes from b/7318044

Change-Id: Idc6907d648a07d36f93dee859e361e9655cdd8e6
2012-10-09 17:13:37 -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
Jeff Brown
f545660dcb Merge "Prevent full wake lock from keeping device awake while dreaming." into jb-mr1-dev 2012-10-09 16:54:12 -07:00
Jeff Brown
637a30fde7 Merge "Fix a segfault when there is no power module." into jb-mr1-dev 2012-10-09 16:51:49 -07:00
Eric Laurent
9e6e8355f8 fix concurrent headset and HDMI connection
Fix a bug in WiredAccessoryManager causing an
HDMI disconnection to be signaled to AudioService when a
headset is connected.

Bug 7313250.

Change-Id: I7c6446104c55f9a4fc146abe7020df45ad6ba5e7
2012-10-09 16:41:32 -07:00