drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
81,630 Commits 1 Branch 0 Tags
Commit Graph

81630 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dirk Dougherty
24a3242029 Doc change: updated numbers for Andriod. Fix gcm image path. 
Change-Id: Ia3b43f9464938b9775ee6f77c850af37fac9117f
 2012-07-02 15:52:25 -07:00
Irfan Sheriff
dfd42a9bbc Ignore auth failures during WPS 
During WPS, EAP failure occurs many times due to searching
external registrar. EAP failure can also occur after WPS-success.
WPS failures are handled through seperate events, ignore auth failures.

Change-Id: I6a051398d306250510536d157bf812b5a434c84b
Signed-off-by: Irfan Sheriff <isheriff@google.com>
Signed-off-by: Yoshihiko Ikenaga <yoshihiko.ikenaga@jp.sony.com>
 2012-07-02 15:31:27 -07:00
Jean-Baptiste Queru
6876aa6d46 am e39d42db: (-s ours) Merge "Revert "DO NOT MERGE: Remove SMS shortcode warning feature."" into jb-dev-plus-aosp 
* commit 'e39d42db00211bc6a712a3177ed77123265a934b':
  Revert "DO NOT MERGE: Remove SMS shortcode warning feature."
 2012-07-02 14:54:00 -07:00
Jean-Baptiste Queru
e1f2824ac1 am 5709f43d: (-s ours) Merge "Revert "DO NOT MERGE: Remove SMS shortcode warning feature."" into jb-dev-plus-aosp 
* commit '5709f43dd80ed9e3264eaca098f05d9e59c8b937':
  Revert "DO NOT MERGE: Remove SMS shortcode warning feature."
 2012-07-02 14:53:55 -07:00
Jean-Baptiste Queru
c8136f058b am 3cd92d8f: (-s ours) Merge "Fix a bad comment. - DO NOT MERGE" into jb-dev-plus-aosp 
* commit '3cd92d8faa9fd345d5bfc0d794e28449d4f6c810':
  Fix a bad comment. - DO NOT MERGE
 2012-07-02 14:51:00 -07:00
Jean-Baptiste Queru
46f2c22b32 am df0dded1: (-s ours) Merge "Telephony Capability-Distinguish dialing & connect - DO NOT MERGE" into jb-dev-plus-aosp 
* commit 'df0dded1e74e7394b79b03327dcec8a0b565838e':
  Telephony Capability-Distinguish dialing & connect - DO NOT MERGE
 2012-07-02 14:50:56 -07:00
Jean-Baptiste Queru
0aa2db4366 am 2a2d5e0b: (-s ours) Merge "When we disconnect shutdown the StateMachine. DO NOT MERGE" into jb-dev-plus-aosp 
* commit '2a2d5e0b31d8a4dafa7dc5c68a68debbe837b04d':
  When we disconnect shutdown the StateMachine. DO NOT MERGE
 2012-07-02 14:50:52 -07:00
Jean-Baptiste Queru
777d991cf3 am 1fe7a813: (-s ours) Merge "Enhance StateMachine Quitting and logging support. DO NOT MERGE" into jb-dev-plus-aosp 
* commit '1fe7a81383a0b7c87be2cc4291e1ede9d85bf819':
  Enhance StateMachine Quitting and logging support. DO NOT MERGE
 2012-07-02 14:50:47 -07:00
Jean-Baptiste Queru
e39d42db00 Merge "Revert "DO NOT MERGE: Remove SMS shortcode warning feature."" into jb-dev-plus-aosp 2012-07-02 14:48:48 -07:00
Jean-Baptiste Queru
5709f43dd8 Merge "Revert "DO NOT MERGE: Remove SMS shortcode warning feature."" into jb-dev-plus-aosp 2012-07-02 14:48:44 -07:00
Jean-Baptiste Queru
3cd92d8faa Merge "Fix a bad comment. - DO NOT MERGE" into jb-dev-plus-aosp 2012-07-02 14:48:38 -07:00
Jean-Baptiste Queru
df0dded1e7 Merge "Telephony Capability-Distinguish dialing & connect - DO NOT MERGE" into jb-dev-plus-aosp 2012-07-02 14:48:33 -07:00
Jean-Baptiste Queru
2a2d5e0b31 Merge "When we disconnect shutdown the StateMachine. DO NOT MERGE" into jb-dev-plus-aosp 2012-07-02 14:48:28 -07:00
Jean-Baptiste Queru
1fe7a81383 Merge "Enhance StateMachine Quitting and logging support. DO NOT MERGE" into jb-dev-plus-aosp 2012-07-02 14:48:19 -07:00
Gilles Debunne
884eb4b884 Merge "Better handling of spaces at ends of lines in StaticLayout." 2012-07-02 14:41:57 -07:00
Gilles Debunne
58cf576243 Merge "UI changes in suggestion menu" 2012-07-02 14:40:50 -07:00
Eric Fischer
0e71d19abb am 82b141e2: (-s ours) am c70ec659: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit '82b141e26771f2f1fc16af12a9435f7a60091738':
  Import translations. DO NOT MERGE
 2012-07-02 14:12:46 -07:00
Eric Fischer
e0a50cdd81 Merge "Import translations. DO NOT MERGE" 2012-07-02 14:11:56 -07:00
Eric Fischer
82b141e267 am c70ec659: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit 'c70ec659e8f63b31e11f5f0a82c638261d67056e':
  Import translations. DO NOT MERGE
 2012-07-02 14:09:49 -07:00
Eric Fischer
d4def39cc8 Merge "Import translations. DO NOT MERGE" 2012-07-02 14:07:51 -07:00
Eric Fischer
c70ec659e8 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-07-02 14:07:11 -07:00
Craig Mautner
503d6a44a8 DO NOT MERGE Set force hiding differently 
Only force hide windows when the keyguard is animating in.

Fixes bug 6721572.

Change-Id: Iad7b8b811bcf0840726cbf6c6f279dabd08a3aba

Conflicts:

	services/java/com/android/server/wm/WindowAnimator.java
 2012-07-02 13:16:15 -07:00
John Huang
0a6101b2ad am 5045dd60: am 46c923af: Merge "Fix country code for Netherlands Antilles." into jb-dev 
* commit '5045dd60295231b1fd2711d01b9bdc53bae445ab':
  Fix country code for Netherlands Antilles.
 2012-07-02 12:58:51 -07:00
The Android Automerger
837459e4fe merge in jb-release history after reset to jb-dev 2012-07-02 12:55:39 -07:00
John Huang
5045dd6029 am 46c923af: Merge "Fix country code for Netherlands Antilles." into jb-dev 
* commit '46c923afd50741c8d185a6d0c7666a86c9dfe712':
  Fix country code for Netherlands Antilles.
 2012-07-02 12:55:01 -07:00
John Huang
46c923afd5 Merge "Fix country code for Netherlands Antilles." into jb-dev 2012-07-02 12:52:29 -07:00
Eric Fischer
22881d06e2 Import translations. DO NOT MERGE 
Change-Id: I71a10d97e9593fa75fe913fb78e3c579636d73cd
Auto-generated-cl: translation import
 2012-07-02 12:42:21 -07:00
Scott Main
2be5147e88 am 4faac02a: am 0dc12ee0: Merge "docs: new dashboard stats for 7/2" into jb-dev 
* commit '4faac02a1d7f2b139e931e05365fbb8f481aeca1':
  docs: new dashboard stats for 7/2
 2012-07-02 12:39:37 -07:00
Jean-Baptiste Queru
7ebd4bae74 Revert "DO NOT MERGE: Remove SMS shortcode warning feature." 
This reverts commit 004ff5ad2aa02daff607bcf1712f3efbb84c58ca.
 2012-07-02 12:36:47 -07:00
Scott Main
4faac02a1d am 0dc12ee0: Merge "docs: new dashboard stats for 7/2" into jb-dev 
* commit '0dc12ee0f1cde86522724f176ed5a6d62142c47d':
  docs: new dashboard stats for 7/2
 2012-07-02 12:36:14 -07:00
Scott Main
0dc12ee0f1 Merge "docs: new dashboard stats for 7/2" into jb-dev 2012-07-02 12:33:03 -07:00
Eric Fischer
1edff6c853 Import translations. DO NOT MERGE 
Change-Id: Ib290a3fcb0f12e6c4f784dde2ebab0b73e8c92fd
Auto-generated-cl: translation import
 2012-07-02 12:32:44 -07:00
Jean-Baptiste Queru
a02bce1d5b Revert "DO NOT MERGE: Remove SMS shortcode warning feature." 
This reverts commit b1fc08ca082db8ecad54c792485ff7915e3513ce.
 2012-07-02 12:30:32 -07:00
Wink Saville
829edb8a53 Fix country code for Netherlands Antilles. 
Change the cc to "ai" from "nl" otherwise the timezone is
set to Netherlands which is +1 rather than the Caribbean
which is -4.

Bug: 6765706
Change-Id: Ie399efe95ce93b73eb4e60cfc47e621cce85e6e5
 2012-07-02 12:26:21 -07:00
Eric Fischer
a2b17b8895 Import translations. DO NOT MERGE 
Change-Id: I5eae952127a0af6618ab96065cd50d78bbaea189
Auto-generated-cl: translation import
 2012-07-02 12:25:39 -07:00
Scott Main
6039f148f2 docs: new dashboard stats for 7/2 
Change-Id: I29cdbbc9ef11ccd6398613b8dce8e25ab406318f
 2012-07-02 12:23:52 -07:00
Dirk Dougherty
8dd3132e49 am e030c61a: am 73d90e79: Merge "Doc change: fix incorrect links to dashboard." into jb-dev 
* commit 'e030c61a72ababbfb02162dd38f6d6fcf998d0a4':
  Doc change: fix incorrect links to dashboard.
 2012-07-02 11:21:42 -07:00
Dirk Dougherty
e030c61a72 am 73d90e79: Merge "Doc change: fix incorrect links to dashboard." into jb-dev 
* commit '73d90e797bf52b52372314477553b140818717c9':
  Doc change: fix incorrect links to dashboard.
 2012-07-02 11:18:38 -07:00
Dirk Dougherty
73d90e797b Merge "Doc change: fix incorrect links to dashboard." into jb-dev 2012-07-02 11:15:29 -07:00
Dirk Dougherty
4cdf3a2002 am e8ee48ea: am 418203d1: Doc change: Add Google Play balance back into monetizing docs. 
* commit 'e8ee48ea9fb281366e1edec685e3778bb32b7425':
  Doc change: Add Google Play balance back into monetizing docs.
 2012-07-02 11:11:21 -07:00
Dirk Dougherty
e8ee48ea9f am 418203d1: Doc change: Add Google Play balance back into monetizing docs. 
* commit '418203d1d57d9aca455e84b6a4e6bee8a000fdd6':
  Doc change: Add Google Play balance back into monetizing docs.
 2012-07-02 11:07:20 -07:00
Dirk Dougherty
63cb3d474f Doc change: fix incorrect links to dashboard. 
Change-Id: I31c754aa036b0770c7cd8596594bb2cedd47f1a7
 2012-07-02 11:05:55 -07:00
Dirk Dougherty
418203d1d5 Doc change: Add Google Play balance back into monetizing docs. 
Change-Id: I4326cbd7b93f0429b34f56f7ad67d910bcb0c6e1
 2012-07-02 11:03:31 -07:00
Santos Cordon
53149fd1eb Fix a bad comment. - DO NOT MERGE 
Change-Id: I923fb003cc37f562ff6cc5a4cdcc8dd4ea227dc0
 2012-07-02 10:57:31 -07:00
Santos Cordon
992a57bf39 Telephony Capability-Distinguish dialing & connect - DO NOT MERGE 
New capability returns true if the device can distinguish between
dialing/active and connected reliably. Currently returns true only for
GSM phones.

Change-Id: I50751abaf74b31fdc747f4d04ca9a2ac4d73a1ff
 2012-07-02 10:57:25 -07:00
Wink Saville
2686b058cd When we disconnect shutdown the StateMachine. DO NOT MERGE 
Need to stop the StateMachine threads and release
all resources when we disconnect.

bug: 6342470
Change-Id: Ibf7a2ebf4f7ecd667c5d95579e66ecd5086103ea
 2012-07-02 10:57:16 -07:00
Wink Saville
095c58b73a Enhance StateMachine Quitting and logging support. DO NOT MERGE 
Make StateMachine#quit non-conditional and remove the need to
process the SM_QUIT_CMD it is now private.

Rename halting to onHalting.

Add onQuitting

Change the message specific logging to be more generic and change
the xxxProcessedMessagesYyy methods to xxxLogRecXyy names. Also add
addLogRec(String) and addLogRec(String, State) as the generic logging
methods.

bug: 5678189
Change-Id: I22f66d11828bfd70498db625fe1be728b90478b7

Conflicts:

	services/java/com/android/server/NsdService.java
 2012-07-02 10:57:11 -07:00
satok
0aa0734149 Update spell checking documents 
Bug: 6334194

Original graffle files are
https://docs.google.com/a/google.com/open?id=0B7cspKDw7KgTcWQzckQwY2xuQTg
https://docs.google.com/a/google.com/open?id=0B7cspKDw7KgTTXJVNFdVMDlzTmM

Change-Id: I3097f770a4c71d41bb4b79336900c31cb0be0175
 2012-07-02 15:06:05 +09:00
Craig Mautner
5702d4dfb5 Notify client side of window movement. 
Add a one way method to notify Views that the window has moved
on the screen. Fixes issues arising from the IME popping up and
translating the window that uses it. Accessibility was left unaware
of these movements and was drawing the box around the wrong widgets.
Similarly PopupWindow used getLocationOnScreen to determine how
much screen real estate was above and below the anchor point to
determine where to put an anchored window.

Fixes bug 6623031.

Change-Id: I4731a94d5424c1ec77bf1729fba8fc9ea34cae46
 2012-06-30 14:10:16 -07:00
The Android Open Source Project
53d5415b87 am f632562f: Reconcile with jb-release 
* commit 'f632562f7d2e94978d185d192a62eb73925a59a2':
 2012-06-29 18:33:08 -07:00