OSDN Git Service
kmccormick@google.com [Thu, 15 Nov 2012 17:49:21 +0000 (09:49 -0800)]
am
f53c5f36: am
d1ae2721: Merge "Doc Update: Fixing images" into jb-dev-docs
* commit '
f53c5f3683b71d232a78e04ea06649dd5e4bfee1':
Doc Update: Fixing images
kmccormick@google.com [Thu, 15 Nov 2012 17:45:46 +0000 (09:45 -0800)]
am
d1ae2721: Merge "Doc Update: Fixing images" into jb-dev-docs
* commit '
d1ae2721fa7b350b979e75319812636ea31bb56b':
Doc Update: Fixing images
&& repo sync -j8 [Thu, 15 Nov 2012 17:43:17 +0000 (09:43 -0800)]
Merge "Doc Update: Fixing images" into jb-dev-docs
Scott Main [Thu, 15 Nov 2012 03:04:05 +0000 (19:04 -0800)]
resolved conflicts for merge of
e907a390 to jb-dev-plus-aosp
Change-Id: I4e216b81f33b4b7c238f74f1c475bc84df3f79ef
&& repo sync -j8 [Thu, 15 Nov 2012 02:26:07 +0000 (18:26 -0800)]
Doc Update: Fixing images
Bug:
7542170
Change-Id: I18e5d360e21af9d30864456ae429b804314e1edb
Scott Main [Thu, 15 Nov 2012 01:38:15 +0000 (17:38 -0800)]
am
22cc2764: implement new organization for Training classes This also moves a few of the documents from API Guides > Best Practices into the new courses for best practices. This is also dependent on CL Ieac8a97a8d6fda41a3682241901150cfe16afc4d which generates the lis
* commit '
22cc2764cc74e52888b043e0c6371594305bb5e9':
implement new organization for Training classes This also moves a few of the documents from API Guides > Best Practices into the new courses for best practices. This is also dependent on CL Ieac8a97a8d6fda41a3682241901150cfe16afc4d which generates the list of classes/lessons on each course landing page.
Scott Main [Thu, 8 Nov 2012 00:35:16 +0000 (16:35 -0800)]
implement new organization for Training classes
This also moves a few of the documents from API Guides > Best Practices
into the new courses for best practices.
This is also dependent on CL Ieac8a97a8d6fda41a3682241901150cfe16afc4d
which generates the list of classes/lessons on each course landing page.
Change-Id: I8132f72f78d844c3b035c7aa269ad3b88a25d02a
Joe Malin [Tue, 13 Nov 2012 22:22:58 +0000 (14:22 -0800)]
am
4979a0b5: am
5f32d337: Merge "Notification.java javadoc: addAction" into jb-dev-docs
* commit '
4979a0b59486d737a4d9267af9b38f237705e26f':
Notification.java javadoc: addAction
Joe Malin [Tue, 13 Nov 2012 22:20:54 +0000 (14:20 -0800)]
am
5f32d337: Merge "Notification.java javadoc: addAction" into jb-dev-docs
* commit '
5f32d3375b13e581d3101ed8e928fd6a463f3809':
Notification.java javadoc: addAction
Joe Malin [Tue, 13 Nov 2012 22:14:23 +0000 (14:14 -0800)]
Merge "Notification.java javadoc: addAction" into jb-dev-docs
Scott Main [Tue, 13 Nov 2012 03:46:11 +0000 (19:46 -0800)]
am
ddf5efdf: am
52bfaaf7: docs: Android SDK Tools r21 Release Notes
* commit '
ddf5efdf45e32fab02bff6f9cd001098dcf5a444':
docs: Android SDK Tools r21 Release Notes
Scott Main [Tue, 13 Nov 2012 03:43:28 +0000 (19:43 -0800)]
am
52bfaaf7: docs: Android SDK Tools r21 Release Notes
* commit '
52bfaaf7444c8b4d571d0c81fadbb1609411d6e1':
docs: Android SDK Tools r21 Release Notes
Scott Main [Tue, 13 Nov 2012 03:39:58 +0000 (19:39 -0800)]
docs: Android SDK Tools r21 Release Notes
Change-Id: I7496c2af7592d8080ca4d0618466a9ccc578d0dd
Scott Main [Tue, 13 Nov 2012 02:07:57 +0000 (18:07 -0800)]
am
b590b0b3: am
6453dfb7: update Download and installation guides for ADT Bundle
* commit '
b590b0b37ad2a255f8923ed7037514333a3d8ff5':
update Download and installation guides for ADT Bundle
Scott Main [Tue, 13 Nov 2012 02:05:04 +0000 (18:05 -0800)]
am
6453dfb7: update Download and installation guides for ADT Bundle
* commit '
6453dfb79712c288bdf825a2a4c43e583e5c8aa4':
update Download and installation guides for ADT Bundle
Scott Main [Tue, 23 Oct 2012 21:14:18 +0000 (14:14 -0700)]
update Download and installation guides for ADT Bundle
Change-Id: I59d3113d4caf937b13e10c50618a37ae86d4ae55
kmccormick@google.com [Mon, 12 Nov 2012 23:02:55 +0000 (15:02 -0800)]
am
39cc8f80: am
4233c939: Merge "Doc Update: param name change" into jb-dev-docs
* commit '
39cc8f8079412f721c5003cd2d0cb07366b77da4':
Doc Update: param name change
kmccormick@google.com [Mon, 12 Nov 2012 23:00:12 +0000 (15:00 -0800)]
am
4233c939: Merge "Doc Update: param name change" into jb-dev-docs
* commit '
4233c939014c39ce9d95556db1b654e906f8ce5b':
Doc Update: param name change
&& repo sync -j8 [Mon, 12 Nov 2012 22:56:58 +0000 (14:56 -0800)]
Merge "Doc Update: param name change" into jb-dev-docs
&& repo sync -j8 [Mon, 12 Nov 2012 22:45:08 +0000 (14:45 -0800)]
Doc Update: param name change
Change-Id: I320374f8d40ba090a561fe173bb08837abaa263a
Joe Fernandez [Mon, 12 Nov 2012 22:35:27 +0000 (14:35 -0800)]
am
180200c2: am
aac29f12: Merge "docs: NDK r8c Release Notes" into jb-dev-docs
* commit '
180200c2c126fc7db1a86ac49a235f40d1905731':
docs: NDK r8c Release Notes
Joe Fernandez [Mon, 12 Nov 2012 22:33:44 +0000 (14:33 -0800)]
am
1c350fa4: am
cee5dab6: Merge "docs: JOBB tool help page" into jb-dev-docs
* commit '
1c350fa458a6894abb7d4213d65c1c2833faaa7a':
docs: JOBB tool help page
Joe Fernandez [Mon, 12 Nov 2012 22:30:31 +0000 (14:30 -0800)]
am
aac29f12: Merge "docs: NDK r8c Release Notes" into jb-dev-docs
* commit '
aac29f126ea8c42313a5481b4871828bbd40b4a6':
docs: NDK r8c Release Notes
Joe Fernandez [Mon, 12 Nov 2012 22:29:08 +0000 (14:29 -0800)]
am
cee5dab6: Merge "docs: JOBB tool help page" into jb-dev-docs
* commit '
cee5dab6752a9e793f620981014f3b7cc4f8c137':
docs: JOBB tool help page
Joe Fernandez [Mon, 12 Nov 2012 22:28:05 +0000 (14:28 -0800)]
Merge "docs: NDK r8c Release Notes" into jb-dev-docs
Joe Fernandez [Mon, 12 Nov 2012 22:25:54 +0000 (14:25 -0800)]
Merge "docs: JOBB tool help page" into jb-dev-docs
Geremy Condra [Thu, 8 Nov 2012 22:26:39 +0000 (14:26 -0800)]
am
2b4bc305: Merge "DO NOT MERGE Control access to tts objects" into jb-dev
* commit '
2b4bc305a2305d1dda66e054d228b4708575ff8d':
DO NOT MERGE Control access to tts objects
Geremy Condra [Thu, 8 Nov 2012 22:22:47 +0000 (14:22 -0800)]
Merge "DO NOT MERGE Control access to tts objects" into jb-dev
Scott Main [Thu, 8 Nov 2012 01:33:09 +0000 (17:33 -0800)]
am
1af587b3: am
4623c0d8: docs: Add basic tool help pages for SDK and AVD Manager. The SDK Manager page is needed particularly as a reference by some pages rather than pointing to the installation guide.
* commit '
1af587b346035320363a08c190f8b61a69cf0e7c':
docs: Add basic tool help pages for SDK and AVD Manager. The SDK Manager page is needed particularly as a reference by some pages rather than pointing to the installation guide.
Scott Main [Thu, 8 Nov 2012 01:30:22 +0000 (17:30 -0800)]
am
4623c0d8: docs: Add basic tool help pages for SDK and AVD Manager. The SDK Manager page is needed particularly as a reference by some pages rather than pointing to the installation guide.
* commit '
4623c0d842403bf2ae4b622590325c3635aaf563':
docs: Add basic tool help pages for SDK and AVD Manager. The SDK Manager page is needed particularly as a reference by some pages rather than pointing to the installation guide.
Scott Main [Wed, 7 Nov 2012 19:08:01 +0000 (11:08 -0800)]
docs: Add basic tool help pages for SDK and AVD Manager.
The SDK Manager page is needed particularly as a reference by
some pages rather than pointing to the installation guide.
Change-Id: Ie835e310f62cdc88bd6318e82f48e36bdd8e117a
Joe Malin [Mon, 5 Nov 2012 19:36:40 +0000 (11:36 -0800)]
Notification.java javadoc: addAction
Change-Id: I86fe116f50d8462494cfc9f138e1c885ae5a41ea
kmccormick@google.com [Tue, 6 Nov 2012 23:59:33 +0000 (15:59 -0800)]
am
856e24d8: am
fa2dbd69: Merge "Doc change: GCM category & dry_run params" into jb-dev-docs
* commit '
856e24d82a5009db69058b6c37cbbe1af3b292f7':
Doc change: GCM category & dry_run params
kmccormick@google.com [Tue, 6 Nov 2012 23:56:25 +0000 (15:56 -0800)]
am
fa2dbd69: Merge "Doc change: GCM category & dry_run params" into jb-dev-docs
* commit '
fa2dbd693c3ffebd806cbbb4f708f754d58423ed':
Doc change: GCM category & dry_run params
&& repo sync -j8 [Tue, 6 Nov 2012 18:38:45 +0000 (10:38 -0800)]
Merge "Doc change: GCM category & dry_run params" into jb-dev-docs
Joe Malin [Mon, 5 Nov 2012 22:01:46 +0000 (14:01 -0800)]
am
fbcfb5d0: am
50c2275c: Android Training: CursorLoader
* commit '
fbcfb5d0f899e0b3c89334d43b45907337cf7f36':
Android Training: CursorLoader
Joe Malin [Mon, 5 Nov 2012 21:59:48 +0000 (13:59 -0800)]
am
50c2275c: Android Training: CursorLoader
* commit '
50c2275cff28c4a216f6924584e43cd64b90a3bf':
Android Training: CursorLoader
Joe Malin [Sat, 20 Oct 2012 19:41:40 +0000 (12:41 -0700)]
Android Training: CursorLoader
Change-Id: Ia8d723b5ce32002597b9444b8c7eff07b1ab29c8
Geremy Condra [Fri, 2 Nov 2012 21:22:31 +0000 (14:22 -0700)]
am
a295ba44: Merge "Change android.permission.SERIAL_PORT to signature|system." into jb-dev
* commit '
a295ba44793e5601c8574bdcb07313420aa6500c':
Change android.permission.SERIAL_PORT to signature|system.
Geremy Condra [Fri, 2 Nov 2012 21:19:45 +0000 (14:19 -0700)]
Merge "Change android.permission.SERIAL_PORT to signature|system." into jb-dev
Scott Main [Thu, 1 Nov 2012 22:34:42 +0000 (15:34 -0700)]
am
2cff3eea: am
f19804b5: Merge "new dashboard stats for 11/1, platform version only" into jb-dev-docs
* commit '
2cff3eeaeb419fcdfc7307c2c52a653483c76ddb':
new dashboard stats for 11/1, platform version only
Scott Main [Thu, 1 Nov 2012 22:31:53 +0000 (15:31 -0700)]
am
f19804b5: Merge "new dashboard stats for 11/1, platform version only" into jb-dev-docs
* commit '
f19804b5e994d183e6f6eeb512f74f2380ffd533':
new dashboard stats for 11/1, platform version only
Scott Main [Thu, 1 Nov 2012 22:28:33 +0000 (15:28 -0700)]
Merge "new dashboard stats for 11/1, platform version only" into jb-dev-docs
Scott Main [Thu, 1 Nov 2012 20:15:26 +0000 (13:15 -0700)]
new dashboard stats for 11/1, platform version only
Change-Id: If6e9633170793e45abfdc94ef215f45edd64e547
Robert Ly [Thu, 1 Nov 2012 21:19:18 +0000 (14:19 -0700)]
am
0fc15da0: am
677c1e14: Merge "docs: google market -> google play" into jb-dev-docs
* commit '
0fc15da00597c5a017c1d8eed8f34064c702e4c2':
docs: google market -> google play
Selim Gurun [Thu, 1 Nov 2012 18:55:14 +0000 (11:55 -0700)]
DO NOT MERGE Control access to tts objects
Bug:
7073422
Control access to inherited methods of texttospeech JS objects.
Change-Id: Ieae0efaf1267108abd97cdac9e8604f6246cefb9
Robert Ly [Thu, 1 Nov 2012 21:16:47 +0000 (14:16 -0700)]
am
677c1e14: Merge "docs: google market -> google play" into jb-dev-docs
* commit '
677c1e14fbd991a46b5496d0873b7ca155fd71fb':
docs: google market -> google play
Robert Ly [Thu, 1 Nov 2012 21:14:26 +0000 (14:14 -0700)]
Merge "docs: google market -> google play" into jb-dev-docs
Geremy Condra [Wed, 17 Oct 2012 21:06:31 +0000 (14:06 -0700)]
Change android.permission.SERIAL_PORT to signature|system.
Bug:
7367956
Change-Id: I0bc65936ba59c43c18d9a6ba52affff4c921f2fb
Joe Malin [Thu, 1 Nov 2012 20:58:02 +0000 (13:58 -0700)]
am
d2e16346: am
ac294abb: Revision to Notifications API guide
* commit '
d2e163461ee8aa79d4560f38e924a7edc44ad4dd':
Revision to Notifications API guide
Joe Malin [Thu, 1 Nov 2012 20:55:08 +0000 (13:55 -0700)]
am
ac294abb: Revision to Notifications API guide
* commit '
ac294abb40483fc734e22833371d95cbb161ec87':
Revision to Notifications API guide
Joe Malin [Tue, 16 Oct 2012 17:32:15 +0000 (10:32 -0700)]
Revision to Notifications API guide
Change-Id: I52229dfdff3649e03a1fbce91234c8b2a544502a
Dirk Dougherty [Wed, 31 Oct 2012 00:04:48 +0000 (17:04 -0700)]
am
a76f1dfc: am
c7255569: Merge "Doc change: fix broken link in publishing steps TOC." into jb-dev-docs
* commit '
a76f1dfc7740fa506c8ba4058e2ad8b90b476fe8':
Doc change: fix broken link in publishing steps TOC.
Dirk Dougherty [Wed, 31 Oct 2012 00:01:53 +0000 (17:01 -0700)]
am
c7255569: Merge "Doc change: fix broken link in publishing steps TOC." into jb-dev-docs
* commit '
c7255569bba20d94200dc05ffd5ce7b61bdc569c':
Doc change: fix broken link in publishing steps TOC.
Dirk Dougherty [Tue, 30 Oct 2012 23:56:57 +0000 (16:56 -0700)]
Merge "Doc change: fix broken link in publishing steps TOC." into jb-dev-docs
Dirk Dougherty [Tue, 30 Oct 2012 23:51:54 +0000 (16:51 -0700)]
Doc change: fix broken link in publishing steps TOC.
Change-Id: I1b7453dfe276be40a23f1bd59a463e6d4f9b0412
Joe Fernandez [Wed, 10 Oct 2012 17:25:17 +0000 (10:25 -0700)]
docs: NDK r8c Release Notes
Change-Id: I873460d3ad1d4259f602138b566195edc5e24c4a
Joe Fernandez [Wed, 24 Oct 2012 22:36:10 +0000 (15:36 -0700)]
docs: JOBB tool help page
Change-Id: I0651c0080cb8bb2436591247d72dfe7be66061f5
Robert Ly [Thu, 25 Oct 2012 23:29:09 +0000 (16:29 -0700)]
am
d6bbf71d: am
ea502b27: Merge "docs: animations au class" into jb-dev-docs
* commit '
d6bbf71dc552d54ffde25e8c00ed96630a5221a6':
docs: animations au class
Robert Ly [Thu, 25 Oct 2012 23:26:57 +0000 (16:26 -0700)]
am
ea502b27: Merge "docs: animations au class" into jb-dev-docs
* commit '
ea502b27020872003f1d2be1fb2644b04cc59a67':
docs: animations au class
Robert Ly [Thu, 25 Oct 2012 23:24:03 +0000 (16:24 -0700)]
Merge "docs: animations au class" into jb-dev-docs
Robert Ly [Wed, 3 Oct 2012 21:20:26 +0000 (14:20 -0700)]
docs: animations au class
Change-Id: I776ccdf44014fe38dd55dedfed8730306d2a2cea
Dirk Dougherty [Wed, 24 Oct 2012 17:40:30 +0000 (10:40 -0700)]
am
3d087920: am
76cdbdc8: Doc change: update develop landing page content.
* commit '
3d0879201d4c1c660f0ff3b8fc63410298cd9264':
Doc change: update develop landing page content.
Dirk Dougherty [Wed, 24 Oct 2012 17:38:45 +0000 (10:38 -0700)]
am
76cdbdc8: Doc change: update develop landing page content.
* commit '
76cdbdc848153680d27e8f7abd6281c0f95d793e':
Doc change: update develop landing page content.
Dirk Dougherty [Tue, 23 Oct 2012 04:30:29 +0000 (21:30 -0700)]
Doc change: update develop landing page content.
Change-Id: I1b3639e4097650d9182b8e2bf213f1603ee17e10
&& repo sync -j8 [Thu, 18 Oct 2012 21:55:29 +0000 (14:55 -0700)]
Doc change: GCM category & dry_run params
Bug #
7171849
Change-Id: Ifde95a058fc90b777faf3d43d34a72b048e20126
Dirk Dougherty [Sun, 21 Oct 2012 00:52:41 +0000 (17:52 -0700)]
am
e25c241b: am
6faae9ad: Doc change: remove a few third-party refs. Fix broken image ref.
* commit '
e25c241bddaf1e838b95c924976861733c7042bf':
Doc change: remove a few third-party refs. Fix broken image ref.
Dirk Dougherty [Sun, 21 Oct 2012 00:51:00 +0000 (17:51 -0700)]
am
6faae9ad: Doc change: remove a few third-party refs. Fix broken image ref.
* commit '
6faae9ad08670c30379fed451e73171f7d1b6ac8':
Doc change: remove a few third-party refs. Fix broken image ref.
Dirk Dougherty [Sun, 21 Oct 2012 00:32:05 +0000 (17:32 -0700)]
Doc change: remove a few third-party refs. Fix broken image ref.
Change-Id: Ife1826f9c7d409e131b50e7178eba22f962d4219
Xavier Ducrohet [Fri, 19 Oct 2012 00:48:57 +0000 (17:48 -0700)]
am
135b5ba5: Layoutlib: Read and close XML files as soon as possible. do not merge.
* commit '
135b5ba52431b147d51a81b807784009cd0510dd':
Layoutlib: Read and close XML files as soon as possible. do not merge.
Xavier Ducrohet [Thu, 18 Oct 2012 01:38:49 +0000 (18:38 -0700)]
Layoutlib: Read and close XML files as soon as possible. do not merge.
Because passing an InputStream to KXML does not close the
stream after the file has been parsed, the files are staying
locked on windows until the gc and finalizers are run.
This change preload the XML files and close their stream,
and then pass the content in a stream to the parser.
(cherry picked from commit
c48b0b940d632b9862ff6aa32665e37fe9e50845)
Change-Id: I1b225454c166026c1aab6290c55ac8279e8862d5
Scott Main [Thu, 18 Oct 2012 19:25:19 +0000 (12:25 -0700)]
am
4a6b6948: am
07322102: revise code sample for callback interface
* commit '
4a6b69488f9fd90bbe04a930ffad8999bc93e173':
revise code sample for callback interface
Xavier Ducrohet [Thu, 18 Oct 2012 19:23:28 +0000 (12:23 -0700)]
am
434cd38f: Update layoutlib for jb mr1. do not merge.
* commit '
434cd38f96a4a87220a8218901622f31e567354a':
Update layoutlib for jb mr1. do not merge.
Scott Main [Thu, 18 Oct 2012 19:18:31 +0000 (12:18 -0700)]
am
07322102: revise code sample for callback interface
* commit '
07322102e5f1877bc2860d2c72eeeb41839d6bea':
revise code sample for callback interface
Xavier Ducrohet [Wed, 17 Oct 2012 02:56:03 +0000 (19:56 -0700)]
Update layoutlib for jb mr1. do not merge.
Status bar displayed on all devices.
Update logic for displaying nav bar to whether or not
device has soft button.
Update navigation buttons to new look.
Remove battery and signal from navigation bar.
(cherry picked from commit
891b703f7b1e0e396d16477cc66a286da7161b49)
Change-Id: Id7cc9ad4255d2c4d2e6461a565dfe2cc17e12e75
Scott Main [Wed, 17 Oct 2012 17:42:54 +0000 (10:42 -0700)]
revise code sample for callback interface
Change-Id: I8e27e2579dcc5cb84a71c74769fb89bb639e16ba
Robert Ly [Wed, 17 Oct 2012 18:50:40 +0000 (11:50 -0700)]
docs: google market -> google play
Change-Id: I546a0c07920612a3fa31a2507c934a28c4d9f419
Scott Main [Fri, 12 Oct 2012 21:14:46 +0000 (14:14 -0700)]
am
a7b56a20: am
e249763d: small update to Toast guide, flatten sidenav for notifications/toasts, new screenshots for notifications
* commit '
a7b56a20ec80699371359cdd6f459a7eaec67185':
small update to Toast guide, flatten sidenav for notifications/toasts, new screenshots for notifications
Scott Main [Fri, 12 Oct 2012 21:12:07 +0000 (14:12 -0700)]
am
e249763d: small update to Toast guide, flatten sidenav for notifications/toasts, new screenshots for notifications
* commit '
e249763db18bb445e93f493046946c13185aa09d':
small update to Toast guide, flatten sidenav for notifications/toasts, new screenshots for notifications
Scott Main [Fri, 12 Oct 2012 19:06:10 +0000 (12:06 -0700)]
small update to Toast guide, flatten sidenav for notifications/toasts,
new screenshots for notifications
Change-Id: I0c02e9e6db70a60ca299ff7f0caa7c8276b7ab68
Joe Malin [Fri, 12 Oct 2012 00:40:46 +0000 (17:40 -0700)]
am
5832d1ce: am
01154bda: DOC CHANGE: Notifications Guide
* commit '
5832d1ce7240c056a1e85a49549635b60711a5c6':
DOC CHANGE: Notifications Guide
Joe Malin [Fri, 12 Oct 2012 00:38:46 +0000 (17:38 -0700)]
am
01154bda: DOC CHANGE: Notifications Guide
* commit '
01154bdae9d6f3d1fbed3169ffa194d51045c9cf':
DOC CHANGE: Notifications Guide
Joe Malin [Fri, 24 Aug 2012 16:49:50 +0000 (09:49 -0700)]
DOC CHANGE: Notifications Guide
Change-Id: I7968e933b0fdc5b1de1aa24acbad4f65f183ca42
Joe Fernandez [Thu, 11 Oct 2012 21:38:09 +0000 (14:38 -0700)]
am
dff6f01f: am
45c56ae7: Merge "docs: Release Notes: Android Platform 4.1.2 (16, r3)" into jb-dev-docs
* commit '
dff6f01f32be0005a3dfb57f54d10859d013c4fb':
docs: Release Notes: Android Platform 4.1.2 (16, r3)
Joe Fernandez [Thu, 11 Oct 2012 21:35:35 +0000 (14:35 -0700)]
am
45c56ae7: Merge "docs: Release Notes: Android Platform 4.1.2 (16, r3)" into jb-dev-docs
* commit '
45c56ae70a1989301fa0fac5c72c51b296f5146e':
docs: Release Notes: Android Platform 4.1.2 (16, r3)
Joe Fernandez [Thu, 11 Oct 2012 21:33:37 +0000 (14:33 -0700)]
Merge "docs: Release Notes: Android Platform 4.1.2 (16, r3)" into jb-dev-docs
Katie McCormick [Wed, 10 Oct 2012 23:06:19 +0000 (16:06 -0700)]
am
fa4865f6: resolved conflicts for merge of
0b479e43 to jb-dev
* commit '
fa4865f680cc151ff051b7a82fb0e94145d70377':
Doc changes: misc GCM updates.
Katie McCormick [Wed, 10 Oct 2012 18:09:03 +0000 (11:09 -0700)]
resolved conflicts for merge of
0b479e43 to jb-dev
Change-Id: I04bc45425f11b3562a4219719716c55eaff2228e
&& repo sync -j8 [Wed, 10 Oct 2012 17:34:48 +0000 (10:34 -0700)]
Merge "Doc changes: misc GCM updates." into jb-dev-docs
Geremy Condra [Wed, 10 Oct 2012 04:37:23 +0000 (21:37 -0700)]
am
c2e3be5a: Merge "DO NOT MERGE Control access to inherited methods of jsinterface objects" into jb-dev
* commit '
c2e3be5a8bcd3be2d6cb6fda0cda28bc87d7814d':
DO NOT MERGE Control access to inherited methods of jsinterface objects
Geremy Condra [Wed, 10 Oct 2012 04:32:08 +0000 (21:32 -0700)]
Merge "DO NOT MERGE Control access to inherited methods of jsinterface objects" into jb-dev
Geremy Condra [Wed, 10 Oct 2012 04:34:33 +0000 (21:34 -0700)]
am
a22000d2: Merge "DO NOT MERGE remove defunct javascript interface" into jb-dev
* commit '
a22000d244915df2098619be5fd66bf1c4d019c8':
DO NOT MERGE remove defunct javascript interface
Geremy Condra [Wed, 10 Oct 2012 04:32:00 +0000 (21:32 -0700)]
Merge "DO NOT MERGE remove defunct javascript interface" into jb-dev
Selim Gurun [Tue, 4 Sep 2012 23:45:53 +0000 (16:45 -0700)]
DO NOT MERGE Control access to inherited methods of jsinterface objects
Bug:
7073422
Create the plumbing to use an annotation to allow access to
inherited methods of jsinterface objects. The default webview
behavior has not changed yet. However internally an a flag is
introduced to restrict javascript access to methods that have an annotation.
Clean cherry pick of
94740e6c333a109be7516abbd17dd418f23b4f0c
Provided @JavascriptInterface to methods that are accessible from
js.
Clean cherry pick of
b743a23fc5bce9965c1539c3c8611614424a5aff
Add a glue logic to require use of annotations in injected accessibility
objects.
Change-Id: I4135bd6787b2084177215302cd2c72afed090dc0
Dirk Dougherty [Wed, 10 Oct 2012 00:36:26 +0000 (17:36 -0700)]
am
137b8f4c: am
f761a9a6: Merge "Doc change: edits to TV tablet story." into jb-dev-docs
* commit '
137b8f4c0e8fdc354432231362a0bfbcf11ed96e':
Doc change: edits to TV tablet story.
Dirk Dougherty [Wed, 10 Oct 2012 00:33:52 +0000 (17:33 -0700)]
am
f761a9a6: Merge "Doc change: edits to TV tablet story." into jb-dev-docs
* commit '
f761a9a634a43662525d9c0c537ac5499263fd81':
Doc change: edits to TV tablet story.
Dirk Dougherty [Wed, 10 Oct 2012 00:31:34 +0000 (17:31 -0700)]
Merge "Doc change: edits to TV tablet story." into jb-dev-docs
Dirk Dougherty [Tue, 9 Oct 2012 22:52:13 +0000 (15:52 -0700)]
am
28a40e01: am
aa0d43ba: Merge "Doc change: Link to AVDs docs from tablet quality checklist." into jb-dev-docs
* commit '
28a40e01fec9e00c74e52a88a5f6fca98057af91':
Doc change: Link to AVDs docs from tablet quality checklist.
Dirk Dougherty [Tue, 9 Oct 2012 22:50:12 +0000 (15:50 -0700)]
am
aa0d43ba: Merge "Doc change: Link to AVDs docs from tablet quality checklist." into jb-dev-docs
* commit '
aa0d43ba2581bb97f9ee955ea185b4f2759055c6':
Doc change: Link to AVDs docs from tablet quality checklist.
Dirk Dougherty [Tue, 9 Oct 2012 22:48:34 +0000 (15:48 -0700)]
Merge "Doc change: Link to AVDs docs from tablet quality checklist." into jb-dev-docs