Commit Graph

10899 Commits

Author SHA1 Message Date
Scott Main
d6d8114ba5 am 1cb485c8: am b63a8975: am 37e24aec: am 352b33ba: add redirect for layout-objects.html bug: 7366567
* commit '1cb485c8b61c05b8885e1566952f6fcfabab412d':
  add redirect for layout-objects.html bug: 7366567
2012-10-17 15:46:15 -07:00
Scott Main
1cb485c8b6 am b63a8975: am 37e24aec: am 352b33ba: add redirect for layout-objects.html bug: 7366567
* commit 'b63a8975abad7381491aad0d85b107a9cb58ec56':
  add redirect for layout-objects.html bug: 7366567
2012-10-17 15:44:15 -07:00
Scott Main
b63a8975ab am 37e24aec: am 352b33ba: add redirect for layout-objects.html bug: 7366567
* commit '37e24aecdee0193648a2d62d594aed8cd137bf89':
  add redirect for layout-objects.html bug: 7366567
2012-10-17 15:41:21 -07:00
Scott Main
37e24aecde am 352b33ba: add redirect for layout-objects.html bug: 7366567
* commit '352b33ba8bf0b590d7db8fb694ad0360265627eb':
  add redirect for layout-objects.html bug: 7366567
2012-10-17 15:37:42 -07:00
Scott Main
352b33ba8b add redirect for layout-objects.html
bug: 7366567

Change-Id: Ie660fd1353fc7106da1afa5df2951a3e5d9d8477
2012-10-17 11:25:09 -07:00
The Android Automerger
480774f2eb merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-16 17:30:13 -07:00
Jeff Hamilton
13dc6a2223 Change the name of the location config value.
This reverts commit 329b760e8e.

Bug: 7242814
2012-10-16 16:14:25 -05:00
Scott Main
5e75d40830 am 7e78827e: am b0cab80d: am 487869a8: am 05bca821: am ec54ca15: add redirect from nofification summary page to Notifications doc because this navigation is now flat so each doc is visible in side nav at top
* commit '7e78827e935d0dadd93d53f78835a7b6fe141918':
  add redirect from nofification summary page to Notifications doc because this navigation is now flat so each doc is visible in side nav at top
2012-10-16 11:49:02 -07:00
Scott Main
7e78827e93 am b0cab80d: am 487869a8: am 05bca821: am ec54ca15: add redirect from nofification summary page to Notifications doc because this navigation is now flat so each doc is visible in side nav at top
* commit 'b0cab80d117ff842767d9bb95ff56d0b8d002d9a':
  add redirect from nofification summary page to Notifications doc because this navigation is now flat so each doc is visible in side nav at top
2012-10-16 11:46:14 -07:00
Scott Main
b0cab80d11 am 487869a8: am 05bca821: am ec54ca15: add redirect from nofification summary page to Notifications doc because this navigation is now flat so each doc is visible in side nav at top
* commit '487869a86bae6246b51cee91bc4ceb543d23b317':
  add redirect from nofification summary page to Notifications doc because this navigation is now flat so each doc is visible in side nav at top
2012-10-16 11:43:56 -07:00
Scott Main
487869a86b am 05bca821: am ec54ca15: add redirect from nofification summary page to Notifications doc because this navigation is now flat so each doc is visible in side nav at top
* commit '05bca821e1c401bbd9dacb200aa0e6a2759c3478':
  add redirect from nofification summary page to Notifications doc because this navigation is now flat so each doc is visible in side nav at top
2012-10-16 11:41:19 -07:00
Scott Main
05bca821e1 am ec54ca15: add redirect from nofification summary page to Notifications doc because this navigation is now flat so each doc is visible in side nav at top
* commit 'ec54ca1518080e12ee042e596f2e1947917293ea':
  add redirect from nofification summary page to Notifications doc because this navigation is now flat so each doc is visible in side nav at top
2012-10-16 11:39:04 -07:00
Andrew Hsieh
d52033cafc am 1d35fba9: Merge "ndk: Remove LONG_LONG_MIN/MAX hack from pthread.h"
* commit '1d35fba9bd37d4d6af224bbd25a034a680bca2eb':
  ndk: Remove LONG_LONG_MIN/MAX hack from pthread.h
2012-10-16 10:30:47 -07:00
Andrew Hsieh
1d35fba9bd Merge "ndk: Remove LONG_LONG_MIN/MAX hack from pthread.h" 2012-10-16 10:12:26 -07:00
David 'Digit' Turner
db5a5ada90 ndk: Remove LONG_LONG_MIN/MAX hack from pthread.h
The LONG_LONG_MIN, LONG_LONG_MAX and ULONG_LONG_MAX are
GLibc-specific macros. Move their declarations from
<pthread.h> to <limits.h> where they belong.

Change-Id: I597465b99893706ade82069238f60df73d8e236e
2012-10-16 09:49:10 +02:00
Andrew Hsieh
c7ceaa791d am 9f17b1e1: Merge "Remove obsolete LOCAL_NDK_VERSION"
* commit '9f17b1e1a40076470c9e521b298ba29e771419dc':
  Remove obsolete LOCAL_NDK_VERSION
2012-10-15 20:20:58 -07:00
Andrew Hsieh
9f17b1e1a4 Merge "Remove obsolete LOCAL_NDK_VERSION" 2012-10-15 20:05:15 -07:00
The Android Open Source Project
d32a73105b Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: If89cb33a85e3457bff663b54d6dc16b05f180294
2012-10-15 07:38:06 -07:00
Andrew Hsieh
ed7dac09d8 Remove obsolete LOCAL_NDK_VERSION
Other than it's obsolete, it's outdated to use r4 (rather than the
most recently one)

Change-Id: I0a0dca663056a071a714d49a5d5bb77bd379c18a
2012-10-15 13:06:26 +08:00
The Android Automerger
617f824298 merge in jb-mr1-factory-release history after reset to jb-mr1-dev 2012-10-12 16:34:28 -07:00
Scott Main
ec54ca1518 add redirect from nofification summary page to Notifications doc
because this navigation is now flat so each doc is visible in side nav at top

Change-Id: I64e8788a8d7bb7992c410cec0c494b8157d4d651
2012-10-12 12:15:09 -07:00
The Android Automerger
018dba6896 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-12 11:49:50 -07:00
Laurent Tu
f7e5b78d88 am 72452858: am 91d9d51f: Return accuracy in GPS emulation
* commit '72452858484192b07e550ae42f9068e3767cf68d':
  Return accuracy in GPS emulation
2012-10-12 11:10:10 -07:00
The Android Automerger
41359ffcda merge in jb-mr1-factory-release history after reset to jb-mr1-dev 2012-10-12 10:26:27 -07:00
Laurent Tu
7245285848 am 91d9d51f: Return accuracy in GPS emulation
* commit '91d9d51f5d3371d64b089c63e06409f8e2c92ea0':
  Return accuracy in GPS emulation
2012-10-12 09:49:29 -07:00
Andrew Hsieh
d8e477e5d4 am 9d5538b1: Merge "[ndk] Fixed sample SanAngeles to properly pause/resume"
* commit '9d5538b1b56f0586f57cfb80b2421bf651d526b6':
  [ndk] Fixed sample SanAngeles to properly pause/resume
2012-10-12 09:41:57 -07:00
Andrew Hsieh
9d5538b1b5 Merge "[ndk] Fixed sample SanAngeles to properly pause/resume" 2012-10-12 09:26:28 -07:00
The Android Open Source Project
02a69132d5 Reconcile with jb-mr1-release - do not merge
Change-Id: Ib40f58fc6838a4be9231e221e4ba337b59bd1d3f
2012-10-12 07:30:39 -07:00
Andrew Hsieh
d16812351b [ndk] Fixed sample SanAngeles to properly pause/resume
Previously re-launch of background SanAngeles app shows black or
freeze frame

Two fixes:
1. Not to reinitialize timer each time when DemoRenderer is created
2. Stop advancing internal clock when onPause(), and start when
   onResume()

Change-Id: I6bef9d7c462cd4d504e76099a4d28c8618043f46
2012-10-12 19:28:56 +08:00
Laurent Tu
91d9d51f5d Return accuracy in GPS emulation
Accuracy is now a required field for location. To comply, set an
accuracy in returned fix. The accuracy is constant for now since
computing it from the NMEA sentence seems to be very complicated.

Bug: 6864500

Change-Id: Iff4c36b440b095539c717d35a812ee2ed7c1725f
2012-10-11 20:43:53 -07:00
Dianne Hackborn
05b0dcec94 am 1eb2e84c: am 9da08122: More on issue #7318666: hide developer options from user build
* commit '1eb2e84c0ebd06529d4a91003d35aed3056e106e':
  More on issue #7318666: hide developer options from user build
2012-10-11 17:10:56 -07:00
The Android Automerger
9cf43ae934 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-11 16:26:22 -07:00
Dianne Hackborn
1eb2e84c0e am 9da08122: More on issue #7318666: hide developer options from user build
* commit '9da081228438a35c181c0f3d138698b007532c69':
  More on issue #7318666: hide developer options from user build
2012-10-11 10:48:13 -07:00
Dianne Hackborn
9da0812284 More on issue #7318666: hide developer options from user build
The Dev Tools app now tries to add a link to Development Settings
at the top of its list.

Also add a new "Development Settings" app that directly takes you
to the development settings activity, as a stand-alone app that
could be distributed as a regular third party app.

Change-Id: I8fe2b6a32cf4e37d69f4ce7b8d646a147b492d99
2012-10-10 19:01:09 -07:00
The Android Open Source Project
0cf0f743d3 Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I46fd654e5e5a4088c616ed35b901eb1e8ed4d963
2012-10-10 09:44:04 -07:00
The Android Automerger
2facb7b969 merge in jb-mr1-factory-release history after reset to jb-mr1-dev 2012-10-10 08:43:30 -07:00
Jeff Sharkey
6de7bde49b am 0eb3e46a: am c9ff3bce: Merge "Follow RegisteredServicesCache API changes." into jb-mr1-dev
* commit '0eb3e46a49af423f5d17b81d487224dab214786f':
  Follow RegisteredServicesCache API changes.
2012-10-10 08:33:33 -07:00
Jeff Sharkey
0eb3e46a49 am c9ff3bce: Merge "Follow RegisteredServicesCache API changes." into jb-mr1-dev
* commit 'c9ff3bce8b398252ee2978cca43b5ec88937f1ab':
  Follow RegisteredServicesCache API changes.
2012-10-10 08:30:28 -07:00
The Android Automerger
c4351cf30e merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-10 06:59:14 -07:00
Jeff Sharkey
c9ff3bce8b Merge "Follow RegisteredServicesCache API changes." into jb-mr1-dev 2012-10-09 23:47:12 -07:00
Brian Muramatsu
ab8b25ff8e am 03c58239: am c6fbad00: Merge "Make all monkeys do the same thing" into jb-mr1-dev
* commit '03c582390784406fa227e3804cf679eacf37aa00':
  Make all monkeys do the same thing
2012-10-09 19:17:05 -07:00
Brian Muramatsu
03c5823907 am c6fbad00: Merge "Make all monkeys do the same thing" into jb-mr1-dev
* commit 'c6fbad006a4c9385670ec7c26e71a802bf1f608b':
  Make all monkeys do the same thing
2012-10-09 19:14:50 -07:00
Brian Muramatsu
c6fbad006a Merge "Make all monkeys do the same thing" into jb-mr1-dev 2012-10-09 19:12:39 -07:00
Raphael Moll
b41080c00b am 806cac72: am c1a8e1ec: resolved conflicts for merge of d6308897 to jb-mr1-dev
* commit '806cac729996161f216460f67081857737d585ea':
  SDK JB MR0: doc is 16 rev 3
2012-10-09 14:02:58 -07:00
Raphael Moll
806cac7299 am c1a8e1ec: resolved conflicts for merge of d6308897 to jb-mr1-dev
* commit 'c1a8e1ec87d74dbb167ff575e8507183045584cd':
  SDK JB MR0: doc is 16 rev 3
2012-10-09 14:01:15 -07:00
Kenny Root
3cbf850ab6 Make all monkeys do the same thing
Monkeys were using SecureRandom, but what it really wanted was an LCRNG
that allowed it to reproduce the same output with seeds. This change
allows the monkeys to shine.

Bug: 6950454
Change-Id: Iabf0fc5e7d50b786fa32b946e85de797220ff569
2012-10-09 13:57:13 -07:00
Raphael Moll
c1a8e1ec87 resolved conflicts for merge of d6308897 to jb-mr1-dev
Change-Id: Iffbbb75a504e5f8b0caa5690835e17a4b6ab63bb
2012-10-09 13:44:41 -07:00
Jeff Sharkey
1d7f24de42 Follow RegisteredServicesCache API changes.
Bug: 7276595
Change-Id: I6064684380b7bbbec87c2345f782931d731ad5cb
2012-10-09 13:05:04 -07:00
Raphael Moll
d6308897c0 am 37191b53: SDK JB MR0: doc is 16 rev 3
* commit '37191b53de90cde879c167d1db74d5a73740f4c0':
  SDK JB MR0: doc is 16 rev 3
2012-10-09 12:53:20 -07:00
Raphael Moll
37191b53de SDK JB MR0: doc is 16 rev 3
Change-Id: I7e28e4dc1981c7d9502a45f3509245075da98a00
2012-10-09 12:48:10 -07:00