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

79797 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
861b074fb4 am e02e5d8d: docs: fix link to gcm 
* commit 'e02e5d8d5874d9b247b3dff9153b7c9802f60130':
  docs: fix link to gcm
 2012-06-29 16:50:05 -07:00
Scott Main
e02e5d8d58 docs: fix link to gcm 
Change-Id: If198e72f1c3a37c82fe782ec88dd6a0c98e17105
 2012-06-29 16:45:55 -07:00
Scott Main
8d37456987 am ef2b7fa2: Merge "docs: move FAQ and old notepad tutorial to other places where we can properly redirect. This way the docs are accessible from existing links and they at least appear with a sidenav Also resolve a bunch of links to the notepad docs." into jb-dev 
* commit 'ef2b7fa2c311b91108a6a7296e004e89bc87fa9c':
  docs: move FAQ and old notepad tutorial to other places where we can properly redirect. This way the docs are accessible from existing links and they at least appear with a sidenav Also resolve a bunch of links to the notepad docs.
 2012-06-29 16:28:48 -07:00
Scott Main
ef2b7fa2c3 Merge "docs: move FAQ and old notepad tutorial to other places where we can properly redirect. This way the docs are accessible from existing links and they at least appear with a sidenav Also resolve a bunch of links to the notepad docs." into jb-dev 2012-06-29 16:26:19 -07:00
Scott Main
6775696412 am f0d68a97: Merge "docs: Google IO bug fixes - http://b.corp.google.com/issue?id=6756248 - http://code.google.com/p/android/issues/detail?id=33877" into jb-dev 
* commit 'f0d68a975fc4cf0e43c94f1678a311b2ed201c92':
  docs: Google IO bug fixes - http://b.corp.google.com/issue?id=6756248 - http://code.google.com/p/android/issues/detail?id=33877
 2012-06-29 16:22:42 -07:00
Scott Main
64b1188356 docs: move FAQ and old notepad tutorial to other places where we can properly redirect. 
This way the docs are accessible from existing links and they at least appear with a sidenav
Also resolve a bunch of links to the notepad docs.

Change-Id: I828e0bb8df32ee5658cae22c8f34b9fc1512fbae
 2012-06-29 16:21:51 -07:00
Scott Main
f0d68a975f Merge "docs: Google IO bug fixes - http://b.corp.google.com/issue?id=6756248 - http://code.google.com/p/android/issues/detail?id=33877" into jb-dev 2012-06-29 16:19:52 -07:00
The Android Automerger
5df368fac7 merge in jb-release history after reset to jb-dev 2012-06-29 15:51:56 -07:00
Dianne Hackborn
a9c3846194 am bfb752f8: Merge "Fix issue #6761130: Clearing app data in settings does not clear app\'s USB storage" into jb-dev 
* commit 'bfb752f8f0e4d73dc251c19d2ef79649fbbe4fd1':
  Fix issue #6761130: Clearing app data in settings does not clear app's USB storage
 2012-06-29 15:43:37 -07:00
Dianne Hackborn
bfb752f8f0 Merge "Fix issue #6761130: Clearing app data in settings does not clear app's USB storage" into jb-dev 2012-06-29 15:40:18 -07:00
Joe Fernandez
79dee590a8 docs: Google IO bug fixes 
- http://b.corp.google.com/issue?id=6756248
- http://code.google.com/p/android/issues/detail?id=33877

Change-Id: Ib77bb865d7a5f8194ce8a1bac59c15612a3dc654
 2012-06-29 15:22:38 -07:00
Dianne Hackborn
183ce028f1 Fix issue #6761130: Clearing app data in settings does not clear app's USB storage 
The package manager calls to clear data / clear cache were not also
having default container service clear the data on external storage.  Now
they do.

Change-Id: Ib5e5eb6adf2cac5a4cc094cc1a02ac8cfb6a2edf
 2012-06-29 15:00:21 -07:00
Christopher Tate
b69c77cd19 am 1598a508: Merge "Do not back up / restore the rotation-related settings" into jb-dev 
* commit '1598a50818b638d20120f71bab01c1792ecd4b6a':
  Do not back up / restore the rotation-related settings
 2012-06-29 12:42:52 -07:00
Christopher Tate
1598a50818 Merge "Do not back up / restore the rotation-related settings" into jb-dev 2012-06-29 12:40:34 -07:00
Christopher Tate
596e1917d5 Do not back up / restore the rotation-related settings 
Change-Id: I4c5f8c31fa78acc1dfa2676e89b2c1c7bbd12a06
 2012-06-29 11:55:02 -07:00
Ying Wang
c01ba1cd72 Import translations. DO NOT MERGE 
Change-Id: Iaf052543d1c7cd9afb6fe415df2ad72c5de94ea8
Auto-generated-cl: translation import
 2012-06-29 11:40:36 -07:00
The Android Open Source Project
c411fd2f78 Reconcile with jb-release 
Change-Id: Ibb735de39e6d7a0452b9f04145121ee7154d9b99
 2012-06-29 08:13:44 -07:00
Dianne Hackborn
4be93bbe91 am 074b54fb: Merge "Maybe fix issue #6756472: Share button is not defocusing the shade" into jb-dev 
* commit '074b54fbc0b6254c0ba308e0cf2e86c1cc929348':
  Maybe fix issue #6756472: Share button is not defocusing the shade
 2012-06-28 17:42:23 -07:00
Dianne Hackborn
074b54fbc0 Merge "Maybe fix issue #6756472: Share button is not defocusing the shade" into jb-dev 2012-06-28 17:39:41 -07:00
The Android Automerger
928e2795a2 merge in jb-release history after reset to jb-dev 2012-06-28 17:09:42 -07:00
Dianne Hackborn
a194021650 Maybe fix issue #6756472: Share button is not defocusing the shade 
I got this reproduce a few times, then wasn't able to.  I made this
change and then couldn't reproduce it.  Maybe it fixed it.

The change here is to explicitly pass in the handler class to
apply() and reapply(), instead of relying it being set as a member of
the RemoteViews class.  This is much cleaner and more explicitly about
setting that for the click callbacks.

Bug: 6756472
Change-Id: I8d029c3836501df3206c433838124b4be3890a8b
 2012-06-28 16:34:35 -07:00
Dirk Dougherty
172590eba8 am 50cf26c4: Doc change: cherry-pick from ics-mr1: review comments on Distribute section. 
* commit '50cf26c4268e986c5bb2b867da2e86975ca00494':
  Doc change: cherry-pick from ics-mr1: review comments on Distribute section.
 2012-06-28 16:28:07 -07:00
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