OSDN Git Service
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 [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: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
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
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:40:17 +0000 (15:40 -0700)]
docs: adjust spacing for collapsible sections (release notes)
Change-Id: I68c8429e0e18bff50463b40f163df6a89ac8730a
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 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
The Android Automerger [Wed, 4 Jul 2012 20:53:25 +0000 (13:53 -0700)]
JRO03C
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
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
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 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
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
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 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
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: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: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 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 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 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 [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:20:48 +0000 (11:20 -0700)]
docs: try darker text and shorter line height
Change-Id: I7fe3cdc0a0f5cdfd8bcb69b1e1a2d11d8b5301d3
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 Automerger [Fri, 22 Jun 2012 22:14:06 +0000 (15:14 -0700)]
JRN83B
The Android Automerger [Fri, 22 Jun 2012 22:03:34 +0000 (15:03 -0700)]
merge in jb-release history after reset to jb-dev
Scott Main [Fri, 22 Jun 2012 21:36:33 +0000 (14:36 -0700)]
docs: style changes for notes
Change-Id: I13bc3f19780421a30feffc6e6ffe19cfadc886e5
Scott Main [Fri, 22 Jun 2012 17:25:52 +0000 (10:25 -0700)]
cherrypick from ics Change-Id: I07b59de3f2e4a5fef2e8722d7f7ab159ded8b2df
return old analytics script
Change-Id: Ica4abe000b529272efa9ba7867b3e7aa6c8c9e55
The Android Automerger [Fri, 22 Jun 2012 17:01:55 +0000 (10:01 -0700)]
JRN83
The Android Automerger [Fri, 22 Jun 2012 16:47:02 +0000 (09:47 -0700)]
merge in jb-release history after reset to jb-dev
Scott Main [Fri, 22 Jun 2012 01:03:05 +0000 (18:03 -0700)]
Massive clobber of all template files in developer site for new design
Change-Id: I5f243dcb377a8b2e573c404a9e685cc64e0e06d2
The Android Automerger [Fri, 22 Jun 2012 00:58:04 +0000 (17:58 -0700)]
JRN82C
The Android Automerger [Fri, 22 Jun 2012 00:47:30 +0000 (17:47 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Thu, 21 Jun 2012 21:27:43 +0000 (14:27 -0700)]
JRN82B
The Android Automerger [Thu, 21 Jun 2012 21:16:15 +0000 (14:16 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Thu, 21 Jun 2012 14:09:05 +0000 (07:09 -0700)]
JRN82
The Android Automerger [Thu, 21 Jun 2012 13:59:24 +0000 (06:59 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Thu, 21 Jun 2012 01:27:28 +0000 (18:27 -0700)]
JRN81C
The Android Automerger [Wed, 20 Jun 2012 22:46:52 +0000 (15:46 -0700)]
JRN81B
The Android Automerger [Wed, 20 Jun 2012 14:09:13 +0000 (07:09 -0700)]
JRN81
The Android Automerger [Wed, 20 Jun 2012 13:59:25 +0000 (06:59 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Tue, 19 Jun 2012 23:30:09 +0000 (16:30 -0700)]
JRN80C
Ying Wang [Tue, 19 Jun 2012 21:25:14 +0000 (14:25 -0700)]
Merge "More flexibility to keep/remove R.class in static Java library" into jb-dev
The Android Automerger [Tue, 19 Jun 2012 19:49:07 +0000 (12:49 -0700)]
JRN80B
Jean-Baptiste Queru [Tue, 19 Jun 2012 18:17:27 +0000 (11:17 -0700)]
Remove references to packages that don't exist any more.
Those can't be found anywhere in the build system.
Change-Id: I3b3727e7735de0dbffae930cf99a6d6ccbc79570
Ying Wang [Tue, 19 Jun 2012 17:40:37 +0000 (10:40 -0700)]
More flexibility to keep/remove R.class in static Java library
- Usually you don't need to set LOCAL_JAR_EXCLUDE_FILES in your
Android.mk, if your static library is directly used by an app.
- If your library will be included by another library that need
reference the R/Manifest class, you can set
LOCAL_JAR_EXCLUDE_FILES := none
to keep the generated classes.
- If your library includes another static library that has Android
resource and you want to remove the generated classes carried by
the static library, set:
LOCAL_JAR_EXCLUDE_FILES := $(ANDROID_RESOURCE_GENERATED_CLASSES)
With the LOCAL_JAR_EXCLUDE_FILES value "none", deprecate the old
long variable LOCAL_KEEP_R_CLASS_IN_STATIC_JAVA_LIBRARY.
Change-Id: I3b9ad5d66f0262f784feb09bc1537c5b01256258
The Android Automerger [Tue, 19 Jun 2012 14:10:41 +0000 (07:10 -0700)]
JRN80
The Android Automerger [Tue, 19 Jun 2012 13:59:24 +0000 (06:59 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Mon, 18 Jun 2012 23:27:50 +0000 (16:27 -0700)]
JRN79C
The Android Automerger [Mon, 18 Jun 2012 22:54:58 +0000 (15:54 -0700)]
JRN79B
Guang Zhu [Mon, 18 Jun 2012 18:52:42 +0000 (11:52 -0700)]
Merge "add uiautomator into system image" into jb-dev
The Android Automerger [Mon, 18 Jun 2012 14:06:59 +0000 (07:06 -0700)]
JRN79
The Android Automerger [Mon, 18 Jun 2012 13:59:23 +0000 (06:59 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Mon, 18 Jun 2012 00:06:48 +0000 (17:06 -0700)]
JRN78B
The Android Automerger [Sun, 17 Jun 2012 14:08:19 +0000 (07:08 -0700)]
JRN78
The Android Automerger [Sun, 17 Jun 2012 13:59:26 +0000 (06:59 -0700)]
merge in jb-release history after reset to jb-dev
Guang Zhu [Fri, 15 Jun 2012 21:46:26 +0000 (14:46 -0700)]
add uiautomator into system image
this includes 2 pieces:
* uiautomator shell script
* uiautomator.jar: test runner and the automation framework
classes
source is under frameworks/testing/uiautomator
Change-Id: I237d85b8917d2451cf35362d2e34786940897921
The Android Automerger [Sat, 16 Jun 2012 14:11:00 +0000 (07:11 -0700)]
JRN77
The Android Automerger [Sat, 16 Jun 2012 13:59:32 +0000 (06:59 -0700)]
merge in jb-release history after reset to jb-dev
Ying Wang [Thu, 14 Jun 2012 22:04:59 +0000 (15:04 -0700)]
Remove the user tag and legacy prebuilts for the srec modules.
Change-Id: I20d8ec8986e2da76fbab67d1f86f5d385bd87c47
The Android Automerger [Fri, 15 Jun 2012 23:17:07 +0000 (16:17 -0700)]
JRN75E
The Android Automerger [Fri, 15 Jun 2012 21:13:01 +0000 (14:13 -0700)]
JRN75D
The Android Automerger [Thu, 14 Jun 2012 23:48:04 +0000 (16:48 -0700)]
JRN75C
The Android Automerger [Thu, 14 Jun 2012 20:29:21 +0000 (13:29 -0700)]
JRN75B
Jean-Baptiste Queru [Thu, 14 Jun 2012 15:31:55 +0000 (08:31 -0700)]
Allow additional vendors
Bug:
6611375
Change-Id: I07a1c4e56a2c9fdb1f2c8426977f1a8db0e4d4bb
The Android Automerger [Thu, 14 Jun 2012 14:09:54 +0000 (07:09 -0700)]
JRN75
The Android Automerger [Thu, 14 Jun 2012 13:59:24 +0000 (06:59 -0700)]
merge in jb-release history after reset to jb-dev
OSDN Git Service
