Commit Graph

8457 Commits

Author SHA1 Message Date
The Android Open Source Project
6e4271f1a0 Reconcile with ics-factoryrom-release
Change-Id: I03cef1cd6b01c6c835349e8c9e8f6d2f53132f17
2011-09-30 13:24:18 -07:00
The Android Automerger
1fdd56d80d merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-09-30 13:11:26 -07:00
Xavier Ducrohet
1bef3b291e am f104022d: Update SDK components to r2 for MR0.
* commit 'f104022df7d76648d9fec476d488fa51b5bef6ab':
  Update SDK components to r2 for MR0.
2011-09-30 10:39:24 -07:00
Xavier Ducrohet
f104022df7 Update SDK components to r2 for MR0.
Change-Id: I6029423c103609189226cd3ad09703f132dc0add
2011-09-30 10:16:01 -07:00
Xavier Ducrohet
a43ce581f5 am f2be10ee: am 3e132a1a: Fix sdk source prop to include proper layoutlib api level.
* commit 'f2be10ee1def928be38c98b9ba365ceb226aae22':
  Fix sdk source prop to include proper layoutlib api level.
2011-09-30 10:09:05 -07:00
Xavier Ducrohet
f2be10ee1d am 3e132a1a: Fix sdk source prop to include proper layoutlib api level.
* commit '3e132a1a2602019ccccc4d965cb7d3aded1c988d':
  Fix sdk source prop to include proper layoutlib api level.
2011-09-30 10:07:51 -07:00
Xavier Ducrohet
3e132a1a26 Fix sdk source prop to include proper layoutlib api level.
Change-Id: I532503a2cc06f507e2176c2114867adbf9afe94a
2011-09-30 10:03:53 -07:00
The Android Open Source Project
5c94fa3622 am 8dd359a8: Reconcile with ics-factoryrom-release
* commit '8dd359a82ca0d97c3aa063f81ea3e891a5280396':
2011-09-30 07:13:24 -07:00
The Android Open Source Project
8dd359a82c Reconcile with ics-factoryrom-release
Change-Id: I34113db5bf74bcf9fbc0649d022cc533b4cc3469
2011-09-30 07:09:53 -07:00
The Android Automerger
08b923bd68 merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-09-29 18:45:25 -07:00
Daniel Lehmann
ac277cf1b3 am 2a3f7172: Merge "Updated the sample"
* commit '2a3f7172e764d1b46f408ccb54da07f0f43ffbbb':
  Updated the sample
2011-09-29 17:11:40 -07:00
Daniel Lehmann
2a3f7172e7 Merge "Updated the sample" 2011-09-29 17:09:29 -07:00
Daniel Lehmann
1cf776aee1 Updated the sample
- Removed editing, because it is not ready for the sdk yet
 - Added sync of a default group
 - Demo for "View group"
 - Demo for "View Stream Item" and "View Stream Item Photo"
 - Demo for invite flow (at least show a dialog)
 - Hardcoded demo username and password into the dialog (it is in the
   source anyway)

Bug:5383087

Change-Id: I4cf18eb8e90df872f832ecd74f22d68de6099e60
2011-09-29 17:08:36 -07:00
Wink Saville
5a221c15bc am f82ab455: (-s ours) am de784d91: (-s ours) Cherrypick 3bfbbe2 from master. do not merge.
* commit 'f82ab455aaf208403e836b14eaf480133f5345d8':
  Cherrypick 3bfbbe2 from master. do not merge.
2011-09-29 17:04:49 -07:00
Wink Saville
f82ab455aa am de784d91: (-s ours) Cherrypick 3bfbbe2 from master. do not merge.
* commit 'de784d913123376a886b5e8c4e619b7f87484c5f':
  Cherrypick 3bfbbe2 from master. do not merge.
2011-09-29 17:03:24 -07:00
Wink Saville
de784d9131 Cherrypick 3bfbbe2 from master. do not merge.
Update version of apn configuration files to version 7

Bug: 5339656
Change-Id: I874be2efaead642ce24abab8824bf8a916a81271
2011-09-29 17:01:00 -07:00
Wink Saville
6f812b2acb am 53f0bea8: Merge "Update version of apn configuration files to version 7"
* commit '53f0bea80a337a981fdace64bd6f437312a8d137':
  Update version of apn configuration files to version 7
2011-09-29 16:49:00 -07:00
Wink Saville
53f0bea80a Merge "Update version of apn configuration files to version 7" 2011-09-29 16:46:57 -07:00
Wink Saville
3bfbbe24a8 Update version of apn configuration files to version 7
Bug: 5339656
Change-Id: Ia6c4e2495f81598ee52b321c3de30d6babd877f5
2011-09-29 15:23:05 -07:00
The Android Open Source Project
778a82f6aa am b010f758: Reconcile with ics-factoryrom-release
* commit 'b010f7586a669840e59a8f1f11d412341270d40f':
2011-09-29 14:26:48 -07:00
The Android Open Source Project
b010f7586a Reconcile with ics-factoryrom-release
Change-Id: I440232e29e1c09261f74d3c408a3afe50d8798ad
2011-09-29 14:24:44 -07:00
Chet Haase
20cf8b4886 am 10cb19ae: Merge "DefaultLayoutAnimations should use GridLayout instead."
* commit '10cb19aefec9b0b25bbe209ee1a2afc648ab46c3':
  DefaultLayoutAnimations should use GridLayout instead.
2011-09-29 07:53:20 -07:00
Chet Haase
10cb19aefe Merge "DefaultLayoutAnimations should use GridLayout instead." 2011-09-29 07:48:57 -07:00
The Android Automerger
1eaef40889 merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-09-28 17:34:22 -07:00
Xavier Ducrohet
42b6a7b254 am c62218ad: am ad1076ab: Make the SDK system image be voice enabled.
* commit 'c62218adf153200e740316ea413e7d187298962c':
  Make the SDK system image be voice enabled.
2011-09-28 15:50:13 -07:00
Xavier Ducrohet
c62218adf1 am ad1076ab: Make the SDK system image be voice enabled.
* commit 'ad1076ab2564c1c660dd8c1d8d2a1b6b113fe976':
  Make the SDK system image be voice enabled.
2011-09-28 15:47:30 -07:00
Xavier Ducrohet
ad1076ab25 Make the SDK system image be voice enabled.
This is to show the phone activity.

Change-Id: I5b719f39b88257e473bd9e2af5f0eac618ea0c80
2011-09-28 15:42:37 -07:00
Raphael Moll
df4cc971cb am 0fe8f49d: am da9eabde: SDK: Generate source packages as part of \'make sdk_repo\'
* commit '0fe8f49d7b46b623d5f85e1524c2050e22dc3095':
  SDK: Generate source packages as part of 'make sdk_repo'
2011-09-28 12:55:54 -07:00
Raphael Moll
4450fe8a48 am d4566c69: am 4dedff68: SDK: generate system-image.zip in sdk_repo
* commit 'd4566c69b34ed7a2979c9cc3d846f8c451b225bb':
  SDK: generate system-image.zip in sdk_repo
2011-09-28 12:55:53 -07:00
Raphael Moll
0fe8f49d7b am da9eabde: SDK: Generate source packages as part of \'make sdk_repo\'
* commit 'da9eabde860874f88b08c16d9565932a3f1810d9':
  SDK: Generate source packages as part of 'make sdk_repo'
2011-09-28 12:54:27 -07:00
Raphael Moll
d4566c69b3 am 4dedff68: SDK: generate system-image.zip in sdk_repo
* commit '4dedff68c253a65d34cec63fe6f24b8d275bf850':
  SDK: generate system-image.zip in sdk_repo
2011-09-28 12:54:26 -07:00
Raphael Moll
da9eabde86 SDK: Generate source packages as part of 'make sdk_repo'
Change-Id: Iaea55bae22b2af95993d0f97023a015f2c5a5e77
2011-09-28 11:26:20 -07:00
David 'Digit' Turner
a71a37c418 am b8b0bacb: am 7b2cacb4: am 76f63551: am 894a63dd: emulator: opengl: Add custom_write optimization to encoder.
* commit 'b8b0bacb8c1a01f9d6a9598dcf7dd0534cac1c0f':
  emulator: opengl: Add custom_write optimization to encoder.
2011-09-28 04:47:41 -07:00
David 'Digit' Turner
7904ee42c3 am c11d87d3: am 5127bebf: am 8790e10a: am 5d7f0875: emulator: opengl: \'large\' buffer optimization
* commit 'c11d87d30a780bd6ac65c08d00e829ea94d17357':
  emulator: opengl: 'large' buffer optimization
2011-09-28 04:47:40 -07:00
David 'Digit' Turner
7f61c7f1cb am 7dc4d98e: am 175512d4: am 5d2e245d: am e72ed049: emulator: opengl: improve gralloc debug traces
* commit '7dc4d98eb6735f8f8d236a67ea6244af4a7b7863':
  emulator: opengl: improve gralloc debug traces
2011-09-28 04:47:39 -07:00
David 'Digit' Turner
c2f6f3ae67 am 640cf698: am 81488f05: am ac6c7392: am 9a6c0287: emulator: opengl: fix inccorect delete usage.
* commit '640cf6988b25e21b3265712221463fef0cac62d6':
  emulator: opengl: fix inccorect delete usage.
2011-09-28 04:47:39 -07:00
David 'Digit' Turner
9a8bfaf9d1 am bb1e1356: am f90030a9: am 0bf9070e: am 6aca3d9f: emulator: opengl: add missing EGLDisplay destructor
* commit 'bb1e135697d9559f5f0c6774372d6e29aefb5271':
  emulator: opengl: add missing EGLDisplay destructor
2011-09-28 04:47:38 -07:00
David 'Digit' Turner
0b36e2e3d4 am 0426ac51: am 5703f4d9: am 81ee5461: am 8abfab1b: emulator: opengl: make internal tables const.
* commit '0426ac51b56b6ba1c0c0651a44613ab7a2f2a838':
  emulator: opengl: make internal tables const.
2011-09-28 04:47:37 -07:00
David 'Digit' Turner
b8b0bacb8c am 7b2cacb4: am 76f63551: am 894a63dd: emulator: opengl: Add custom_write optimization to encoder.
* commit '7b2cacb4523bc564321d0726c8b53b72f6b1c562':
  emulator: opengl: Add custom_write optimization to encoder.
2011-09-28 04:46:47 -07:00
David 'Digit' Turner
c11d87d30a am 5127bebf: am 8790e10a: am 5d7f0875: emulator: opengl: \'large\' buffer optimization
* commit '5127bebff8d3848c96749d80c8c4ad79fc88bb54':
  emulator: opengl: 'large' buffer optimization
2011-09-28 04:46:46 -07:00
David 'Digit' Turner
7dc4d98eb6 am 175512d4: am 5d2e245d: am e72ed049: emulator: opengl: improve gralloc debug traces
* commit '175512d4aba36f5e5be9a12dca64cc27d159ec98':
  emulator: opengl: improve gralloc debug traces
2011-09-28 04:46:45 -07:00
David 'Digit' Turner
640cf6988b am 81488f05: am ac6c7392: am 9a6c0287: emulator: opengl: fix inccorect delete usage.
* commit '81488f055f5a2bd7e5307a0e16d5ff924baf566e':
  emulator: opengl: fix inccorect delete usage.
2011-09-28 04:46:45 -07:00
David 'Digit' Turner
bb1e135697 am f90030a9: am 0bf9070e: am 6aca3d9f: emulator: opengl: add missing EGLDisplay destructor
* commit 'f90030a9bf63d47840c88c6f8022bc0a903df9dd':
  emulator: opengl: add missing EGLDisplay destructor
2011-09-28 04:46:42 -07:00
David 'Digit' Turner
0426ac51b5 am 5703f4d9: am 81ee5461: am 8abfab1b: emulator: opengl: make internal tables const.
* commit '5703f4d9ec04f5e774f8cb154af7fd087bebfffd':
  emulator: opengl: make internal tables const.
2011-09-28 04:46:37 -07:00
David 'Digit' Turner
7b2cacb452 am 76f63551: am 894a63dd: emulator: opengl: Add custom_write optimization to encoder.
* commit '76f63551d36b1de63c63f357e5f0646ed8c306bb':
  emulator: opengl: Add custom_write optimization to encoder.
2011-09-28 04:41:09 -07:00
David 'Digit' Turner
5127bebff8 am 8790e10a: am 5d7f0875: emulator: opengl: \'large\' buffer optimization
* commit '8790e10a7f27b0e364605f5ef48bb22fb078b4b0':
  emulator: opengl: 'large' buffer optimization
2011-09-28 04:41:08 -07:00
David 'Digit' Turner
175512d4ab am 5d2e245d: am e72ed049: emulator: opengl: improve gralloc debug traces
* commit '5d2e245d760c7e100a657e408686def677e1ff0c':
  emulator: opengl: improve gralloc debug traces
2011-09-28 04:41:07 -07:00
David 'Digit' Turner
81488f055f am ac6c7392: am 9a6c0287: emulator: opengl: fix inccorect delete usage.
* commit 'ac6c73921cb03f6785457700b7d349158fcb6902':
  emulator: opengl: fix inccorect delete usage.
2011-09-28 04:41:06 -07:00
David 'Digit' Turner
f90030a9bf am 0bf9070e: am 6aca3d9f: emulator: opengl: add missing EGLDisplay destructor
* commit '0bf9070ec5ddea4e4c048e4c5a5eaf25ed2c0b7a':
  emulator: opengl: add missing EGLDisplay destructor
2011-09-28 04:41:05 -07:00
David 'Digit' Turner
5703f4d9ec am 81ee5461: am 8abfab1b: emulator: opengl: make internal tables const.
* commit '81ee546174830e039bb523eec6139eb99e77a45e':
  emulator: opengl: make internal tables const.
2011-09-28 04:41:03 -07:00