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

80254 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
977abbb887 am 48de12c5: Merge "Keep keyguard from starting after finished call when screen is on" 
* commit '48de12c5d1dc8d856724e8a1ec8288d9bfae40cd':
  Keep keyguard from starting after finished call when screen is on
 2012-08-14 19:31:55 -07:00
Dianne Hackborn
48de12c5d1 Merge "Keep keyguard from starting after finished call when screen is on" 2012-08-14 18:51:00 -07:00
Scott Main
d54bc8009f am 71c4fc81: Merge "docs: change download URLs for design assets. These new URLs are dummies that are handled by a redirect rule for all /downloads/... paths, that points to http://commondatastorage.googleapis.com/androiddevelopers/ Using this redirect allows us to ch 
* commit '71c4fc818dae494f4acdb24bb6d1b899ddc5e07d':
  docs: change download URLs for design assets. These new URLs are dummies that are handled by a redirect rule for all /downloads/... paths, that points to http://commondatastorage.googleapis.com/androiddevelopers/ Using this redirect allows us to change the storage location of the download assets in the future.
 2012-08-14 14:26:14 -07:00
Scott Main
71c4fc818d Merge "docs: change download URLs for design assets. These new URLs are dummies that are handled by a redirect rule for all /downloads/... paths, that points to http://commondatastorage.googleapis.com/androiddevelopers/ Using this redirect allows us to change the storage location of the download assets in the future." into jb-dev 2012-08-14 14:23:40 -07:00
Scott Main
911711fd31 revise info on Search button availability... behavior not guaranteed either 
bug: 6966922

Change-Id: I4122e6fb99b95da3f53b56333a5f27d2adde6d44
 2012-08-14 13:20:53 -07:00
Scott Main
bd63fb875c am 6958c161: Merge "docs: misc bug fixes from external issues" into jb-dev 
* commit '6958c161a9f12aaa1db33bdc526040c3691638dc':
  docs: misc bug fixes from external issues
 2012-08-14 12:40:41 -07:00
Scott Main
6958c161a9 Merge "docs: misc bug fixes from external issues" into jb-dev 2012-08-14 12:38:22 -07:00
Scott Main
d632b43fab docs: change download URLs for design assets. 
These new URLs are dummies that are handled by a redirect rule for
all /downloads/... paths, that points to http://commondatastorage.googleapis.com/androiddevelopers/
Using this redirect allows us to change the storage location of the download assets in the future.

Change-Id: I0dc6ecc1a6898f1256ba4c9ff90b619366e47629
 2012-08-14 11:44:09 -07:00
Wink Saville
d660b610c8 am 116748d0: Merge "show 3G icon for CDMA/1xRTT" into jb-dev 
* commit '116748d0d16f8e747fdfdaf2326d9a58bb2317d5':
  show 3G icon for CDMA/1xRTT
 2012-08-14 10:42:50 -07:00
Wink Saville
116748d0d1 Merge "show 3G icon for CDMA/1xRTT" into jb-dev 2012-08-14 10:40:34 -07:00
Madan Ankapura
5333400bd5 show 3G icon for CDMA/1xRTT 
when config_showMin3G is enabled to true in a CDMA device

Change-Id: I79a4fa200dc406fc7f9f4527165046541961ef69
Signed-off-by: Madan Ankapura <mankapur@sta.samsung.com>
 2012-08-14 10:17:54 -07:00
Daniel Hansson
4b71686d09 Keep keyguard from starting after finished call when screen is on 
Previously keyguard would start after a call ended, even though
the screen was on, if the screen had not been turned off since
phone startup.

Change-Id: I03c18a0bb2a58760614645871f4703afb9a0677d
 2012-08-14 13:42:36 +02:00
Mike Lockwood
f02354e208 am 9064a483: Merge "Added missing USB_DEVICE_ATTACHED broadcast to running Activity" 
* commit '9064a48365c131ef5f64b26ab33dd40a7d1246a7':
  Added missing USB_DEVICE_ATTACHED broadcast to running Activity
 2012-08-13 20:42:42 -07:00
Mike Lockwood
9064a48365 Merge "Added missing USB_DEVICE_ATTACHED broadcast to running Activity" 2012-08-13 19:59:38 -07:00
Scott Main
183bf11697 docs: misc bug fixes from external issues 
Change-Id: I380b65341200c0519a93e2f8969f70f64aec0264
 2012-08-13 19:12:13 -07:00
Peter Ng
55ed7e34b9 am 3e504ac7: Merge "Multiple design styleguide fixes -Changing extras to videos -new bullet item in swipeviews -new in 4.0 removal -Ui overview notification info -reppling typo fixed" into jb-dev 
* commit '3e504ac71715a1b152494c9765f41d13bc605b75':
  Multiple design styleguide fixes -Changing extras to videos -new bullet item in swipeviews -new in 4.0 removal -Ui overview notification info -reppling typo fixed
 2012-08-13 16:57:05 -07:00
Peter Ng
ab0b9a9e4e am 68432f76: Merge "updated downloads for styleguide -new illustrator stencil" into jb-dev 
* commit '68432f7691085b82096518f47703d59e83cb934d':
  updated downloads for styleguide -new illustrator stencil
 2012-08-13 16:56:57 -07:00
Peter Ng
f059e53150 am 250da641: Merge "Revert "Group revert of the following commits for design docs:"" into jb-dev 
* commit '250da641302aa98c91855f195cc881880aa69172':
  Revert "Group revert of the following commits for design docs:"
 2012-08-13 16:55:08 -07:00
Peter Ng
3e504ac717 Merge "Multiple design styleguide fixes -Changing extras to videos -new bullet item in swipeviews -new in 4.0 removal -Ui overview notification info -reppling typo fixed" into jb-dev 2012-08-13 16:53:28 -07:00
Peter Ng
68432f7691 Merge "updated downloads for styleguide -new illustrator stencil" into jb-dev 2012-08-13 16:53:28 -07:00
Peter Ng
250da64130 Merge "Revert "Group revert of the following commits for design docs:"" into jb-dev 2012-08-13 16:52:38 -07:00
Wink Saville
2605aeeb30 am b17a583a: Merge "Fix interface name for tethering" 
* commit 'b17a583a3acc57db845993599e4de56e91d5e75a':
  Fix interface name for tethering
 2012-08-13 16:24:15 -07:00
Wink Saville
b17a583a3a Merge "Fix interface name for tethering" 2012-08-13 15:37:09 -07:00
Vishal Mahaveer
a6b6556082 Fix interface name for tethering 
Fix the interface name used in stopTethering

Change-Id: I3a8fb80c3c6cd382e7641d1735bff85d8a938ee9
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
 2012-08-13 15:07:24 -07:00
git-you.kim72.gmail.com
fd20296c27 Fix Issue #35489: drm content corruption on GB 
If rawContent is copied into mediaBuf, readBuf is copied to wrong address.
mediaBuf should be forwarded by readBytes.

Change-Id: I4fc9c1f7f4e3d5dfe3c7e5cd92261608f6b3e248
Signed-off-by: git-you.kim72.gmail.com <you.kim72@gmail.com>
 2012-08-13 15:03:48 -07:00
Peter Ng
02123630ca Multiple design styleguide fixes 
-Changing extras to videos
-new bullet item in swipeviews
-new in 4.0 removal
-Ui overview notification info
-reppling typo fixed

Bug: 6936546
Bug: 6936394
Bug: 6958972
Bug: 6960355
Bug: 6937850
Bug: 6937856
Bug: 6912380
Bug: 6941255
Bug: 6937723
Bug: 5836846
Bug: 6915055
Bug: 6915259
Bug: 6651973
Bug: 6937070
Bug: 6947018
Bug: 6924456
Bug: 6915152
Bug: 6936797
Bug: 6924201
Bug: 6922994
Bug: 6924137
Bug: 6907998
Bug: 6912377
Bug: 6937761
Bug: 6923664
Bug: 6946790
Bug: 6918869

Change-Id: Ic5f39fe5b9f56c911af8bde9a254007748f6530e
 2012-08-13 13:22:21 -07:00
Kenny Root
0b4771e02f am 28dba4fc: Merge "Update preloaded-classes for JB" 
* commit '28dba4fc394f0736e1d7bdf5601382c19c08f518':
  Update preloaded-classes for JB
 2012-08-13 12:00:35 -07:00
Wink Saville
e0df2c4f5d am eca64977: Merge "Telephony: Signal Strength cleanup & LTE support" 
* commit 'eca64977041c5df0c987bdae56006ebbe86de677':
  Telephony: Signal Strength cleanup & LTE support
 2012-08-13 12:00:30 -07:00
Kenny Root
28dba4fc39 Merge "Update preloaded-classes for JB" 2012-08-13 11:42:07 -07:00
Kenny Root
3221bf27ff am 438a0efc: Do not eject internal ASECs when storage unmounted 
* commit '438a0efcfbee5dc953e8e5bbdf4cb3dbe94b3f80':
  Do not eject internal ASECs when storage unmounted
 2012-08-13 11:40:10 -07:00
Wink Saville
eca6497704 Merge "Telephony: Signal Strength cleanup & LTE support" 2012-08-13 11:25:49 -07:00
Jean-Baptiste Queru
82c2ff5546 am d7b9c6c3: Merge "Added missing viewport meta tag to html resources" 
* commit 'd7b9c6c356038ebced3461bb098b6a1ea1c7b222':
  Added missing viewport meta tag to html resources
 2012-08-13 10:53:58 -07:00
Kenny Root
438a0efcfb Do not eject internal ASECs when storage unmounted 
If the incoming request is to notify of storage unmounted, don't mess
with apps that are in internal ASECs.

Bug: 6948035
Change-Id: I63ffb895c4d994ee03a5a9bd6bb23f69c88e2a87
 2012-08-13 10:51:09 -07:00
Jean-Baptiste Queru
d7b9c6c356 Merge "Added missing viewport meta tag to html resources" 2012-08-13 10:38:23 -07:00
Jean-Baptiste Queru
0bf666a875 am 4da3769d: Merge "mediacodec: Don\'t crash if trying to open a codec that does not exist" 
* commit '4da3769d30851f0b517a688a5c835715d7d0b0bf':
  mediacodec: Don't crash if trying to open a codec that does not exist
 2012-08-13 09:48:24 -07:00
Kenny Root
1ad8bf5660 am f0e87175: Merge "Remove useless TestRunner" 
* commit 'f0e87175ba579b43ce7f57b2502225b4d7731b97':
  Remove useless TestRunner
 2012-08-13 09:48:20 -07:00
Jean-Baptiste Queru
4da3769d30 Merge "mediacodec: Don't crash if trying to open a codec that does not exist" 2012-08-13 09:30:11 -07:00
Kenny Root
f0e87175ba Merge "Remove useless TestRunner" 2012-08-13 09:01:36 -07:00
Martin Storsjo
e68323325b mediacodec: Don't crash if trying to open a codec that does not exist 
Change-Id: If75e3156517993629f50622a84a9ac573fced815
 2012-08-13 08:47:01 -07:00
SangWook Han
fd9cb499e5 Update preloaded-classes for JB 
Change-Id: Id127308529d581c94bd2e911b637931156ce82c1
 2012-08-12 19:46:51 +09:00
Uma Maheswari Ramalingam
a44b137648 Telephony: Signal Strength cleanup & LTE support 
Make signal strength parsing common for all modes

Add Support to calculate LTE
level for UI signal bar display

Update the lowest of Evdo/ CDMA dbm value
in phone status instead of using only CDMA dbm

Change-Id: I41bce658c536dc30558224c8ca76d6d70afb78ee
 2012-08-10 15:44:31 -07:00
Kenny Root
96ad6cb080 Remove useless TestRunner 
InstrumentationTestRunner can enumerate the test cases to run without a
special TestRunner.

Change-Id: I5a49413440ef191f28a21034a318d9a9e3f8174b
 2012-08-10 13:40:19 -07:00
Jean-Baptiste Queru
cb80cb700d am 37548994: Merge "StorageManager: fix issue that GREF has increased to 2011 in system server with intel stress test." 
* commit '37548994e69292932e9e2fafb7cba6c53e3a2bcd':
  StorageManager: fix issue that GREF has increased to 2011 in system server with intel stress test.
 2012-08-10 09:26:53 -07:00
Jean-Baptiste Queru
d2388b50a5 am 53ad027c: Merge "MtpStorage: correct the size of reserve space for MTP" 
* commit '53ad027c46bf578e26e5db70319b17a671ce8a36':
  MtpStorage: correct the size of reserve space for MTP
 2012-08-10 09:26:47 -07:00
Jean-Baptiste Queru
37548994e6 Merge "StorageManager: fix issue that GREF has increased to 2011 in system server with intel stress test." 2012-08-10 09:04:05 -07:00
Jean-Baptiste Queru
53ad027c46 Merge "MtpStorage: correct the size of reserve space for MTP" 2012-08-10 09:03:42 -07:00
The Android Open Source Project
3401c2e9e1 Reconcile with jb-mr0-release - do not merge 
Change-Id: I29880eeaee48f2f841d9bfbf21c310e495f26ddc
 2012-08-10 08:34:23 -07:00
Scott Main
922e038b08 am ea31b47a: Merge "fix misc doc bugs from external issues" into jb-dev 
* commit 'ea31b47a72a6fed1269e2ba3c29c438212322bf0':
  fix misc doc bugs from external issues
 2012-08-09 17:03:16 -07:00
Scott Main
ea31b47a72 Merge "fix misc doc bugs from external issues" into jb-dev 2012-08-09 17:00:52 -07:00
mike wakerly
ceff341550 am 1022b999: Merge "Fix typo in UsbManager javadoc." into jb-dev 
* commit '1022b9999de8fb022db6923a55e37ffc7dfca176':
  Fix typo in UsbManager javadoc.
 2012-08-09 16:49:07 -07:00