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

79855 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
88eee9972e docs: fix urls on homepage for offline docs 
Change-Id: Ifa1da094ee6482c7324ec5a8b50d245d505390b9
 2012-07-03 13:19:45 -07:00
The Android Automerger
c292a619c7 merge in jb-release history after reset to jb-dev 2012-07-03 12:53:52 -07:00
Daniel Sandler
97270ce8ce am 5d0c689b: Merge "Logs to track bug 6765842." into jb-dev 
* commit '5d0c689b9b98be1b9be4d535ddb6f73142fd9b25':
  Logs to track bug 6765842.
 2012-07-03 12:12:35 -07:00
The Android Open Source Project
1a4f71b2d4 Reconcile with jb-release 
Change-Id: Ic8cef33354ceb00868f939950089574353e76ce3
 2012-07-03 12:11:48 -07:00
Daniel Sandler
5d0c689b9b Merge "Logs to track bug 6765842." into jb-dev 2012-07-03 12:10:19 -07:00
Scott Main
7034ed833f am 5a883824: Merge "docs: fix document issue 27549" into jb-dev 
* commit '5a883824a2e97e0ccb08b4fe30accde6542f3f39':
  docs: fix document issue 27549
 2012-07-03 11:54:11 -07:00
Scott Main
5a883824a2 Merge "docs: fix document issue 27549" into jb-dev 2012-07-03 11:51:30 -07:00
Daniel Sandler
fdbac77e82 Logs to track bug 6765842. 
It looks like we can get into a state where the notification
panel gets un-expanded, leaving an unsightly mess where your
status bar should be.

This change adds some additional info to the dumpsys output.

Bug: 6765842
Change-Id: Iecf2480bc7bdf5bb737863c0cbf9ad07d8523c0c
 2012-07-03 14:35:05 -04:00
Scott Main
35cb0650c0 am 399df567: docs: various link fixes and other typos from external tracker 
* commit '399df5677bd116a016664a10a0da432da29e829d':
  docs: various link fixes and other typos from external tracker
 2012-07-02 22:00:50 -07:00
Scott Main
15279cfc56 docs: fix document issue 27549 
Change-Id: I17995fd70978657a46ccfc77fa2ae84c56a05255
 2012-07-02 21:58:46 -07:00
Scott Main
399df5677b docs: various link fixes and other typos from external tracker 
Change-Id: I2a107f7e16429c0fe80c5e4cb67ecfaf267db301
 2012-07-02 21:47:20 -07:00
The Android Automerger
6023c0d8d2 merge in jb-release history after reset to jb-dev 2012-07-02 18:59:51 -07:00
satok
cb31aa49aa am f212878e: Merge "Update spell checking documents Bug: 6334194" into jb-dev 
* commit 'f212878e3513b378eac622e5b03b0ac3aee91127':
  Update spell checking documents Bug: 6334194
 2012-07-02 18:29:58 -07:00
satok
f212878e35 Merge "Update spell checking documents Bug: 6334194" into jb-dev 2012-07-02 18:27:08 -07:00
Craig Mautner
c751e37c4f am cc935071: Merge "DO NOT MERGE Set force hiding differently" into jb-dev 
* commit 'cc93507124855591be40af55a94deeb33d74e719':
  DO NOT MERGE Set force hiding differently
 2012-07-02 17:22:40 -07:00
Craig Mautner
cc93507124 Merge "DO NOT MERGE Set force hiding differently" into jb-dev 2012-07-02 17:20:00 -07:00
Craig Mautner
80059d6c1b am 00b9e899: Merge "Clear startingDisplayed flag when removing window." into jb-dev 
* commit '00b9e899320488ff5623d8c80258ed7dfefc7b53':
  Clear startingDisplayed flag when removing window.
 2012-07-02 17:05:16 -07:00
Craig Mautner
00b9e89932 Merge "Clear startingDisplayed flag when removing window." into jb-dev 2012-07-02 17:01:58 -07:00
Craig Mautner
38b2478f63 Clear startingDisplayed flag when removing window. 
The flag indicating that the Starting window is displayed was not
being cleared when the Starting window was removed. That caused the
goodToGo indication to falsely indicate that all windows were drawn
when in fact the destination activity had not yet been drawn. This
caused the animation to begin when it was still black behind the old
animation.

This fixes bug 6764727.

Change-Id: Iacef73b0335b9bde2cdc8d0b072034222cd728e8
 2012-07-02 16:21:28 -07:00
The Android Automerger
dae5521fa3 merge in jb-release history after reset to jb-dev 2012-07-02 16:19:23 -07:00
Dirk Dougherty
e102b8168a am 4123b46f: Merge "Doc change: updated numbers for Andriod. Fix gcm image path." into jb-dev 
* commit '4123b46f0e4146cb181b53af476e34bfede7d1ec':
  Doc change: updated numbers for Andriod. Fix gcm image path.
 2012-07-02 15:59:26 -07:00
Dirk Dougherty
4123b46f0e Merge "Doc change: updated numbers for Andriod. Fix gcm image path." into jb-dev 2012-07-02 15:56:49 -07:00
Dirk Dougherty
24a3242029 Doc change: updated numbers for Andriod. Fix gcm image path. 
Change-Id: Ia3b43f9464938b9775ee6f77c850af37fac9117f
 2012-07-02 15:52:25 -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
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
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
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
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
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
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
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