86175 Commits

Author SHA1 Message Date
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 2133caf515660d957bb7fd05b35e7eb2f2391d48

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 94740e6c333a109be7516abbd17dd418f23b4f0c

Provided @JavascriptInterface to methods that are accessible from
js.

Clean cherry pick of b743a23fc5bce9965c1539c3c8611614424a5aff

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 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
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
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
Irfan Sheriff
79dc154afe Merge "Disable poor network avoidance by default" into jb-mr1-dev 2012-10-09 16:31:03 -07:00
John Spurlock
fafdb6f9ca Disable Camera + Search until USER_SETUP_COMPLETE.
Check the status of Settings.Secure.USER_SETUP_COMPLETE for the current
user when showing the keyguard, disabling the Camera + Search touchpoints
entirely until the user makes it through the setup wizard.

Bug:7308791
Change-Id: Ic8e3596582c2aefc7fe15af1824ed6bfd541dffa
2012-10-09 19:10:33 -04:00
Christopher Tate
b30a8568a8 Merge "Defer wifi bounce following restore for 1 minute..." into jb-mr1-dev 2012-10-09 16:05:04 -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
Jeff Brown
10428748f9 Prevent full wake lock from keeping device awake while dreaming.
A dream may itself hold a wake lock in order to keep the screen
bright as it runs.  However this wake lock also causes the device
to stay awake even when it is not plugged in which is undesirable.

This change makes full wake locks behave differently when napping
or dreaming.  The wake lock still keeps the screen bright but
it does not prevent the device from falling asleep.  This is
similar to our policy of ignoring full wake locks completely when
the device is manually put to sleep by the user.

Bug: 7295909
Change-Id: Id99e82d2143ae1a81629281d6407d7527efb8137
2012-10-09 15:52:31 -07:00
Dirk Dougherty
8048b9ec0c am 28a40e01: am aa0d43ba: Merge "Doc change: Link to AVDs docs from tablet quality checklist." into jb-dev-docs
* commit '28a40e01fec9e00c74e52a88a5f6fca98057af91':
  Doc change: Link to AVDs docs from tablet quality checklist.
2012-10-09 15:52:13 -07:00
Dirk Dougherty
28a40e01fe am aa0d43ba: Merge "Doc change: Link to AVDs docs from tablet quality checklist." into jb-dev-docs
* commit 'aa0d43ba2581bb97f9ee955ea185b4f2759055c6':
  Doc change: Link to AVDs docs from tablet quality checklist.
2012-10-09 15:50:12 -07:00
Irfan Sheriff
bbe461b78f Disable poor network avoidance by default
Bug: 7318044
Change-Id: Icf27e823453eeaba901aad6f3f8eedea242794f9
2012-10-09 15:49:33 -07:00
Dirk Dougherty
aa0d43ba25 Merge "Doc change: Link to AVDs docs from tablet quality checklist." into jb-dev-docs 2012-10-09 15:48:34 -07:00
Dirk Dougherty
f32b582597 Doc change: Link to AVDs docs from tablet quality checklist.
Change-Id: Ifb20a903a0dd32009b6db6e583a6d0c86cddb52e
2012-10-09 15:43:10 -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
Kenny Root
a8a6b0848d Merge "Add fused location provider to real provider list" into jb-mr1-dev 2012-10-09 15:21:36 -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
Jim Miller
74bc9b6851 Merge "Implement music and user priority scheme in keyguard" into jb-mr1-dev 2012-10-09 15:12:44 -07:00
Christopher Tate
d488bc0ef4 Defer wifi bounce following restore for 1 minute...
...to allow network-reliant restore actions by apps to get underway.

Bug 7304761

Change-Id: Ia1d2321ef86609588efbc7add043c24a12ec6a20
2012-10-09 15:11:01 -07:00