OSDN Git Service
The Android Open Source Project [Thu, 19 Jul 2012 15:35:48 +0000 (08:35 -0700)]
Reconcile with jb-mr0-release jb-release
Change-Id: Id8ba9e1858f97ba17d9f9b9080c0e18c0bebfa7b
The Android Automerger [Thu, 19 Jul 2012 04:45:08 +0000 (21:45 -0700)]
JZO18
The Android Automerger [Thu, 19 Jul 2012 04:44:37 +0000 (21:44 -0700)]
merge in jb-mr0-release history after reset to jb-dev
Scott Main [Thu, 19 Jul 2012 03:14:58 +0000 (20:14 -0700)]
am
71b28a60: Merge "docs: add check in hash-change callback to be sure we\'re only dealing with hash-tags that are search queries. bug:
6843654" into jb-dev
* commit '
71b28a600e52922a7a18b990f256b2fa104d32e8':
docs: add check in hash-change callback to be sure we're only dealing with hash-tags that are search queries. bug:
6843654
Scott Main [Thu, 19 Jul 2012 03:14:03 +0000 (20:14 -0700)]
am
55163c88: Doc change: add links to the More menu.
* commit '
55163c882e8d97d48f58f8ac86c394ce07548d8c':
Doc change: add links to the More menu.
Scott Main [Wed, 18 Jul 2012 23:59:41 +0000 (16:59 -0700)]
Merge "docs: add check in hash-change callback to be sure we're only dealing with hash-tags that are search queries. bug:
6843654" into jb-dev
Scott Main [Wed, 18 Jul 2012 23:53:22 +0000 (16:53 -0700)]
docs: add check in hash-change callback to be sure we're only dealing with hash-tags that are search queries.
bug:
6843654
Change-Id: I5fee7426d8ad404a5f03f37297fe72009df30de7
Scott Main [Wed, 18 Jul 2012 23:18:25 +0000 (16:18 -0700)]
Doc change: add links to the More menu.
Change-Id: I77e848f86278781b0a44eb672ea711e00352fde5
Scott Main [Tue, 17 Jul 2012 20:22:25 +0000 (13:22 -0700)]
am
1d62fa80: docs: bring back min-height for nav-x for proper height of secondary tabs
* commit '
1d62fa807e1ac2c4f9ad8f31f34809ec97e975ed':
docs: bring back min-height for nav-x for proper height of secondary tabs
Scott Main [Tue, 17 Jul 2012 20:15:12 +0000 (13:15 -0700)]
docs: bring back min-height for nav-x for proper height of secondary tabs
Change-Id: I865195b9fde9ec64fbe2c083c0d3617a55b54a0f
The Android Automerger [Tue, 17 Jul 2012 19:34:10 +0000 (12:34 -0700)]
JZO17
Wink Saville [Tue, 17 Jul 2012 19:33:21 +0000 (12:33 -0700)]
am
c4e790dc: (-s ours) Create telephony-common and mms-common - DO NOT MERGE
* commit '
c4e790dc6474566799012728f9e67f5d794975b4':
Create telephony-common and mms-common - DO NOT MERGE
The Android Automerger [Tue, 17 Jul 2012 19:29:00 +0000 (12:29 -0700)]
merge in jb-mr0-release history after reset to jb-dev
The Android Automerger [Tue, 17 Jul 2012 19:27:31 +0000 (12:27 -0700)]
JRO03H
Wink Saville [Sat, 30 Jun 2012 23:13:26 +0000 (16:13 -0700)]
Create telephony-common and mms-common - DO NOT MERGE
These have been created to reduce the size and complexity
of frameworks/base.
mms-common was created by moving all of
frameworks/base/core/java/com/google/android/mms
to:
frameworks/opt/mms
telephony-common was created by moving some of
frameworks/base/telephony
to:
frameworks/opt/telephony
Change-Id: I5613c1447dbe655c55f9ba499e453bb59a06c4c0
Scott Main [Tue, 17 Jul 2012 01:38:14 +0000 (18:38 -0700)]
am
a214d84f: docs: upgrades to search. Fix history navigation functionality. Faster ajax requery while typing. Ignore ENTER key when performing requery to avoid reload. Improve results reveal with minimum height for proper div.
* commit '
a214d84ff82bb3ae279b1f2c8ece5f65656b5e5c':
docs: upgrades to search. Fix history navigation functionality. Faster ajax requery while typing. Ignore ENTER key when performing requery to avoid reload. Improve results reveal with minimum height for proper div.
Scott Main [Tue, 17 Jul 2012 00:14:40 +0000 (17:14 -0700)]
docs: upgrades to search.
Fix history navigation functionality.
Faster ajax requery while typing.
Ignore ENTER key when performing requery to avoid reload.
Improve results reveal with minimum height for proper div.
Change-Id: Ie50a6d7bdf58ad3e17dd15d30dcec973a123b7bf
Scott Main [Mon, 16 Jul 2012 22:46:46 +0000 (15:46 -0700)]
am
220c3449: docs: adjust spacing for collapsible sections (release notes)
* commit '
220c34492ae24f79f9b4a4fe15051360c8505807':
docs: adjust spacing for collapsible sections (release notes)
Scott Main [Mon, 16 Jul 2012 22:40:17 +0000 (15:40 -0700)]
docs: adjust spacing for collapsible sections (release notes)
Change-Id: I68c8429e0e18bff50463b40f163df6a89ac8730a
The Android Automerger [Mon, 16 Jul 2012 19:15:57 +0000 (12:15 -0700)]
JRO03G
The Android Automerger [Fri, 13 Jul 2012 21:19:15 +0000 (14:19 -0700)]
JRO03F
The Android Automerger [Fri, 13 Jul 2012 20:38:41 +0000 (13:38 -0700)]
JRO03E
Jean-Baptiste Queru [Fri, 13 Jul 2012 19:13:54 +0000 (12:13 -0700)]
Merge
2f16ba59
Change-Id: I3bf0eacfde7c61e22dcf6c2709fc7caccdfd48cc
The Android Automerger [Fri, 13 Jul 2012 00:26:25 +0000 (17:26 -0700)]
JRO03D
Justin Ho [Thu, 12 Jul 2012 23:21:00 +0000 (16:21 -0700)]
Android 4.1.2 version bump
Change-Id: Ie135022b4ddcac457071aec7b217d41ebdcde188
The Android Automerger [Thu, 12 Jul 2012 06:17:54 +0000 (23:17 -0700)]
JZO11
The Android Automerger [Thu, 12 Jul 2012 06:16:01 +0000 (23:16 -0700)]
JZO10
The Android Automerger [Thu, 12 Jul 2012 06:11:59 +0000 (23:11 -0700)]
merge in jb-mr0-release history after reset to jb-dev
Guang Zhu [Thu, 12 Jul 2012 02:36:17 +0000 (19:36 -0700)]
resolved conflicts for merge of
ef1335ed to jb-dev-plus-aosp
Change-Id: I4da6c32635e67730ac595a2a04165f12c37c1c15
Guang Zhu [Thu, 12 Jul 2012 01:35:08 +0000 (18:35 -0700)]
use default shell (mksh) in emulator
remove the override to use ash as shell so that mksh is the
default in 'generic' product type
Change-Id: I91d76d0fc522baf5d47096ab19ea264c9b1268e6
Wink Saville [Sat, 30 Jun 2012 23:13:26 +0000 (16:13 -0700)]
Create telephony-common and mms-common
These have been created to reduce the size and complexity
of frameworks/base.
mms-common was created by moving all of
frameworks/base/core/java/com/google/android/mms
to:
frameworks/opt/mms
telephony-common was created by moving some of
frameworks/base/telephony
to:
frameworks/opt/telephony
Change-Id: I5613c1447dbe655c55f9ba499e453bb59a06c4c0
The Android Open Source Project [Wed, 4 Jul 2012 23:48:36 +0000 (16:48 -0700)]
Reconcile with jb-release
Change-Id: Ibc74bebbb56ee41e45e79ca3d36f176fa049c0da
The Android Automerger [Wed, 4 Jul 2012 20:53:25 +0000 (13:53 -0700)]
JRO03C
Scott Main [Tue, 3 Jul 2012 21:15:43 +0000 (14:15 -0700)]
am
38f19c21: Merge "docs: fix search suggestions and other script bugs for offline docs" into jb-dev
* commit '
38f19c21258592faefa652d4871d570e151a2a53':
docs: fix search suggestions and other script bugs for offline docs
Scott Main [Tue, 3 Jul 2012 21:10:57 +0000 (14:10 -0700)]
Merge "docs: fix search suggestions and other script bugs for offline docs" into jb-dev
The Android Open Source Project [Tue, 3 Jul 2012 21:09:18 +0000 (14:09 -0700)]
Reconcile with jb-release
Change-Id: Ie16ae85a5b9af4926fa1b73521163f85222958ec
Scott Main [Tue, 3 Jul 2012 21:06:22 +0000 (14:06 -0700)]
docs: fix search suggestions and other script bugs for offline docs
Change-Id: I3f9404695966b99be1c8ed36249788e448399296
Jean-Baptiste Queru [Tue, 3 Jul 2012 21:04:28 +0000 (14:04 -0700)]
Ignore version change from jb-dev
Change-Id: Ia04c4664cba4abdef04f0949713f4c76281713d8
The Android Automerger [Tue, 3 Jul 2012 21:00:39 +0000 (14:00 -0700)]
JRO03B
Ed Heyl [Tue, 3 Jul 2012 20:54:49 +0000 (13:54 -0700)]
4.1.1
Change-Id: Ide0b70ce6322dad26461a9fb87e1b629aaedf1e5
Ed Heyl [Tue, 3 Jul 2012 20:57:52 +0000 (13:57 -0700)]
Merge "4.1.1" into jb-dev
Ed Heyl [Tue, 3 Jul 2012 20:54:49 +0000 (13:54 -0700)]
4.1.1
Change-Id: Ide0b70ce6322dad26461a9fb87e1b629aaedf1e5
The Android Open Source Project [Tue, 3 Jul 2012 20:30:52 +0000 (13:30 -0700)]
Reconcile with jb-release
Change-Id: I23dd2b4acc6d2ca20756d6d674272a2721843d20
The Android Automerger [Tue, 3 Jul 2012 19:58:46 +0000 (12:58 -0700)]
JRO02D
The Android Automerger [Tue, 3 Jul 2012 19:50:47 +0000 (12:50 -0700)]
merge in jb-release history after reset to jb-dev
Ying Wang [Tue, 3 Jul 2012 19:16:03 +0000 (12:16 -0700)]
am
9e38d6bf: Merge "This property is set when HAVE_SELINUX:=true during build."
* commit '
9e38d6bf1bf78a00d8f4288e6444be358a70a692':
This property is set when HAVE_SELINUX:=true during build.
The Android Open Source Project [Tue, 3 Jul 2012 19:11:41 +0000 (12:11 -0700)]
Reconcile with jb-release
Change-Id: Iee367557b16d18b63d71c2ea910d207820643c11
Ying Wang [Tue, 3 Jul 2012 18:30:30 +0000 (11:30 -0700)]
Merge "This property is set when HAVE_SELINUX:=true during build."
William Roberts [Tue, 3 Jul 2012 01:55:14 +0000 (18:55 -0700)]
This property is set when HAVE_SELINUX:=true during build.
This will provide a convenient method for determing build
configuration when in the Java layer. For instance, this will
be used in change id I69529fb7a3adfe31eccb16d79740fc4952ff5e68
to determine if the Settings app should display the SE Linux
status.
Change-Id: Idc8dff020aaac41649eac64f5fa8e311dabbc51f
The Android Automerger [Tue, 3 Jul 2012 02:03:14 +0000 (19:03 -0700)]
JRO02C
The Android Automerger [Tue, 3 Jul 2012 01:58:01 +0000 (18:58 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Mon, 2 Jul 2012 23:25:03 +0000 (16:25 -0700)]
JRO02B
The Android Automerger [Mon, 2 Jul 2012 23:16:18 +0000 (16:16 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Mon, 2 Jul 2012 20:00:27 +0000 (13:00 -0700)]
JRO02
The Android Automerger [Mon, 2 Jul 2012 19:53:12 +0000 (12:53 -0700)]
merge in jb-release history after reset to jb-dev
Ying Wang [Sat, 30 Jun 2012 03:19:50 +0000 (20:19 -0700)]
am
e42ed0ba: Merge "Move the llvm-gcc warning from HOST_darwin-x86.mk to main.mk"
* commit '
e42ed0ba1571f20866609710ba7c73fd138c0405':
Move the llvm-gcc warning from HOST_darwin-x86.mk to main.mk
Ying Wang [Sat, 30 Jun 2012 02:55:06 +0000 (19:55 -0700)]
Merge "Move the llvm-gcc warning from HOST_darwin-x86.mk to main.mk"
The Android Open Source Project [Sat, 30 Jun 2012 01:28:17 +0000 (18:28 -0700)]
Reconcile with jb-release
Change-Id: I0e57086cc66800b7de474af735ebd7ee896e6a25
The Android Automerger [Fri, 29 Jun 2012 22:57:58 +0000 (15:57 -0700)]
JRN90
The Android Automerger [Fri, 29 Jun 2012 22:47:16 +0000 (15:47 -0700)]
merge in jb-release history after reset to jb-dev
The Android Open Source Project [Fri, 29 Jun 2012 15:13:34 +0000 (08:13 -0700)]
Reconcile with jb-release
Change-Id: I7aaa394cda0be63324f5cba09f93e444fd1763fc
The Android Automerger [Fri, 29 Jun 2012 00:16:17 +0000 (17:16 -0700)]
JRN89B
The Android Automerger [Fri, 29 Jun 2012 00:06:01 +0000 (17:06 -0700)]
merge in jb-release history after reset to jb-dev
Ying Wang [Thu, 28 Jun 2012 23:02:19 +0000 (16:02 -0700)]
Move the llvm-gcc warning from HOST_darwin-x86.mk to main.mk
Bug:
6754632
So the warning won't show up when you run lunch.
Now the warning only shows when you do a clean build.
Change-Id: I7876da783f059d390f0072df37d3ab0291589eb7
Scott Main [Thu, 28 Jun 2012 19:01:03 +0000 (12:01 -0700)]
am
f973ced3: docs: better message for download page when os detection fails
* commit '
f973ced37e2d065c0aa41bb5563abad7518bea61':
docs: better message for download page when os detection fails
Scott Main [Thu, 28 Jun 2012 18:56:01 +0000 (11:56 -0700)]
docs: better message for download page when os detection fails
Change-Id: I940c0847ddc214ef36bfd0708d289cff200dfc62
The Android Automerger [Thu, 28 Jun 2012 14:08:48 +0000 (07:08 -0700)]
JRN89
The Android Automerger [Thu, 28 Jun 2012 13:59:25 +0000 (06:59 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Wed, 27 Jun 2012 21:15:09 +0000 (14:15 -0700)]
JRN88
The Android Automerger [Wed, 27 Jun 2012 21:04:29 +0000 (14:04 -0700)]
merge in jb-release history after reset to jb-dev
Scott Main [Wed, 27 Jun 2012 09:25:12 +0000 (02:25 -0700)]
am
810e2889: docs: fix overlapping sidebar bug, but I think this re-introduces a bug in IE where the sidenav position moves slightly left/right during scroll, but it\'s a worthwhile compromise and will investigate a diff solution for that later.
* commit '
810e28891457af6e365b839ac584d77277b2e3fa':
docs: fix overlapping sidebar bug, but I think this re-introduces a bug in IE where the sidenav position moves slightly left/right during scroll, but it's a worthwhile compromise and will investigate a diff solution for that later.
Scott Main [Wed, 27 Jun 2012 09:08:20 +0000 (02:08 -0700)]
docs: fix overlapping sidebar bug,
but I think this re-introduces a bug in IE where the sidenav
position moves slightly left/right during scroll, but it's a
worthwhile compromise and will investigate a diff solution for that later.
Change-Id: Id1f2141b6638e199d1a4ad1d198a5a5aa45bf264
Scott Main [Wed, 27 Jun 2012 05:26:18 +0000 (22:26 -0700)]
Scott Main [Wed, 27 Jun 2012 05:23:22 +0000 (22:23 -0700)]
docs: misc css
Change-Id: I398d30f9414564f58ea3546a192ad1c12e715349
The Android Automerger [Tue, 26 Jun 2012 18:15:56 +0000 (11:15 -0700)]
JRN87
The Android Automerger [Tue, 26 Jun 2012 18:07:24 +0000 (11:07 -0700)]
merge in jb-release history after reset to jb-dev
The Android Open Source Project [Tue, 26 Jun 2012 14:18:15 +0000 (07:18 -0700)]
Reconcile with jb-release
Change-Id: Iab5346490b6838a2137ffd28e72e4f8d4e9f48da
The Android Automerger [Tue, 26 Jun 2012 00:24:56 +0000 (17:24 -0700)]
JRN84D
The Android Automerger [Tue, 26 Jun 2012 00:14:15 +0000 (17:14 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Tue, 26 Jun 2012 00:05:30 +0000 (17:05 -0700)]
JRN84C
The Android Open Source Project [Mon, 25 Jun 2012 19:18:24 +0000 (12:18 -0700)]
Reconcile with jb-release
Change-Id: I2b5cf5780851a3979016a50ff39f7da6d6d1a82b
The Android Automerger [Mon, 25 Jun 2012 18:31:30 +0000 (11:31 -0700)]
JRN84B
The Android Automerger [Mon, 25 Jun 2012 18:29:39 +0000 (11:29 -0700)]
JRN86
The Android Open Source Project [Mon, 25 Jun 2012 14:57:11 +0000 (07:57 -0700)]
Reconcile with jb-release
Change-Id: I80e21c4019904a7f755af426e3e29e41c9b23f78
The Android Automerger [Sun, 24 Jun 2012 06:28:18 +0000 (23:28 -0700)]
JRN84
The Android Automerger [Sun, 24 Jun 2012 06:13:39 +0000 (23:13 -0700)]
merge in jb-release history after reset to jb-dev
Scott Main [Sun, 24 Jun 2012 00:52:58 +0000 (17:52 -0700)]
am
9ada2264: docs: darker font color
* commit '
9ada22647890c18ded2b890d00c0a307bd2bed98':
docs: darker font color
Scott Main [Sat, 23 Jun 2012 21:59:36 +0000 (14:59 -0700)]
docs: darker font color
Change-Id: I8fe4117ac501001dd6c7156b337f3ff7a4f75793
Scott Main [Sat, 23 Jun 2012 18:25:21 +0000 (11:25 -0700)]
am
6a7a66be: docs: try darker text and shorter line height
* commit '
6a7a66beba12d6e655f3dde257a3e4964f8ad0c7':
docs: try darker text and shorter line height
Scott Main [Sat, 23 Jun 2012 18:20:48 +0000 (11:20 -0700)]
docs: try darker text and shorter line height
Change-Id: I7fe3cdc0a0f5cdfd8bcb69b1e1a2d11d8b5301d3
Scott Main [Sat, 23 Jun 2012 12:37:01 +0000 (05:37 -0700)]
am
d786a29f: docs: adjust homepage carousel styles
* commit '
d786a29f14c502986ffc160471daedfd0b5fb5dc':
docs: adjust homepage carousel styles
Scott Main [Sat, 23 Jun 2012 12:37:01 +0000 (05:37 -0700)]
am
25659b02: docs: update sdk template to support new ndk doc layout
* commit '
25659b0217cca1389b2711ee536547b20b266319':
docs: update sdk template to support new ndk doc layout
Scott Main [Sat, 23 Jun 2012 12:36:51 +0000 (05:36 -0700)]
am
412eaf20: docs: style changes for notes
* commit '
412eaf202c63b8d2cc32b5b865ba29155e047697':
docs: style changes for notes
Scott Main [Sat, 23 Jun 2012 04:23:32 +0000 (21:23 -0700)]
docs: adjust homepage carousel styles
Change-Id: Id2b32ce67d26a19b40e7944a5dd37cd17d8eec2a
The Android Automerger [Sat, 23 Jun 2012 03:41:01 +0000 (20:41 -0700)]
JRN83D
The Android Automerger [Sat, 23 Jun 2012 03:37:07 +0000 (20:37 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Sat, 23 Jun 2012 01:28:32 +0000 (18:28 -0700)]
JRN83C
The Android Automerger [Sat, 23 Jun 2012 01:19:02 +0000 (18:19 -0700)]
merge in jb-release history after reset to jb-dev
Scott Main [Sat, 23 Jun 2012 00:02:25 +0000 (17:02 -0700)]
docs: update sdk template to support new ndk doc layout
Change-Id: I47ec2fcd4b7116fa3dc59483a434d7f188f984d1
The Android Open Source Project [Fri, 22 Jun 2012 22:20:06 +0000 (15:20 -0700)]
Reconcile with jb-release
Change-Id: I4a8336fb66821c570245f75901919ef6b1b9c641