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

79870 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
The Android Open Source Project
f632562f7d Reconcile with jb-release 
Change-Id: I815e9292c3078eddde37ede41876d9219e4e2784
 2012-06-29 18:28:24 -07:00
Siva Velusamy
4fae0620ce am 27ad058a: Merge "Fix Minor typos" into jb-dev 
* commit '27ad058a941e742bc519b76d3a7940f31f988f1f':
  Fix Minor typos
 2012-06-29 18:13:14 -07:00
Siva Velusamy
27ad058a94 Merge "Fix Minor typos" into jb-dev 2012-06-29 18:10:29 -07:00
Ying Wang
6979f52208 am 2612de14: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit '2612de14d2dcfd5a6eedf882cf5cd9ac3e6fb73a':
  Import translations. DO NOT MERGE
 2012-06-29 17:53:20 -07:00
Ying Wang
2612de14d2 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-06-29 17:50:47 -07:00
Siva Velusamy
4605a039ec Fix Minor typos 
Change-Id: I6d0581b7f3dcf1aad7ef3a622a750b8cbba221d5
 2012-06-29 17:49:55 -07:00
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
Catherine Liu
846fe7411b Fix code problem in writePidDns 
When app call startUsingNetworkFeature() to keep alive, there is a
code problem in writePidDns() to update the net.dnsX.<pid> property.

Change-Id: I83b02da4808f106c9ca00e350ad38e4bd5cba689
 2012-06-29 16:09:35 -05: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