LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,553 Commits 2 Branches 0 Tags
cd10458c787c22a25b77ea8d59e1a07640bf6a84
Commit Graph

12553 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
b3e4bab48d Add new Intent demos. 
Change-Id: Iad47cca8c3fc5ccd184e07e95c9c13877f1d4ff0
 2013-07-31 16:38:48 -07:00
Scott Main
16616daef7 am d0ed98de: am e2e6cd77: am 57391f4a: redirect obsolete/orphaned "tab layout" doc to training lesson about tabs 
* commit 'd0ed98debf580b6c1fde98ba7272b0d3bbd078f0':
  redirect obsolete/orphaned "tab layout" doc to training lesson about tabs
 2013-07-31 11:11:40 -07:00
Scott Main
050120f695 am 1362a7e1: am f525e1a6: am ccdaba95: add redirect for support library setup 
* commit '1362a7e1fe15341df55a70d3d2de97dc84bfbaa7':
  add redirect for support library setup
 2013-07-31 11:11:39 -07:00
Scott Main
d0ed98debf am e2e6cd77: am 57391f4a: redirect obsolete/orphaned "tab layout" doc to training lesson about tabs 
* commit 'e2e6cd77b66e5bf8ae5dafba0b98356d80fa2fe6':
  redirect obsolete/orphaned "tab layout" doc to training lesson about tabs
 2013-07-31 11:07:13 -07:00
Scott Main
1362a7e1fe am f525e1a6: am ccdaba95: add redirect for support library setup 
* commit 'f525e1a6d3680a8390eaf557d9f9ef0bfe255ebc':
  add redirect for support library setup
 2013-07-31 11:07:11 -07:00
Scott Main
e2e6cd77b6 am 57391f4a: redirect obsolete/orphaned "tab layout" doc to training lesson about tabs 
* commit '57391f4a7cf99b741d7f1e8e59d3a3b31cfde390':
  redirect obsolete/orphaned "tab layout" doc to training lesson about tabs
 2013-07-31 11:03:03 -07:00
Scott Main
f525e1a6d3 am ccdaba95: add redirect for support library setup 
* commit 'ccdaba9511ffecebae2dfecb02272b1c4e728006':
  add redirect for support library setup
 2013-07-31 11:03:01 -07:00
Scott Main
57391f4a7c redirect obsolete/orphaned "tab layout" doc to training lesson about tabs 
Change-Id: Ie8c198c53a19b92566a4a5828b33413475a0c3c2
 2013-07-31 10:51:20 -07:00
Chris Banes
4bdb5da779 am 4a331512: am fe17cee4: Fix ActionBarUsage in Support7Demos 
* commit '4a331512cbdeb4b95af4d43e09c8096d68dceedd':
  Fix ActionBarUsage in Support7Demos
 2013-07-31 06:55:43 -07:00
Chris Banes
4a331512cb am fe17cee4: Fix ActionBarUsage in Support7Demos 
* commit 'fe17cee4e41993e3f12685d1dda26f26b7013c12':
  Fix ActionBarUsage in Support7Demos
 2013-07-31 06:53:25 -07:00
The Android Automerger
79229767a7 merge in klp-release history after reset to master 2013-07-31 06:00:29 -07:00
Andrew Hsieh
80c93fbede Fix gles3jni build with clang at android-11 
jni/gl3stub.c:21:5: error: implicit declaration of function 'eglGetProcAddress' is invalid in C99
    FIND_PROC(glReadBuffer);
    ^
jni/gl3stub.c:20:37: note: expanded from macro 'FIND_PROC'
    #define FIND_PROC(s) s = (void*)eglGetProcAddress(#s)
                                    ^
1 error generated.

Change-Id: I907f33e3d88f3e96bf7958102e90bf15529748b9
 2013-07-31 13:27:23 +08:00
Scott Main
ccdaba9511 add redirect for support library setup 
Change-Id: Ie847a81de6aed6f3448d6a32f223df110886d55a
 2013-07-30 17:59:43 -07:00
The Android Automerger
044d47852b merge in klp-release history after reset to master 2013-07-30 11:08:51 -07:00
Andrew Hsieh
12e0642cd8 am e86297fc: am 445331f5: Merge "Add TCP_INFO state enum values." 
* commit 'e86297fc2747cee70f4bd903c3c2eb41bb83a407':
  Add TCP_INFO state enum values.
 2013-07-30 10:28:14 -07:00
Chet Haase
d9654ca88d Merge "First commit for SlidingFragment." 2013-07-30 17:27:39 +00:00
Chet Haase
d6cb483b3c Merge "First commit for ListViewDraggingAnimation." 2013-07-30 17:27:30 +00:00
Chet Haase
bc423d38d9 Merge "First commit for CardFlip." 2013-07-30 17:27:19 +00:00
Chet Haase
57a59ccacf Merge "First commit for ListViewCellInsertion." 2013-07-30 17:27:11 +00:00
Chet Haase
a67b6cd993 Merge "First commit for FoldingLayout." 2013-07-30 17:27:04 +00:00
Chet Haase
2853dbdd74 Merge "First commit for ImagePixelization." 2013-07-30 17:26:53 +00:00
Chet Haase
e81cc552c2 Merge "First commit for ListViewExpandingCells." 2013-07-30 17:25:56 +00:00
Andrew Hsieh
e86297fc27 am 445331f5: Merge "Add TCP_INFO state enum values." 
* commit '445331f5e1b20c5e9b6017cc1e291c37e6d4c63c':
  Add TCP_INFO state enum values.
 2013-07-29 20:26:05 -07:00
Andrew Hsieh
445331f5e1 Merge "Add TCP_INFO state enum values." 2013-07-30 03:19:29 +00:00
Andrew Hsieh
65675341ac Add TCP_INFO state enum values. 
See b.android.com/38881 and fix in bionic
0dff43cab41e4a0bd5bd018584952c68cb224977

Change-Id: I2417fe3cf43919bf363f36c337ea6813f13699d8
 2013-07-29 20:15:57 -07:00
Andrew Hsieh
de21cf4885 am 37684af0: am 7a85c344: Merge "Update x86 crtfiles from bionic with C versions" 
* commit '37684af0c00a06406403a8076ffad34a7632f3fc':
  Update x86 crtfiles from bionic with C versions
 2013-07-29 17:51:15 -07:00
Andrew Hsieh
37684af0c0 am 7a85c344: Merge "Update x86 crtfiles from bionic with C versions" 
* commit '7a85c344ff0468dbd7d78563a1ab668d2d184305':
  Update x86 crtfiles from bionic with C versions
 2013-07-29 17:48:56 -07:00
Andrew Hsieh
7a85c344ff Merge "Update x86 crtfiles from bionic with C versions" 2013-07-30 00:43:58 +00:00
Daniel Olshansky
8cfd63c979 First commit for ListViewExpandingCells. 
Change-Id: I8d64562f8c7c0e207aef0b36df10ee3744dd446a
 2013-07-29 15:07:05 -07:00
Daniel Olshansky
4ea559806d First commit for ImagePixelization. 
Change-Id: I02ab79d17cb32773a9bd1a4c50bc76bde8925368
 2013-07-29 15:02:28 -07:00
Daniel Olshansky
425e318026 First commit for FoldingLayout. 
Change-Id: I3eaca79e3c7a0c6d2e8f5c6de5a3d4c3db4bf5a5
 2013-07-29 14:58:49 -07:00
Daniel Olshansky
c24035501d First commit for ListViewCellInsertion. 2013-07-29 11:05:36 -07:00
Daniel Olshansky
b6eeed4a19 First commit for CardFlip. 
Change-Id: Ic0e68fdcb23ea70208adfda69f9e500955fa1254
 2013-07-29 09:42:40 -07:00
Daniel Olshansky
d79643bbd1 First commit for ListViewDraggingAnimation. 
Change-Id: Ib1642809b33cba3f8e319b43688047672cffaf19
 2013-07-29 09:21:31 -07:00
Daniel Olshansky
0d2f159061 First commit for SlidingFragment. 
Change-Id: Iefffc341c7b1cca8a668218097bbcdbfbafa1713
 2013-07-29 09:14:51 -07:00
Chris Banes
fe17cee4e4 Fix ActionBarUsage in Support7Demos 
It was using SearchViewCompat and causing an FC

Change-Id: Ib69a6d68b29cc9669a6595bdd75b5369458f561b
 2013-07-26 10:15:07 +01:00
Xavier Ducrohet
a2162695d9 am c6e0fb17: am 583fc099: Merge "Strip dynamic libraries to reduce size." into jb-mr2-dev 
* commit 'c6e0fb17b4804b83f39ce8186926bbaff1b1df0d':
  Strip dynamic libraries to reduce size.
 2013-07-25 17:04:18 -07:00
Siva Velusamy
8d6f7ac485 Merge commit 'ba21c2c7' into master 
We just use the template file, the older file from jbmr2
can be deleted

Conflicts:
	sdk/plat_tools_source.properties

Change-Id: Ifdb6954790d81758227b18139cdc496344a8f8fb
 2013-07-25 16:43:39 -07:00
Xavier Ducrohet
84209b9856 am d2a10cb3: am 67b7a3a3: Merge "Remove .so from the windows build-tools." into jb-mr2-dev 
* commit 'd2a10cb312823e1af1ff09af5fce5f50fc4e0794':
  Remove .so from the windows build-tools.
 2013-07-25 16:34:20 -07:00
Xavier Ducrohet
a9d7ce4e5b resolved conflicts for merge of e4e15807 to master 
Change-Id: I42fbf1123933e40c51dcbc1ff2eaa456ec68b0e7
 2013-07-25 16:32:35 -07:00
Xavier Ducrohet
c6e0fb17b4 am 583fc099: Merge "Strip dynamic libraries to reduce size." into jb-mr2-dev 
* commit '583fc0990bcf055ceccfb31ad8d1f11715982bb8':
  Strip dynamic libraries to reduce size.
 2013-07-25 14:55:40 -07:00
Xavier Ducrohet
583fc0990b Merge "Strip dynamic libraries to reduce size." into jb-mr2-dev 2013-07-25 21:49:41 +00:00
Xavier Ducrohet
cefd49aae6 Strip dynamic libraries to reduce size. 
Change-Id: Ic43c7cc3dfca82e359abf8ef4c3259ac06eaa7dc
 2013-07-25 14:48:26 -07:00
Siva Velusamy
ba21c2c7ed am fb7ec3f1: Update platform tools version from 18.0.0 to 18.0.1 
* commit 'fb7ec3f168bd43ab0a0a1faad7d31b1e2498826f':
  Update platform tools version from 18.0.0 to 18.0.1
 2013-07-25 14:17:52 -07:00
Siva Velusamy
fb7ec3f168 Update platform tools version from 18.0.0 to 18.0.1 
systrace is now present in platform-tools

Change-Id: Ib1c418bd47f03d3cfb6a5cd41c9033b81ab08ef9
 2013-07-25 14:02:26 -07:00
Xavier Ducrohet
d2a10cb312 am 67b7a3a3: Merge "Remove .so from the windows build-tools." into jb-mr2-dev 
* commit '67b7a3a3fc47db88c901bde9ca3c49e6ae7055bc':
  Remove .so from the windows build-tools.
 2013-07-25 12:55:30 -07:00
Xavier Ducrohet
67b7a3a3fc Merge "Remove .so from the windows build-tools." into jb-mr2-dev 2013-07-25 19:50:17 +00:00
Xavier Ducrohet
e4e1580738 am 1fda1889: Merge "Add dynamic libraries for renderscript." into jb-mr2-dev 
* commit '1fda1889052050ecf5de9c8d5a0b7c70fe0183ad':
  Add dynamic libraries for renderscript.
 2013-07-25 12:36:41 -07:00
Xavier Ducrohet
9368498dc3 Remove .so from the windows build-tools. 
Change-Id: I7c8610a5c4aec36bcdf56607189e273944738124
 2013-07-25 12:36:16 -07:00
Xavier Ducrohet
1fda188905 Merge "Add dynamic libraries for renderscript." into jb-mr2-dev 2013-07-25 19:30:53 +00:00