Svetoslav Ganov
52c59ddfee
am 27258209: Merge "Return true on successful accessiblity action click/long click." into jb-mr1-dev
...
* commit '27258209fee11a45154875c3c5493962f55904d2':
Return true on successful accessiblity action click/long click.
2012-10-09 17:54:58 -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
7beb70a94a
am e5456645: am 840590dd: Merge "Fix issue #7311376 : Add API to allow apps to know if they are..." into jb-mr1-dev
...
* commit 'e54566457869a15d606870c230662b76c02456cb':
Fix issue #7311376 : Add API to allow apps to know if they are...
2012-10-09 17:51:13 -07:00
Dianne Hackborn
e545664578
am 840590dd: Merge "Fix issue #7311376 : Add API to allow apps to know if they are..." into jb-mr1-dev
...
* commit '840590dd642719f402491092944a12475d6d6a8e':
Fix issue #7311376 : Add API to allow apps to know if they are...
2012-10-09 17:49:11 -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
b0a230174d
am f37e38a0: am f966cf35: Merge "default the screen on during the dream." into jb-mr1-dev
...
* commit 'f37e38a0b3284aaa27a153a3c017a60be1018e3e':
default the screen on during the dream.
2012-10-09 17:42:28 -07:00
Chris Wren
f37e38a0b3
am f966cf35: Merge "default the screen on during the dream." into jb-mr1-dev
...
* commit 'f966cf353942690ca691e52a5b396a824fd52829':
default the screen on during the dream.
2012-10-09 17:41:05 -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
6ee2d3c744
am 5dfd668e: am 6f2cdcdb: Merge "fix concurrent headset and HDMI connection" into jb-mr1-dev
...
* commit '5dfd668e9fa09760e59293e18f433d917cf42b38':
fix concurrent headset and HDMI connection
2012-10-09 17:29:00 -07:00
John Spurlock
bca3dc965a
am 896fc03e: am 59a96036: Merge "Disable Camera + Search until USER_SETUP_COMPLETE." into jb-mr1-dev
...
* commit '896fc03ebf321e8b93e60635252888bac63e12ac':
Disable Camera + Search until USER_SETUP_COMPLETE.
2012-10-09 17:28:56 -07:00
Eric Laurent
5dfd668e9f
am 6f2cdcdb: Merge "fix concurrent headset and HDMI connection" into jb-mr1-dev
...
* commit '6f2cdcdbe4096565434c31cf4fe3c782c38f1ce1':
fix concurrent headset and HDMI connection
2012-10-09 17:27:36 -07:00
John Spurlock
896fc03ebf
am 59a96036: Merge "Disable Camera + Search until USER_SETUP_COMPLETE." into jb-mr1-dev
...
* commit '59a960366424a354c7ddbca9a8d6008886ca2a77':
Disable Camera + Search until USER_SETUP_COMPLETE.
2012-10-09 17:27:33 -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
73b9752a00
am c95478cc: am 0cd64100: Merge "Remove debugging statements before final ROM." into jb-mr1-dev
...
* commit 'c95478cc9abe6229f078b6d8ebea8a9c795cbc78':
Remove debugging statements before final ROM.
2012-10-09 17:24:04 -07:00
Craig Mautner
c95478cc9a
am 0cd64100: Merge "Remove debugging statements before final ROM." into jb-mr1-dev
...
* commit '0cd641001a152893642b702446bb12c7c0c08e48':
Remove debugging statements before final ROM.
2012-10-09 17:21:47 -07:00
Irfan Sheriff
eba024eae8
am a65430a2: am 17cf1f2b: Fix build
...
* commit 'a65430a2a5e948eaa49ec5e50f18289a75a3a54a':
Fix build
2012-10-09 17:19:38 -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
a65430a2a5
am 17cf1f2b: Fix build
...
* commit '17cf1f2bbc3f7d4f367dbbee935d2939957c0ef6':
Fix build
2012-10-09 17:17:34 -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
a047faed5a
am a003f8c6: am f545660d: Merge "Prevent full wake lock from keeping device awake while dreaming." into jb-mr1-dev
...
* commit 'a003f8c6e62181d803b019267e27ea12498bef4a':
Prevent full wake lock from keeping device awake while dreaming.
2012-10-09 16:59:46 -07:00
Jeff Brown
329a5a90e4
am 07d655e6: am 637a30fd: Merge "Fix a segfault when there is no power module." into jb-mr1-dev
...
* commit '07d655e68dc6f604fea1292b8ebc402dd0166f9c':
Fix a segfault when there is no power module.
2012-10-09 16:57:50 -07:00
Jeff Brown
a003f8c6e6
am f545660d: Merge "Prevent full wake lock from keeping device awake while dreaming." into jb-mr1-dev
...
* commit 'f545660dcb54f90ad6a79ef0d7dccb509dc69017':
Prevent full wake lock from keeping device awake while dreaming.
2012-10-09 16:57:15 -07:00
Jeff Brown
07d655e68d
am 637a30fd: Merge "Fix a segfault when there is no power module." into jb-mr1-dev
...
* commit '637a30fde7d1754f8b8a76c08326e1c432ffd93d':
Fix a segfault when there is no power module.
2012-10-09 16:54:26 -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
Irfan Sheriff
b3b4595f69
am 15253453: am 79dc154a: Merge "Disable poor network avoidance by default" into jb-mr1-dev
...
* commit '15253453182cafc1cbd9e71240f574e127e229d6':
Disable poor network avoidance by default
2012-10-09 16:35:56 -07:00
Irfan Sheriff
1525345318
am 79dc154a: Merge "Disable poor network avoidance by default" into jb-mr1-dev
...
* commit '79dc154afeece0db6ef602c70a34dd69bada03dc':
Disable poor network avoidance by default
2012-10-09 16:33:54 -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
Christopher Tate
5fb80c6ee5
am d44525dc: am b30a8568: Merge "Defer wifi bounce following restore for 1 minute..." into jb-mr1-dev
...
* commit 'd44525dcd33babbb0f4e38c4a274a233283d64e0':
Defer wifi bounce following restore for 1 minute...
2012-10-09 16:14:33 -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
d44525dcd3
am b30a8568: Merge "Defer wifi bounce following restore for 1 minute..." into jb-mr1-dev
...
* commit 'b30a8568a8b31578b10af948869558ae218d0d5c':
Defer wifi bounce following restore for 1 minute...
2012-10-09 16:09:39 -07:00
The Android Automerger
3ab07daba2
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-09 16:07:21 -07:00
Christopher Tate
fcd4db9b81
am 711b4fca: am c9c47f82: Merge "Back up / restore the "Avoid poor connections" wifi setting" into jb-mr1-dev
...
* commit '711b4fcadda2948b73e97f4ff3dc3e96b5316499':
Back up / restore the "Avoid poor connections" wifi setting
2012-10-09 16:05:25 -07: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
711b4fcadd
am c9c47f82: Merge "Back up / restore the "Avoid poor connections" wifi setting" into jb-mr1-dev
...
* commit 'c9c47f821af22c6fae4c97fe185c6a651a6f9b67':
Back up / restore the "Avoid poor connections" wifi setting
2012-10-09 16:01:59 -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