The Android Open Source Project
7a2897f4c5
am e3e712e4: Reconcile with ics-factoryrom-release
...
* commit 'e3e712e4625fc44ae58b6a4c2d104e06488c6eee':
2011-10-04 13:59:18 -07:00
The Android Open Source Project
e3e712e462
Reconcile with ics-factoryrom-release
...
Change-Id: I82601a2de420ce916449f1d7c143963731ad621e
2011-10-04 13:56:40 -07:00
Xavier Ducrohet
c8cbe4e577
am 7cfe2ad3: Merge "Make the VXGA720 skin indicate no hw back/home keys."
...
* commit '7cfe2ad3474340ae542955f8b9af8b6245ecfff4':
Make the VXGA720 skin indicate no hw back/home keys.
2011-10-04 13:22:06 -07:00
Xavier Ducrohet
7cfe2ad347
Merge "Make the VXGA720 skin indicate no hw back/home keys."
2011-10-04 13:20:40 -07:00
Xavier Ducrohet
cdf306b3ec
am d625e114: Move ICS SDK packages to r1.
...
* commit 'd625e114ecfcbdd2632b7447f93be44a731625e3':
Move ICS SDK packages to r1.
2011-10-04 13:06:56 -07:00
Xavier Ducrohet
d625e114ec
Move ICS SDK packages to r1.
...
Change-Id: I3216a2f0f65bb8f500698c5d0c835235ecbc8608
2011-10-04 13:00:29 -07:00
Xavier Ducrohet
faa85e4d5b
Make the VXGA720 skin indicate no hw back/home keys.
...
Change-Id: Iea7121903e75275849f0bcc2ecbc533aa37c3971
2011-10-04 10:51:37 -07:00
Xavier Ducrohet
f9410dae8b
am 8a585470: Add 1280x720@320dpi skin.
...
* commit '8a585470c55b48324be3bd4bdb1f67c0f8430271':
Add 1280x720@320dpi skin.
2011-10-04 09:00:41 -07:00
Xavier Ducrohet
8a585470c5
Add 1280x720@320dpi skin.
...
Also tweak some skins to provide more ram to the emulator
for better performance.
Change-Id: I89dcdb7a6a78d95132820db284c1fdfb6f82c6db
2011-10-03 20:27:07 -07:00
Chris Craik
d0b8dd99ed
am 82ff0214: Merge "Disable plugin content copy when 0x0 pixels"
...
* commit '82ff0214fb2c4f1ca2894e3460dda7c1154d4c17':
Disable plugin content copy when 0x0 pixels
2011-10-03 16:47:01 -07:00
Chris Craik
82ff0214fb
Merge "Disable plugin content copy when 0x0 pixels"
2011-10-03 16:45:37 -07:00
The Android Automerger
6cb64b727a
merge in ics-factoryrom-release history after reset to ics-factoryrom
2011-10-03 14:52:24 -07:00
Chris Craik
771310eb99
Disable plugin content copy when 0x0 pixels
...
bug:5382635
Change-Id: I83f999d9e2dd0dc51a6c2f780f2f2b7add95a60a
2011-10-03 14:51:50 -07:00
Raphael Moll
ca89d85d5f
am f9acf6cc: am 3d308aa2: SDK: generate support library package on build server.
...
* commit 'f9acf6cc661eaff205e827d70c2266b1dbd65e0a':
SDK: generate support library package on build server.
2011-10-03 10:10:47 -07:00
Raphael Moll
0c60c4e4fa
am d556f674: am fdefc023: SDK: tweak source package (add com.android. sources)
...
* commit 'd556f674e45ec077386bb9b8796f4019315b4d67':
SDK: tweak source package (add com.android. sources)
2011-10-03 10:10:46 -07:00
Raphael Moll
f9acf6cc66
am 3d308aa2: SDK: generate support library package on build server.
...
* commit '3d308aa22cee717875943040f6323526d1fe5695':
SDK: generate support library package on build server.
2011-10-03 10:08:32 -07:00
Raphael Moll
d556f674e4
am fdefc023: SDK: tweak source package (add com.android. sources)
...
* commit 'fdefc0238aaf93e493f61f107fd20509c2720d8b':
SDK: tweak source package (add com.android. sources)
2011-10-03 10:08:31 -07:00
Raphael Moll
3d308aa22c
SDK: generate support library package on build server.
...
Also fix packaging of system image (it had an extra root
directory in it, e.g. it was packaging android-4/armeabi-v7a/
instead of just armeabu-v7a/)
Change-Id: I0254b2680168d25103222f8871b2af37a7406b58
2011-10-01 23:44:08 -07:00
Raphael Moll
fdefc0238a
SDK: tweak source package (add com.android. sources)
...
Change-Id: Id1ad2d482c7f0cf58c5832f321997bb3b57d1f24
2011-10-01 23:42:04 -07:00
Eric Fischer
93457b91f8
am 462ab451: Merge "Import revised translations."
...
* commit '462ab451dd0a46b09b8098d8a9c429686b06e7c6':
Import revised translations.
2011-09-30 16:42:40 -07:00
Eric Fischer
462ab451dd
Merge "Import revised translations."
2011-09-30 16:39:09 -07:00
Eric Fischer
ca5a64eb66
Import revised translations.
...
Change-Id: I5c9433c81d595ad4d3975504e04af253cdbc3104
2011-09-30 16:33:06 -07:00
The Android Open Source Project
2d3361d331
am 6e4271f1: Reconcile with ics-factoryrom-release
...
* commit '6e4271f1a0d2e88a6a49cb87cbb81d343cb23c99':
2011-09-30 13:27:26 -07:00
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