LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,640 Commits 2 Branches 0 Tags
ccbda3b2fb06893d0ad8af67a78649f2697b283f
Commit Graph

13640 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
George Mount
ccbda3b2fb am ee6eedec: Merge "Undo inadvertent change to Transitions API demo." 
* commit 'ee6eedec15648d0897bade98f2d9a32b33f58058':
  Undo inadvertent change to Transitions API demo.
 2014-03-13 12:37:23 -07:00
George Mount
ee6eedec15 Merge "Undo inadvertent change to Transitions API demo." 2014-03-13 19:34:10 +00:00
George Mount
016fbf2c60 Undo inadvertent change to Transitions API demo. 
Change-Id: Ib986f1dd560291896c5e5619c7af9947ee4efaf1
 2014-03-13 10:27:03 -07:00
Tim Kilbourn
933c03dfcf am 957fa659: resolved conflicts for merge of 9eecf3fc to master 
* commit '957fa659c23ed74b9d3f18b25fdf162339ee6742':
  Add new support libs into the sdk build.
 2014-03-13 10:14:11 -07:00
Tim Kilbourn
957fa659c2 resolved conflicts for merge of 9eecf3fc to master 
Change-Id: If38c80cd560d8b419420fc05a872c31b6031d90a
 2014-03-12 17:27:10 -07:00
Tim Kilbourn
9eecf3fc97 am 349ba525: Add new support libs into the sdk build. 
* commit '349ba5258754aa0dd5511ed89006c2f43dd23895':
  Add new support libs into the sdk build.
 2014-03-12 23:47:41 +00:00
Tim Kilbourn
349ba52587 Add new support libs into the sdk build. 
android-support-v7-recyclerview
android-support-v17-leanback

Change-Id: I6538bb30204aeaeac0b0ea34f0a5951e09f58866
 2014-03-12 15:28:23 -07:00
Trevor Johns
620f19af47 am d43bf2c3: am f62824c6: am 9d563550: Merge "Align "from code" parent-child preference flow with "from XML"" 
* commit 'd43bf2c3714332832cf4ec1c99c2a9fa24784ab2':
  Align "from code" parent-child preference flow with "from XML"
 2014-03-12 13:00:36 -07:00
Trevor Johns
d43bf2c371 am f62824c6: am 9d563550: Merge "Align "from code" parent-child preference flow with "from XML"" 
* commit 'f62824c658006c620be775ca82b74fcc6f82b59c':
  Align "from code" parent-child preference flow with "from XML"
 2014-03-12 19:56:45 +00:00
Alexander Lucas
c98496f27a am dfc9958f: am 23f9bb62: am cd1255d1: am 4362d331: resolved conflicts for merge of 6da9c2ed to klp-ub-dev 
* commit 'dfc9958fa66b661e03ddb4afa716e5428e4af564':
  Updating build metadata for march sample push.
 2014-03-12 08:22:32 -07:00
Alexander Lucas
9536e11468 am 19377d91: am d393b918: am 58c6156e: am 94f80bce: am a780ba4b: Adding browsable prebuilt samples for march push 
* commit '19377d9176449fbb4442957dbe3add93187b22a1':
  Adding browsable prebuilt samples for march push
 2014-03-12 08:22:30 -07:00
Alexander Lucas
dfc9958fa6 am 23f9bb62: am cd1255d1: am 4362d331: resolved conflicts for merge of 6da9c2ed to klp-ub-dev 
* commit '23f9bb62da2c1b8257ea656c0b14c2e0fca9648b':
  Updating build metadata for march sample push.
 2014-03-12 15:18:58 +00:00
Alexander Lucas
19377d9176 am d393b918: am 58c6156e: am 94f80bce: am a780ba4b: Adding browsable prebuilt samples for march push 
* commit 'd393b9182094bacaa99d9387c39ff1abbee94977':
  Adding browsable prebuilt samples for march push
 2014-03-12 15:18:57 +00:00
Trevor Johns
f62824c658 am 9d563550: Merge "Align "from code" parent-child preference flow with "from XML"" 
* commit '9d5635501a9fdf2f9ef5b51a4be021622f2f9a67':
  Align "from code" parent-child preference flow with "from XML"
 2014-03-11 23:22:56 +00:00
Trevor Johns
9d5635501a Merge "Align "from code" parent-child preference flow with "from XML"" 2014-03-11 19:52:17 +00:00
Alexander Lucas
23f9bb62da am cd1255d1: am 4362d331: resolved conflicts for merge of 6da9c2ed to klp-ub-dev 
* commit 'cd1255d19cf03b6f0d463b48e0ad6eb8b5c57b57':
  Updating build metadata for march sample push.
 2014-03-11 19:18:42 +00:00
Alexander Lucas
d393b91820 am 58c6156e: am 94f80bce: am a780ba4b: Adding browsable prebuilt samples for march push 
* commit '58c6156e0b9a33ed64af5e5849ba1a80fd5ac0a2':
  Adding browsable prebuilt samples for march push
 2014-03-11 19:18:40 +00:00
Alexander Lucas
cd1255d19c am 4362d331: resolved conflicts for merge of 6da9c2ed to klp-ub-dev 
* commit '4362d331f0ee5257b881a346fce63348e880fa1c':
  Updating build metadata for march sample push.
 2014-03-11 17:44:32 +00:00
Alexander Lucas
58c6156e0b am 94f80bce: am a780ba4b: Adding browsable prebuilt samples for march push 
* commit '94f80bce07febc80df1372fc84514b51c7b1e8c7':
  Adding browsable prebuilt samples for march push
 2014-03-11 17:44:14 +00:00
Alexander Lucas
4362d331f0 resolved conflicts for merge of 6da9c2ed to klp-ub-dev 
Change-Id: I2997c1204ff7aa9728f4df782fefe9d413bfbba7
 2014-03-10 15:02:25 -07:00
Alexander Lucas
6da9c2edfe Merge "Updating build metadata for march sample push." into klp-docs 2014-03-10 21:45:52 +00:00
Alexander Lucas
94f80bce07 am a780ba4b: Adding browsable prebuilt samples for march push 
* commit 'a780ba4b15cbe69e7ad74c34c21ccef5e8cdce23':
  Adding browsable prebuilt samples for march push
 2014-03-10 19:49:41 +00:00
Alexander Lucas
a780ba4b15 Adding browsable prebuilt samples for march push 
Change-Id: I952db10d9c9acb4940db08a07789347ea2effe4d
 2014-03-10 09:21:36 -07:00
Alexander Lucas
97c8590ca8 Updating build metadata for march sample push. 
Change-Id: Ic8f6e2adce61c76cfb3e3c6db96f13c915be7a63
 2014-03-07 15:00:38 -08:00
Kristian Monsen
312173e9c2 am 384a2fa5: All lines can be 100 cols according to the Android style guide 
* commit '384a2fa51a00f51332fc7943521e47b8f9908691':
  All lines can be 100 cols according to the Android style guide
 2014-03-05 12:06:13 -08:00
Kristian Monsen
384a2fa51a All lines can be 100 cols according to the Android style guide 
https://source.android.com/source/code-style.html
There is actually an exception that comments can have longer lines
if they a literal that is longer.

Change-Id: Iec82683c2ac1f68d08489f88bbfc924b58bc9a94
 2014-03-05 18:44:20 +00:00
Evan Charlton
311e3662bd Merge "Merging emulator smoke test projects" into master-nova 2014-03-04 01:30:37 +00:00
Steve Moyer
b99f97d38e Merging emulator smoke test projects 
Combining SmsTest, GpsLocationTests, and ConnectivityTest

Change-Id: I7a9b8e787af37704e6af43b93f169ef90980cb2d
 2014-03-03 15:28:02 -08:00
Alan Viverette
8f31accd3d am 2178063c: Temporarily taking over API Demos v19 for Quantum demos 
* commit '2178063c52884e8623a179be5f6c4f402da8e5b6':
  Temporarily taking over API Demos v19 for Quantum demos
 2014-03-03 14:40:35 -08:00
Alan Viverette
2178063c52 Temporarily taking over API Demos v19 for Quantum demos 
v19 has been moved to v99 until we have an API rev for L release.

Change-Id: I864ef7962ce5be6f072bfe9866c9f93f12ea438e
 2014-03-03 14:08:19 -08:00
Tsu Chiang Chuang
4a64e0a015 am 3a5fd7be: Merge "Ensure that the native tests are run from /data/nativetest to match TF. Also cleanup a missing test from test_defs.xml" 
* commit '3a5fd7bea4dea6fc452f3e2832ce26d8003a86b4':
  Ensure that the native tests are run from /data/nativetest to match TF. Also cleanup a missing test from test_defs.xml
 2014-02-27 13:02:03 -08:00
Tsu Chiang Chuang
3a5fd7bea4 Merge "Ensure that the native tests are run from /data/nativetest to match TF. Also cleanup a missing test from test_defs.xml" 2014-02-27 21:00:26 +00:00
George Mount
96cd10b02c am 4769ecc7: Support changes in Scene Activity Transition API redo. 
* commit '4769ecc773ab09e5442cf4e37601a212a4126e42':
  Support changes in Scene Activity Transition API redo.
 2014-02-27 07:20:23 -08:00
George Mount
4769ecc773 Support changes in Scene Activity Transition API redo. 
This reverts commit 1b3da3748f.

Change-Id: I84fd15c154a404ed10971025b7bb33f58a344965
 2014-02-26 15:32:10 -08:00
George Mount
266a2d8a63 am 1b3da374: Revert "Support changes in Scene Activity Transition API." 
* commit '1b3da3748f21532684cec68bbf59eb412c053bab':
  Revert "Support changes in Scene Activity Transition API."
 2014-02-26 09:07:52 -08:00
George Mount
1b3da3748f Revert "Support changes in Scene Activity Transition API." 
This reverts commit 8ad5ffb461.

Change-Id: I3277537f7cc6a033ea1fc2948529f96c1dbc30e8
 2014-02-26 08:52:12 -08:00
George Mount
0e493e0972 am c2796884: Fix build breakage due to failed import. 
* commit 'c27968847dcac414b1289425d81ac98a6d715772':
  Fix build breakage due to failed import.
 2014-02-26 08:14:10 -08:00
George Mount
c27968847d Fix build breakage due to failed import. 
Change-Id: I626c44f30b1e899bdb230219b752511510c5bbb1
 2014-02-26 07:54:22 -08:00
Andrew Hsieh
9a7cc7e325 am 82b184ce: am 91925f1f: am c046b48b: Merge "Add scalbln, scalblnf, and scalblnl to x86 libm.so for API>=18" 
* commit '82b184ce414c962382eb07356678f39eda52b831':
  Add scalbln, scalblnf, and scalblnl to x86 libm.so for API>=18
 2014-02-26 01:53:56 -08:00
Andrew Hsieh
82b184ce41 am 91925f1f: am c046b48b: Merge "Add scalbln, scalblnf, and scalblnl to x86 libm.so for API>=18" 
* commit '91925f1fe0be5fd433ab0ae09d8c640167f918c8':
  Add scalbln, scalblnf, and scalblnl to x86 libm.so for API>=18
 2014-02-26 09:51:22 +00:00
Andrew Hsieh
91925f1fe0 am c046b48b: Merge "Add scalbln, scalblnf, and scalblnl to x86 libm.so for API>=18" 
* commit 'c046b48bd6a048b5b3c020b49c778536165668e3':
  Add scalbln, scalblnf, and scalblnl to x86 libm.so for API>=18
 2014-02-26 09:45:54 +00:00
Andrew Hsieh
c046b48bd6 Merge "Add scalbln, scalblnf, and scalblnl to x86 libm.so for API>=18" 2014-02-26 09:38:25 +00:00
Andrew Hsieh
a49155bc36 Add scalbln, scalblnf, and scalblnl to x86 libm.so for API>=18 
Change-Id: Ib22eead27b8f82cfa0e1b7eb429e2c76d068120f
 2014-02-26 10:38:31 +08:00
Tsu Chiang Chuang
c137f5f1a1 Ensure that the native tests are run from /data/nativetest to match TF. 
Also cleanup a missing test from test_defs.xml

Change-Id: I9b50bd3f5c7a100a86dd550d367c8ed9a9f2bd62
 2014-02-25 17:25:10 -08:00
George Mount
a15d7ad819 am 7f50268c: Merge "Support changes in Scene Activity Transition API." 
* commit '7f50268c2bee9a851c50abb1cb19602e6f911e4b':
  Support changes in Scene Activity Transition API.
 2014-02-25 15:49:55 -08:00
George Mount
7f50268c2b Merge "Support changes in Scene Activity Transition API." 2014-02-25 23:47:47 +00:00
George Mount
8ad5ffb461 Support changes in Scene Activity Transition API. 
Change-Id: Ia19b7def404f32ea5f68d2fece04dcd5ce615a42
 2014-02-25 11:12:26 -08:00
Adam Powell
0849aa2880 am f1a9c758: am 93e80848: am ff08b2c1: Update Support7Demos for RecyclerView API change 
* commit 'f1a9c758652157104e1e8f41849711a19dce27e7':
  Update Support7Demos for RecyclerView API change
 2014-02-24 16:36:36 -08:00
Adam Powell
f1a9c75865 am 93e80848: am ff08b2c1: Update Support7Demos for RecyclerView API change 
* commit '93e8084824915c4a3eb7bb4aea42a12f8137d0f2':
  Update Support7Demos for RecyclerView API change
 2014-02-25 00:32:55 +00:00
Adam Powell
93e8084824 am ff08b2c1: Update Support7Demos for RecyclerView API change 
* commit 'ff08b2c10c56a9f351d76d21f19b037324346a23':
  Update Support7Demos for RecyclerView API change
 2014-02-25 00:24:52 +00:00