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

79773 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dirk Dougherty
50cf26c426 Doc change: cherry-pick from ics-mr1: review comments on Distribute section. 
Change-Id: Iefad9627b0fe7f54b21e14d332759d7c52c854ce
 2012-06-28 16:23:03 -07:00
Dirk Dougherty
a8a6a3233d am c9d24b27: Merge "Doc change: fix broken links to logcat info." into jb-dev 
* commit 'c9d24b27079258728ee08ad7d6b79abfda2df494':
  Doc change: fix broken links to logcat info.
 2012-06-28 15:56:16 -07:00
Dirk Dougherty
c9d24b2707 Merge "Doc change: fix broken links to logcat info." into jb-dev 2012-06-28 15:53:55 -07:00
Dirk Dougherty
fe57f3897e Doc change: fix broken links to logcat info. 
Change-Id: I006ade072232734cb049e5268bbc4d7a1efb5c55
 2012-06-28 15:51:36 -07:00
Dianne Hackborn
c7b2778c2d am cfb0f409: Merge "Fix issue #6745498: Cannot view consecutive event details from agenda view" into jb-dev 
* commit 'cfb0f40903cf2180ce0947cdd965e2f5b90b48bb':
  Fix issue #6745498: Cannot view consecutive event details from agenda view
 2012-06-28 15:36:40 -07:00
Dianne Hackborn
cfb0f40903 Merge "Fix issue #6745498: Cannot view consecutive event details from agenda view" into jb-dev 2012-06-28 15:33:53 -07:00
Mike Cleron
9454e29896 am 98fd6405: Merge "Fix NPEs when using the APIs a little oddly." into jb-dev 
* commit '98fd6405aec16c6062f562bf6e7c5f2d50da5d60':
  Fix NPEs when using the APIs a little oddly.
 2012-06-28 14:21:28 -07:00
Mike Cleron
98fd6405ae Merge "Fix NPEs when using the APIs a little oddly." into jb-dev 2012-06-28 14:18:48 -07:00
Dianne Hackborn
45a25bcfc9 Fix issue #6745498: Cannot view consecutive event details from agenda view 
- There was a long-standing bug when using FLAG_ACTIVITY_REORDER_TO_FRONT
where we could find and use an activity that is currently finishing.
- There was a recently introduced bug where activities being destroyed
would not be removed from the history stack at the time they are done
being destroyed, allowing the above bug to be exposed.
- Removing a task would not kill any processes associated with the app
that had a different name from the app itself.

Change-Id: I4401ab6d348a69e1ac4fb8f719d2c69d5a78e567
 2012-06-28 13:49:17 -07:00
Scott Main
00a82605a1 am f443c5ea: Merge "Minor corrections to the javadoc overview to reflect late API changes." into jb-dev 
* commit 'f443c5ea2c67285322d4790e5bee4c3c6f6af1ae':
  Minor corrections to the javadoc overview to reflect late API changes.
 2012-06-28 12:04:04 -07:00
Scott Main
9e75d57d05 am 399467a9: Merge "docs: better message when OS detection fails" into jb-dev 
* commit '399467a94a6420a3dd0daa8937958a6837e55d28':
  docs: better message when OS detection fails
 2012-06-28 12:01:01 -07:00
Scott Main
f443c5ea2c Merge "Minor corrections to the javadoc overview to reflect late API changes." into jb-dev 2012-06-28 12:00:49 -07:00
Scott Main
399467a94a Merge "docs: better message when OS detection fails" into jb-dev 2012-06-28 11:57:07 -07:00
Scott Main
9a4a7d19a1 docs: better message when OS detection fails 
Change-Id: I7fd7ee9f10832c6ccaf6dbf9aca5d3342a3bb566
 2012-06-28 11:55:29 -07:00
Eric Fischer
615f4cf22c am 9aa2d2a5: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit '9aa2d2a5a56c5ec0bb8517f46cb39f6c12215d92':
  Import translations. DO NOT MERGE
 2012-06-28 11:51:33 -07:00
Eric Fischer
9aa2d2a5a5 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-06-28 11:48:21 -07:00
Chris Wren
29a5e4a383 am 2761ccd4: Merge "Retain expanded state across more than one violent update." into jb-dev 
* commit '2761ccd4799971b7ad696f6f94036ca16113c78d':
  Retain expanded state across more than one violent update.
 2012-06-28 11:43:16 -07:00
Chris Wren
2761ccd479 Merge "Retain expanded state across more than one violent update." into jb-dev 2012-06-28 11:40:34 -07:00
Chris Wren
5ae1ea8400 Retain expanded state across more than one violent update. 
Bug: 6680363
Change-Id: Iebf2387fc5c8774c1c001dde5a4608d4e60720aa
 2012-06-28 14:35:43 -04:00
Eric Fischer
a57b7a8ce4 Import translations. DO NOT MERGE 
Change-Id: I5c3a2f0d534df06cf7d3385a2d369ba6edd09df7
Auto-generated-cl: translation import
 2012-06-28 11:30:35 -07:00
Daniel Sandler
51f755abfd am 9a8a28aa: Merge "Fix #6750492: NPE in tablet status bar" into jb-dev 
* commit '9a8a28aa72b9a4ebeaff3b30c497ce9bb5046083':
  Fix #6750492: NPE in tablet status bar
 2012-06-28 11:07:32 -07:00
Daniel Sandler
9a8a28aa72 Merge "Fix #6750492: NPE in tablet status bar" into jb-dev 2012-06-28 11:02:57 -07:00
Dianne Hackborn
19910f1f1a am e680c722: Merge "Fix issue #6706369: Sometimes the "App info" popup shows..." into jb-dev 
* commit 'e680c72211434777d50c1e20e6c06b5a3cdc3207':
  Fix issue #6706369: Sometimes the "App info" popup shows...
 2012-06-28 10:53:18 -07:00
Dianne Hackborn
e680c72211 Merge "Fix issue #6706369: Sometimes the "App info" popup shows..." into jb-dev 2012-06-28 10:50:45 -07:00
Scott Main
23ece33972 am c4f7873c: Merge "docs: fix g+ gms description" into jb-dev 
* commit 'c4f7873cada2fca2d1d3390b113ca46c71dd86ad':
  docs: fix g+ gms description
 2012-06-28 10:40:18 -07:00
Daniel Sandler
15986c66cb Fix #6750492: NPE in tablet status bar 
Pull down a bugfix from BaseStatusBar.

Bug: 6750492
Change-Id: I9bd04e3a800d4dd2222844d2848208d611b60fe0
 2012-06-28 13:38:28 -04:00
Scott Main
c4f7873cad Merge "docs: fix g+ gms description" into jb-dev 2012-06-28 10:37:41 -07:00
Dirk Dougherty
355adfe790 am d91cce85: Merge "Doc change: swap notification image for generic." into jb-dev 
* commit 'd91cce8558d09295746588fa13a2cbb0f3e7ab59':
  Doc change: swap notification image for generic.
 2012-06-28 10:37:23 -07:00
Dirk Dougherty
d91cce8558 Merge "Doc change: swap notification image for generic." into jb-dev 2012-06-28 10:34:56 -07:00
Craig Mautner
2dca20e194 am 4fa46485: Merge "Update dumpsys power output." into jb-dev 
* commit '4fa4648515c3c1f77a31da186a9fe31d6c509412':
  Update dumpsys power output.
 2012-06-28 10:00:04 -07:00
Craig Mautner
4fa4648515 Merge "Update dumpsys power output." into jb-dev 2012-06-28 09:56:47 -07:00
Daniel Sandler
c08dea2aa4 Fix NPEs when using the APIs a little oddly. 
This should help developers use some of the features of
Style via subclassing rather than duplicating functionality.

Bug: 6716608
Change-Id: I048e8221c8046e9779e08e6e262ac3fb37b01cb3
 2012-06-28 08:35:24 -07:00
Robert Ly
fb2ed9869b docs: fix g+ gms description 
Change-Id: Icff59207ab788c81cf8e53252813b9a207548e41
 2012-06-28 08:05:20 -07:00
The Android Automerger
f0c1a9368e merge in jb-release history after reset to jb-dev 2012-06-28 07:02:47 -07:00
Chris Wren
a9ee110cd9 am 89304586: Merge "Retain expanded state across violent updates." into jb-dev 
* commit '8930458639527448429362255af96e94f5aba5ed':
  Retain expanded state across violent updates.
 2012-06-28 04:33:07 -07:00
Chris Wren
8930458639 Merge "Retain expanded state across violent updates." into jb-dev 2012-06-28 04:30:48 -07:00
Dirk Dougherty
7b6be8ef4c Doc change: swap notification image for generic. 
Change-Id: I10f8d877e86d9f8b9c03d31caab5dbd533d672c4
 2012-06-28 00:57:27 -07:00
Dirk Dougherty
d5aa20001a am 6c2ecbd5: Merge "Doc change: update Missed Call part of notification image." into jb-dev 
* commit '6c2ecbd5e3e7bcbd84be94704ec904f8c29ebd37':
  Doc change: update Missed Call part of notification image.
 2012-06-28 00:57:11 -07:00
Dirk Dougherty
6c2ecbd5e3 Merge "Doc change: update Missed Call part of notification image." into jb-dev 2012-06-28 00:54:37 -07:00
Dirk Dougherty
3229a61cad Doc change: update Missed Call part of notification image. 
Change-Id: Ibffe3dcefce343838ba5b3dfde1edf05bfc0f9ad
 2012-06-28 00:52:08 -07:00
Joe Fernandez
2e662a2170 am c327025b: Merge "docs: ADK2 update for new IDE download files and instructions" into jb-dev 
* commit 'c327025bd79595a78883460690e74b302f9999d2':
  docs: ADK2 update for new IDE download files and instructions
 2012-06-28 00:34:23 -07:00
Joe Fernandez
c327025bd7 Merge "docs: ADK2 update for new IDE download files and instructions" into jb-dev 2012-06-28 00:31:03 -07:00
Joe Fernandez
caa008fdfb docs: ADK2 update for new IDE download files and instructions 
Change-Id: Id0e3e42a0a0c19afafa039f9df6763ae337b1f0b
 2012-06-28 00:10:49 -07:00
Dirk Dougherty
7a2319120d am e1c6947f: Doc change: update caption for notifications screen shot. 
* commit 'e1c6947facebb4df082433ca8365c45847330de8':
  Doc change: update caption for notifications screen shot.
 2012-06-27 20:00:32 -07:00
Dirk Dougherty
e1c6947fac Doc change: update caption for notifications screen shot. 
Change-Id: I7d5a947a36f315365875887e540be9ecb7402175
 2012-06-27 19:56:17 -07:00
Matthew Xie
691976fae6 am 29775794: Merge "Get rid of the extra bt_disable call when turning on airplane mode Get rid of enabling bt when in airplane mode." into jb-dev 
* commit '29775794d6014196063534415ad61d60e84e9c9a':
  Get rid of the extra bt_disable call when turning on airplane mode Get rid of enabling bt when in airplane mode.
 2012-06-27 15:50:10 -07:00
Matthew Xie
29775794d6 Merge "Get rid of the extra bt_disable call when turning on airplane mode Get rid of enabling bt when in airplane mode." into jb-dev 2012-06-27 15:47:53 -07:00
Jake Hamby
4a02a5ccfc am ca2c7b7d: Merge "Fix detection of CDMA CMAS cell broadcasts." into jb-dev 
* commit 'ca2c7b7d96625cf515af88ad30062405b38cb094':
  Fix detection of CDMA CMAS cell broadcasts.
 2012-06-27 15:30:17 -07:00
Jake Hamby
ca2c7b7d96 Merge "Fix detection of CDMA CMAS cell broadcasts." into jb-dev 2012-06-27 15:27:43 -07:00
Matthew Xie
9107e37b24 Get rid of the extra bt_disable call when turning on airplane mode 
Get rid of enabling bt when in airplane mode.

Current code has 2 paths that trying to place bluetooth in cold state when
turning airplane mode on. This caused extra call of bt_disable that
causing a kernel sleep failure. The fix removes one of the sys call.
This CL keeps Bluetooth in cold state after turning airplane mode on
instead of seting it to hotoff state
bug 6563480

Change-Id: I30c413707157acb4a8e83ded9452256cf6260899
 2012-06-27 15:12:01 -07:00