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

116403 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Spurlock
83ed1debd3 am b6c6ea4c: am a223d193: Merge "Simplify IME policy and enforce in binder calls." into klp-dev 
* commit 'b6c6ea4c84831140fd55f4f140f0ad48c22c568b':
  Simplify IME policy and enforce in binder calls.
 2013-10-30 13:51:43 -07:00
John Spurlock
b6c6ea4c84 am a223d193: Merge "Simplify IME policy and enforce in binder calls." into klp-dev 
* commit 'a223d1933ba69fbf454cf17e93ab62bd13fa9293':
  Simplify IME policy and enforce in binder calls.
 2013-10-30 13:49:23 -07:00
John Spurlock
a223d1933b Merge "Simplify IME policy and enforce in binder calls." into klp-dev 2013-10-30 20:45:34 +00:00
Dirk Dougherty
8545714fa2 am 285782a6: am 73f68dbc: Merge "Doc change: Google Play services 4.0 reference docs." into klp-dev 
* commit '285782a6d24204b73f361015c6793bb90658fac8':
  Doc change: Google Play services 4.0 reference docs.
 2013-10-30 13:19:13 -07:00
Dirk Dougherty
285782a6d2 am 73f68dbc: Merge "Doc change: Google Play services 4.0 reference docs." into klp-dev 
* commit '73f68dbcc6e03aa0071097ea8b1b84995013ff59':
  Doc change: Google Play services 4.0 reference docs.
 2013-10-30 13:15:59 -07:00
Dirk Dougherty
73f68dbcc6 Merge "Doc change: Google Play services 4.0 reference docs." into klp-dev 2013-10-30 20:13:36 +00:00
Dirk Dougherty
2816789961 Doc change: Google Play services 4.0 reference docs. 
Change-Id: I61c536a80a720364eadec727b9c870d5b869be1a
 2013-10-30 13:11:50 -07:00
Christopher Tate
d8ad764e85 am 4f33a5d7: am 1f835093: Merge "Remove parentheses around return statement" 
* commit '4f33a5d7dd50c9ec883e0a3377327460e1df5015':
  Remove parentheses around return statement
 2013-10-30 12:25:48 -07:00
Christopher Tate
4f33a5d7dd am 1f835093: Merge "Remove parentheses around return statement" 
* commit '1f8350935caa6a44ef2608e34d4e3a91db4424a7':
  Remove parentheses around return statement
 2013-10-30 12:22:36 -07:00
Christopher Tate
bcc0bd4cd7 am 9dcfcc84: am 19427156: Merge "Don\'t crash when preferred activity settings are malformed" into klp-dev 
* commit '9dcfcc845d5fdbedbbb41e0d22dd3e16a6a53fe5':
  Don't crash when preferred activity settings are malformed
 2013-10-30 12:22:31 -07:00
Christopher Tate
9dcfcc845d am 19427156: Merge "Don\'t crash when preferred activity settings are malformed" into klp-dev 
* commit '194271565399a9216b8e0dece118874fc5f7e474':
  Don't crash when preferred activity settings are malformed
 2013-10-30 12:20:06 -07:00
Christopher Tate
1f8350935c Merge "Remove parentheses around return statement" 2013-10-30 19:19:29 +00:00
Christopher Tate
1942715653 Merge "Don't crash when preferred activity settings are malformed" into klp-dev 2013-10-30 19:18:28 +00:00
Michael Jurka
ac132888d0 am 9a4c6988: am 0a1988b6: Merge "Make wallpaper cropper more robust " into klp-dev 
* commit '9a4c69882401f243f07c3bf77bf57a957b89c767':
  Make wallpaper cropper more robust
 2013-10-30 11:05:51 -07:00
Michael Jurka
9a4c698824 am 0a1988b6: Merge "Make wallpaper cropper more robust " into klp-dev 
* commit '0a1988b6477f012768f53f7e216b7defa45c8e51':
  Make wallpaper cropper more robust
 2013-10-30 11:04:20 -07:00
Michael Jurka
0a1988b647 Merge "Make wallpaper cropper more robust " into klp-dev 2013-10-30 18:01:58 +00:00
Craig Mautner
7acd5a97c2 am 52cb685f: am 91eb54d1: Merge "Do not fetch tasks that don\'t have activities." into klp-dev 
* commit '52cb685f23ef4326345bfbe15aa9081454a77aa1':
  Do not fetch tasks that don't have activities.
 2013-10-30 10:20:54 -07:00
Craig Mautner
52cb685f23 am 91eb54d1: Merge "Do not fetch tasks that don\'t have activities." into klp-dev 
* commit '91eb54d11908ce5dc2031f2cf0d6523cd1bebba1':
  Do not fetch tasks that don't have activities.
 2013-10-30 10:18:44 -07:00
Craig Mautner
91eb54d119 Merge "Do not fetch tasks that don't have activities." into klp-dev 2013-10-30 17:13:20 +00:00
Jeff Sharkey
8f4797d111 am 35c94390: am 7ce4381a: Merge "Move READ_EXTERNAL_STORAGE to storage group." into klp-dev 
* commit '35c9439000fb5a8ab5aca2e4b59fb6e0bc8f79e6':
  Move READ_EXTERNAL_STORAGE to storage group.
 2013-10-30 09:28:28 -07:00
Jeff Sharkey
35c9439000 am 7ce4381a: Merge "Move READ_EXTERNAL_STORAGE to storage group." into klp-dev 
* commit '7ce4381a1a0b5903f75646bf632198d259438576':
  Move READ_EXTERNAL_STORAGE to storage group.
 2013-10-30 09:25:37 -07:00
Jeff Sharkey
7ce4381a1a Merge "Move READ_EXTERNAL_STORAGE to storage group." into klp-dev 2013-10-30 16:21:50 +00:00
Joe Fernandez
93b6887ca3 am 06bddf2d: am 76969919: Merge "docs: Support Library r19 Release Notes" into klp-dev 
* commit '06bddf2d4d893be00f42611c14077eabc0a5bbfd':
  docs: Support Library r19 Release Notes
 2013-10-30 09:20:39 -07:00
Joe Fernandez
777010c095 am 557776b4: am d19fb7af: Merge "docs: SDK-ADT 22.3 Release Notes" into klp-dev 
* commit '557776b4ffabb30303e676503354d7a39e0639ba':
  docs: SDK-ADT 22.3 Release Notes
 2013-10-30 09:20:35 -07:00
Joe Fernandez
06bddf2d4d am 76969919: Merge "docs: Support Library r19 Release Notes" into klp-dev 
* commit '76969919f73542a508aa242be7ff34fc38ee290b':
  docs: Support Library r19 Release Notes
 2013-10-30 09:17:56 -07:00
Joe Fernandez
557776b4ff am d19fb7af: Merge "docs: SDK-ADT 22.3 Release Notes" into klp-dev 
* commit 'd19fb7af82a8fdee15ffb6bbf196311e0efa8ead':
  docs: SDK-ADT 22.3 Release Notes
 2013-10-30 09:17:52 -07:00
Joe Fernandez
31f93acc81 am b99ca1d0: am 91de4125: Merge "docs: Android 4.4 platform version release notes" into klp-dev 
* commit 'b99ca1d0844a6b1d339145f67da9731f8e7986b9':
  docs: Android 4.4 platform version release notes
 2013-10-30 09:17:04 -07:00
Joe Fernandez
76969919f7 Merge "docs: Support Library r19 Release Notes" into klp-dev 2013-10-30 16:14:55 +00:00
Joe Fernandez
b99ca1d084 am 91de4125: Merge "docs: Android 4.4 platform version release notes" into klp-dev 
* commit '91de4125be2734a0f138ae3177667c30f600e39d':
  docs: Android 4.4 platform version release notes
 2013-10-30 09:14:25 -07:00
Joe Fernandez
d19fb7af82 Merge "docs: SDK-ADT 22.3 Release Notes" into klp-dev 2013-10-30 16:14:12 +00:00
Joe Fernandez
91de4125be Merge "docs: Android 4.4 platform version release notes" into klp-dev 2013-10-30 16:13:12 +00:00
Craig Mautner
e2f7463867 am 1dbaf904: am 18612840: Merge "Force relayout at completion of status bar animation" into klp-dev 
* commit '1dbaf9044dcb8a9bb6300e438a05324189bd4d02':
  Force relayout at completion of status bar animation
 2013-10-30 07:02:39 -07:00
Craig Mautner
1dbaf9044d am 18612840: Merge "Force relayout at completion of status bar animation" into klp-dev 
* commit '1861284013a2e2d5fd177c1ef66744afd03c3abd':
  Force relayout at completion of status bar animation
 2013-10-30 07:00:32 -07:00
Craig Mautner
1861284013 Merge "Force relayout at completion of status bar animation" into klp-dev 2013-10-30 13:58:31 +00:00
Michael Jurka
7b215cb922 Make wallpaper cropper more robust 
- don't crash if image passed to wallpaper picker
is invalid
- close input streams correctly

Bug: 11413915
Bug: 11380658
Bug: 11362731
 2013-10-30 14:54:21 +01:00
Taeho Kim
67ab4bae1d Remove parentheses around return statement 
Removed parentheses around return statement in drag-n-drop sample,
which is not part of the Android style.

Change-Id: I09701829b277f2aa84b1fff1c7a8ea8241bdc578
Signed-off-by: Taeho Kim <jyte82@gmail.com>
 2013-10-30 20:13:59 +09:00
Dirk Dougherty
2d3890c6a9 am 8f8895ce: am 0e29faac: Merge "doc change: Update Google Play Services pages for gouda." into klp-dev 
* commit '8f8895ce7bcdc59cad75c658b09b0f307a14d8e8':
  doc change: Update Google Play Services pages for gouda.
 2013-10-29 21:29:05 -07:00
Dirk Dougherty
8f8895ce7b am 0e29faac: Merge "doc change: Update Google Play Services pages for gouda." into klp-dev 
* commit '0e29faacecdb728e2878c799da8532e33539f046':
  doc change: Update Google Play Services pages for gouda.
 2013-10-29 21:26:34 -07:00
Dirk Dougherty
ad064dac70 am 52de9b52: am fd391d6f: Merge "Doc change: add new list of browseable samples and sample groups." into klp-dev 
* commit '52de9b52fc3894c6ae5bd2011ee1cbf895bf3b37':
  Doc change: add new list of browseable samples and sample groups.
 2013-10-29 21:22:15 -07:00
Dirk Dougherty
0e29faacec Merge "doc change: Update Google Play Services pages for gouda." into klp-dev 2013-10-30 04:21:51 +00:00
Dirk Dougherty
52de9b52fc am fd391d6f: Merge "Doc change: add new list of browseable samples and sample groups." into klp-dev 
* commit 'fd391d6f5ed020c935c758f0608674bd18c38318':
  Doc change: add new list of browseable samples and sample groups.
 2013-10-29 21:19:37 -07:00
Dirk Dougherty
fd391d6f5e Merge "Doc change: add new list of browseable samples and sample groups." into klp-dev 2013-10-30 04:16:18 +00:00
Dirk Dougherty
c5f168a694 Doc change: add new list of browseable samples and sample groups. 
Change-Id: I5f0c6899a34ada9f8dfc492f849c9e03203bc920
 2013-10-29 20:59:20 -07:00
Dirk Dougherty
13b1c46eed am 48b022ff: am 2d9bfcc0: Merge "Doc change: Add diff report for API level 19." into klp-dev 
* commit '48b022ffa162636368cf706e6cf7cde009318de6':
  Doc change: Add diff report for API level 19.
 2013-10-29 20:39:38 -07:00
Dirk Dougherty
48b022ffa1 am 2d9bfcc0: Merge "Doc change: Add diff report for API level 19." into klp-dev 
* commit '2d9bfcc0bbcd036ede0e2bf9155fed608b4d39d3':
  Doc change: Add diff report for API level 19.
 2013-10-29 20:36:14 -07:00
Dirk Dougherty
2d9bfcc0bb Merge "Doc change: Add diff report for API level 19." into klp-dev 2013-10-30 03:33:46 +00:00
Jim Miller
ea1a439a90 am 3641571c: am ae47d826: Merge "Add an intermediate dimens resource for 540dp device." into klp-dev 
* commit '3641571c93f12720b7f4769175e302a6875a9dce':
  Add an intermediate dimens resource for 540dp device.
 2013-10-29 19:48:38 -07:00
Jim Miller
3641571c93 am ae47d826: Merge "Add an intermediate dimens resource for 540dp device." into klp-dev 
* commit 'ae47d826d883657a4332f549c165ae85124bd1cf':
  Add an intermediate dimens resource for 540dp device.
 2013-10-29 19:46:36 -07:00
Jim Miller
ae47d826d8 Merge "Add an intermediate dimens resource for 540dp device." into klp-dev 2013-10-30 02:44:11 +00:00
Elliott Hughes
ebd6e3f0df am ee907eaf: am 91135202: Merge "Always initialize local boolean variables when possible" 
* commit 'ee907eaf10b4588e3f932a466720bc1b1b11508f':
  Always initialize local boolean variables when possible
 2013-10-29 18:31:09 -07:00