OSDN Git Service

android-x86/frameworks-base.git
9 years agoam d9b48e94: am 4561be01: Merge "add TV quality page to Develop landing carousel...
smain@google.com [Fri, 17 Oct 2014 18:52:21 +0000 (18:52 +0000)]
am d9b48e94: am 4561be01: Merge "add TV quality page to Develop landing carousel" into lmp-dev

* commit 'd9b48e94a139e11924527f16f66ff0491a4502d8':
  add TV quality page to Develop landing carousel

9 years agoam fafb6c70: am dd886683: docs: Notifications changes for L
Scott Rowe [Fri, 17 Oct 2014 18:52:17 +0000 (18:52 +0000)]
am fafb6c70: am dd886683: docs: Notifications changes for L

* commit 'fafb6c708096d809ce6b8b57ac8c2293698cdf6a':
  docs: Notifications changes for L

9 years agoam f8d6891c: am 4deed3ec: Merge "docs: Android TV App Quality Requirements v2" into...
Joe Fernandez [Fri, 17 Oct 2014 18:52:13 +0000 (18:52 +0000)]
am f8d6891c: am 4deed3ec: Merge "docs: Android TV App Quality Requirements v2" into lmp-dev

* commit 'f8d6891c69d9ef716f1e7f4df206522cf6356e00':
  docs: Android TV App Quality Requirements v2

9 years agoam 583cf69c: am 6bd081ca: docs: Displaying a Now Playing Card
Scott Rowe [Fri, 17 Oct 2014 18:52:08 +0000 (18:52 +0000)]
am 583cf69c: am 6bd081ca: docs: Displaying a Now Playing Card

* commit '583cf69c00326a1d67d5ca8c8a0d9597ec50aa93':
  docs: Displaying a Now Playing Card

9 years agoam 770f57e0: am 321e7645: Merge "docs: Recents screen for tasks and activities" into...
Joe Fernandez [Fri, 17 Oct 2014 18:52:04 +0000 (18:52 +0000)]
am 770f57e0: am 321e7645: Merge "docs: Recents screen for tasks and activities" into lmp-dev

* commit '770f57e06837c8d2b7e42776b569b568d2360057':
  docs: Recents screen for tasks and activities

9 years agoam 4a0f162d: am c6400892: Merge "add Lollipop highlights and revision to 5.0 API...
smain@google.com [Fri, 17 Oct 2014 18:52:00 +0000 (18:52 +0000)]
am 4a0f162d: am c6400892: Merge "add Lollipop highlights and revision to 5.0 API overview intro" into lmp-dev

* commit '4a0f162df7ca0079b25b61cd4734340cbe5de7f4':
  add Lollipop highlights and revision to 5.0 API overview intro

9 years agoam 491fa057: am d664dc93: Merge "Android 5.0 changes to IME switching" into lmp-dev
Joe Fernandez [Fri, 17 Oct 2014 18:51:56 +0000 (18:51 +0000)]
am 491fa057: am d664dc93: Merge "Android 5.0 changes to IME switching" into lmp-dev

* commit '491fa0570def75b1e056dc1c0954f07d2b524a7f':
  Android 5.0 changes to IME switching

9 years agoam be097523: am c49acf02: Merge "docs: Update Android TV home for L announcement...
Joe Fernandez [Fri, 17 Oct 2014 18:51:52 +0000 (18:51 +0000)]
am be097523: am c49acf02: Merge "docs:  Update Android TV home for L announcement" into lmp-dev

* commit 'be097523180eab10ec3dec73ec4cc2b7056fed6e':
  docs:  Update Android TV home for L announcement

9 years agoam 4e5ebb99: am c2a556ff: Merge "Notificiations Design for Android L Release" into...
David Friedman [Fri, 17 Oct 2014 18:51:47 +0000 (18:51 +0000)]
am 4e5ebb99: am c2a556ff: Merge "Notificiations Design for Android L Release" into lmp-dev

* commit '4e5ebb994a7d96c86f598c499956f04a1256e6a7':
  Notificiations Design for Android L Release

9 years agoam 981c97ec: am 597d3861: Merge "NDK-r10c release notes (change log) for publication...
David Friedman [Fri, 17 Oct 2014 18:51:43 +0000 (18:51 +0000)]
am 981c97ec: am 597d3861: Merge "NDK-r10c release notes (change log) for publication to NDK page on DAC." into lmp-dev

* commit '981c97ecc0347b2647682a54556d06f2e52ad16a':
  NDK-r10c release notes (change log) for publication to NDK page on DAC.

9 years agoam 238b4795: am 271078f5: update L preview landing page for 5.0 SDK launch includes...
smain@google.com [Fri, 17 Oct 2014 18:51:39 +0000 (18:51 +0000)]
am 238b4795: am 271078f5: update L preview landing page for 5.0 SDK launch includes new system images also update the DAC homepage announcement

* commit '238b4795468bf8ab93ab7c50b9855e8e84d2f49d':
  update L preview landing page for 5.0 SDK launch includes new system images also update the DAC homepage announcement

9 years agoam f1425001: am 2e57c2c9: Merge "docs: Migrating material design info from the Previe...
Ricardo Cervera [Fri, 17 Oct 2014 18:51:23 +0000 (18:51 +0000)]
am f1425001: am 2e57c2c9: Merge "docs: Migrating material design info from the Preview site" into lmp-dev

* commit 'f14250014b11fd61dec427dd0813fbb43d2fe3ff':
  docs: Migrating material design info from the Preview site

9 years agoam 0fae717e: am 67b5c8eb: Merge "docs: Updates to Android 5.0 API Overview." into...
Quddus Chong [Fri, 17 Oct 2014 18:51:18 +0000 (18:51 +0000)]
am 0fae717e: am 67b5c8eb: Merge "docs: Updates to Android 5.0 API Overview." into lmp-dev

* commit '0fae717e207d18a36148c7ddb4a203d4f7447bf7':
  docs: Updates to Android 5.0 API Overview.

9 years agoFix build
Alan Viverette [Fri, 17 Oct 2014 18:36:38 +0000 (11:36 -0700)]
Fix build

Change-Id: Idd7ae84c0d128bd40f0e7a83882e4ed4181e8a4d

9 years agoMerge "Check type resolution on declared methods and fields in ViewDebug" into lmp...
Alan Viverette [Fri, 17 Oct 2014 17:18:34 +0000 (17:18 +0000)]
Merge "Check type resolution on declared methods and fields in ViewDebug" into lmp-mr1-dev

9 years agoMerge "Add API level for MR1." into lmp-mr1-dev
Dianne Hackborn [Fri, 17 Oct 2014 17:12:00 +0000 (17:12 +0000)]
Merge "Add API level for MR1." into lmp-mr1-dev

9 years agoMerge "PowerUI: Uncategorize battery notifications as _SYSTEM." into lmp-mr1-dev
John Spurlock [Fri, 17 Oct 2014 16:39:19 +0000 (16:39 +0000)]
Merge "PowerUI: Uncategorize battery notifications as _SYSTEM." into lmp-mr1-dev

9 years agoPowerUI: Uncategorize battery notifications as _SYSTEM.
John Spurlock [Fri, 17 Oct 2014 16:16:57 +0000 (12:16 -0400)]
PowerUI: Uncategorize battery notifications as _SYSTEM.

So they don't interrupt in priority mode.

Bug: 17691121
Change-Id: I51757c0275ec461a786d1e254b0e71f7b27b5029

9 years agoQS: 7 day timeout for color-inversion tile.
John Spurlock [Fri, 17 Oct 2014 16:06:38 +0000 (12:06 -0400)]
QS: 7 day timeout for color-inversion tile.

Bug: 17631628
Change-Id: I4f8a6ce3ea1f79d696686760732c3e8216bfb6c4

9 years agoam 4561be01: Merge "add TV quality page to Develop landing carousel" into lmp-dev
smain@google.com [Fri, 17 Oct 2014 07:29:26 +0000 (07:29 +0000)]
am 4561be01: Merge "add TV quality page to Develop landing carousel" into lmp-dev

* commit '4561be01934cdc462570b56afb4c602cbf3295c4':
  add TV quality page to Develop landing carousel

9 years agoam dd886683: docs: Notifications changes for L
Scott Rowe [Fri, 17 Oct 2014 07:29:22 +0000 (07:29 +0000)]
am dd886683: docs: Notifications changes for L

* commit 'dd88668392839509c812a544b1132185b3825b69':
  docs: Notifications changes for L

9 years agoam 4deed3ec: Merge "docs: Android TV App Quality Requirements v2" into lmp-dev
Joe Fernandez [Fri, 17 Oct 2014 07:29:19 +0000 (07:29 +0000)]
am 4deed3ec: Merge "docs: Android TV App Quality Requirements v2" into lmp-dev

* commit '4deed3ecc3b47d520ca6084f2fa6ad7a9dc8c018':
  docs: Android TV App Quality Requirements v2

9 years agoam 6bd081ca: docs: Displaying a Now Playing Card
Scott Rowe [Fri, 17 Oct 2014 07:29:15 +0000 (07:29 +0000)]
am 6bd081ca: docs: Displaying a Now Playing Card

* commit '6bd081ca8a555fd71fbe856374b8efe68ede6144':
  docs: Displaying a Now Playing Card

9 years agoam 321e7645: Merge "docs: Recents screen for tasks and activities" into lmp-dev
Joe Fernandez [Fri, 17 Oct 2014 07:29:12 +0000 (07:29 +0000)]
am 321e7645: Merge "docs: Recents screen for tasks and activities" into lmp-dev

* commit '321e7645c305dbc4f7444d364c879bad8946da2b':
  docs: Recents screen for tasks and activities

9 years agoam c6400892: Merge "add Lollipop highlights and revision to 5.0 API overview intro...
smain@google.com [Fri, 17 Oct 2014 07:29:08 +0000 (07:29 +0000)]
am c6400892: Merge "add Lollipop highlights and revision to 5.0 API overview intro" into lmp-dev

* commit 'c6400892b56ee217ed01a41abb769fb1aebc9830':
  add Lollipop highlights and revision to 5.0 API overview intro

9 years agoam d664dc93: Merge "Android 5.0 changes to IME switching" into lmp-dev
Joe Fernandez [Fri, 17 Oct 2014 07:29:04 +0000 (07:29 +0000)]
am d664dc93: Merge "Android 5.0 changes to IME switching" into lmp-dev

* commit 'd664dc93f47e32df865384718055b200585e0e88':
  Android 5.0 changes to IME switching

9 years agoam c49acf02: Merge "docs: Update Android TV home for L announcement" into lmp-dev
Joe Fernandez [Fri, 17 Oct 2014 07:29:00 +0000 (07:29 +0000)]
am c49acf02: Merge "docs:  Update Android TV home for L announcement" into lmp-dev

* commit 'c49acf029e65928d07815631a0160fe179458add':
  docs:  Update Android TV home for L announcement

9 years agoam c2a556ff: Merge "Notificiations Design for Android L Release" into lmp-dev
David Friedman [Fri, 17 Oct 2014 07:28:56 +0000 (07:28 +0000)]
am c2a556ff: Merge "Notificiations Design for Android L Release" into lmp-dev

* commit 'c2a556ffe8a5949a0e3d7baf8122ea38b4ae1d30':
  Notificiations Design for Android L Release

9 years agoam 597d3861: Merge "NDK-r10c release notes (change log) for publication to NDK page...
David Friedman [Fri, 17 Oct 2014 07:28:53 +0000 (07:28 +0000)]
am 597d3861: Merge "NDK-r10c release notes (change log) for publication to NDK page on DAC." into lmp-dev

* commit '597d3861298d8c3e2bc50c92ecffb4003cd265f7':
  NDK-r10c release notes (change log) for publication to NDK page on DAC.

9 years agoam 271078f5: update L preview landing page for 5.0 SDK launch includes new system...
smain@google.com [Fri, 17 Oct 2014 07:28:49 +0000 (07:28 +0000)]
am 271078f5: update L preview landing page for 5.0 SDK launch includes new system images also update the DAC homepage announcement

* commit '271078f50dc730e0fda8e80c66b81ac2442f64f0':
  update L preview landing page for 5.0 SDK launch includes new system images also update the DAC homepage announcement

9 years agoam 2e57c2c9: Merge "docs: Migrating material design info from the Preview site" into...
Ricardo Cervera [Fri, 17 Oct 2014 07:28:45 +0000 (07:28 +0000)]
am 2e57c2c9: Merge "docs: Migrating material design info from the Preview site" into lmp-dev

* commit '2e57c2c956588b3f08111c323e811d4cbe46dabd':
  docs: Migrating material design info from the Preview site

9 years agoam 67b5c8eb: Merge "docs: Updates to Android 5.0 API Overview." into lmp-dev
Quddus Chong [Fri, 17 Oct 2014 07:28:41 +0000 (07:28 +0000)]
am 67b5c8eb: Merge "docs: Updates to Android 5.0 API Overview." into lmp-dev

* commit '67b5c8ebc4a9895e065a9314cb9afbf8e3e60197':
  docs: Updates to Android 5.0 API Overview.

9 years agoMerge "add TV quality page to Develop landing carousel" into lmp-dev
smain@google.com [Fri, 17 Oct 2014 06:51:42 +0000 (06:51 +0000)]
Merge "add TV quality page to Develop landing carousel" into lmp-dev

9 years agodocs: Notifications changes for L
Scott Rowe [Mon, 6 Oct 2014 18:49:54 +0000 (11:49 -0700)]
docs: Notifications changes for L

Change-Id: I53c744734358401adefbcffd5ce5a3676d6d955a

9 years agoMerge "docs: Android TV App Quality Requirements v2" into lmp-dev
Joe Fernandez [Fri, 17 Oct 2014 06:38:36 +0000 (06:38 +0000)]
Merge "docs: Android TV App Quality Requirements v2" into lmp-dev

9 years agodocs: Android TV App Quality Requirements v2
Joe Fernandez [Sat, 11 Oct 2014 04:36:46 +0000 (21:36 -0700)]
docs: Android TV App Quality Requirements v2

Change-Id: I54c53d90faf1605945bb8397278b9057a9c687f4

9 years agodocs: Displaying a Now Playing Card
Scott Rowe [Wed, 15 Oct 2014 21:27:25 +0000 (14:27 -0700)]
docs: Displaying a Now Playing Card

Change-Id: I68cd305618caff24cf2de564d7b085c663702d0c

9 years agoadd TV quality page to Develop landing carousel
smain@google.com [Fri, 17 Oct 2014 06:17:52 +0000 (23:17 -0700)]
add TV quality page to Develop landing carousel

Change-Id: I736654e248645bfda7f94156b8c0f520a8be4bac

9 years agoMerge "docs: Recents screen for tasks and activities" into lmp-dev
Joe Fernandez [Fri, 17 Oct 2014 05:40:42 +0000 (05:40 +0000)]
Merge "docs: Recents screen for tasks and activities" into lmp-dev

9 years agoMerge "add Lollipop highlights and revision to 5.0 API overview intro" into lmp-dev
smain@google.com [Fri, 17 Oct 2014 05:17:01 +0000 (05:17 +0000)]
Merge "add Lollipop highlights and revision to 5.0 API overview intro" into lmp-dev

9 years agodocs: Recents screen for tasks and activities
Scott Rowe [Mon, 15 Sep 2014 21:08:44 +0000 (14:08 -0700)]
docs: Recents screen for tasks and activities

Change-Id: I94774e60e6a7453a047ad394c3bbfff0cc4dfc7d

9 years agoadd Lollipop highlights and revision to 5.0 API overview intro
smain@google.com [Fri, 17 Oct 2014 05:15:18 +0000 (22:15 -0700)]
add Lollipop highlights and revision to 5.0 API overview intro

Change-Id: Ic50db6ea2ea9893088f271ce2427ccda69fc6b75

9 years agoMerge "Android 5.0 changes to IME switching" into lmp-dev
Joe Fernandez [Fri, 17 Oct 2014 05:01:02 +0000 (05:01 +0000)]
Merge "Android 5.0 changes to IME switching" into lmp-dev

9 years agoMerge "docs: Update Android TV home for L announcement" into lmp-dev
Joe Fernandez [Fri, 17 Oct 2014 04:58:02 +0000 (04:58 +0000)]
Merge "docs:  Update Android TV home for L announcement" into lmp-dev

9 years agoAndroid 5.0 changes to IME switching
David Friedman [Wed, 8 Oct 2014 17:38:31 +0000 (10:38 -0700)]
Android 5.0 changes to IME switching

Change-Id: I158736ee36706889a5277f02a652162194289514

9 years agoMerge "Notificiations Design for Android L Release" into lmp-dev
David Friedman [Fri, 17 Oct 2014 04:48:31 +0000 (04:48 +0000)]
Merge "Notificiations Design for Android L Release" into lmp-dev

9 years agoNotificiations Design for Android L Release
David Friedman [Thu, 2 Oct 2014 22:23:45 +0000 (15:23 -0700)]
Notificiations Design for Android L Release

Change-Id: I32723dafa2d3bd455da9c6e03c09c668b2bd6446

9 years agodocs: Update Android TV home for L announcement
Joe Fernandez [Fri, 10 Oct 2014 05:18:03 +0000 (22:18 -0700)]
docs:  Update Android TV home for L announcement

Change-Id: Ie98da5efa59dd3c797dda38bb465b7cc66b4d2e7

9 years agoMerge "NDK-r10c release notes (change log) for publication to NDK page on DAC." into...
David Friedman [Fri, 17 Oct 2014 04:30:27 +0000 (04:30 +0000)]
Merge "NDK-r10c release notes (change log) for publication to NDK page on DAC." into lmp-dev

9 years agoNDK-r10c release notes (change log) for publication to NDK page on DAC.
David Friedman [Tue, 14 Oct 2014 04:45:44 +0000 (21:45 -0700)]
NDK-r10c release notes (change log) for publication to NDK page on DAC.

Change-Id: I0f8bc87b741ec1ef978c3fc22954d43519172299

9 years agoupdate L preview landing page for 5.0 SDK launch
smain@google.com [Fri, 10 Oct 2014 00:00:20 +0000 (17:00 -0700)]
update L preview landing page for 5.0 SDK launch
includes new system images
also update the DAC homepage announcement

Change-Id: I6e249e4ec5ef4b4329b145b334b31cfe11dd136c

9 years agoAdd API level for MR1.
Dianne Hackborn [Fri, 17 Oct 2014 01:14:12 +0000 (18:14 -0700)]
Add API level for MR1.

Change-Id: I3f2fd6b47f762f9b81afa4c9ae1e19997484b59e

9 years agoMerge "docs: Migrating material design info from the Preview site" into lmp-dev
Ricardo Cervera [Fri, 17 Oct 2014 01:06:05 +0000 (01:06 +0000)]
Merge "docs: Migrating material design info from the Preview site" into lmp-dev

9 years agodocs: Migrating material design info from the Preview site
Ricardo Cervera [Thu, 9 Oct 2014 00:00:30 +0000 (17:00 -0700)]
docs: Migrating material design info from the Preview site

Change-Id: I3a2f71e41cc1371b8cce2d8860b116cf0f8b8ed2

9 years agoMerge "docs: Updates to Android 5.0 API Overview." into lmp-dev
Quddus Chong [Fri, 17 Oct 2014 00:39:30 +0000 (00:39 +0000)]
Merge "docs: Updates to Android 5.0 API Overview." into lmp-dev

9 years agoam a6a1c52f: Merge "Use Telecom API for checking if a number is voicemail (1/2)"...
Nancy Chen [Fri, 17 Oct 2014 00:05:36 +0000 (00:05 +0000)]
am a6a1c52f: Merge "Use Telecom API for checking if a number is voicemail (1/2)" into lmp-sprout-dev

* commit 'a6a1c52f58f24194de2665bb922577a9d7f6dccf':
  Use Telecom API for checking if a number is voicemail (1/2)

9 years agoam 61737d81: am 040d89bb: Merge "Eliminate race condition around backup completion...
Christopher Tate [Fri, 17 Oct 2014 00:05:22 +0000 (00:05 +0000)]
am 61737d81: am 040d89bb: Merge "Eliminate race condition around backup completion + resumption" into lmp-dev

* commit '61737d81a2e0a2cc327210bf771239655f62c3d9':
  Eliminate race condition around backup completion + resumption

9 years agoam c913c2de: Merge "Revert "Add API method to extract subscription ID from phone...
Nancy Chen [Fri, 17 Oct 2014 00:05:14 +0000 (00:05 +0000)]
am c913c2de: Merge "Revert "Add API method to extract subscription ID from phone account (1/3)"" into lmp-sprout-dev

* commit 'c913c2dec18519ae5b989f65b207c7b3fec2d0ef':
  Revert "Add API method to extract subscription ID from phone account (1/3)"

9 years agoam 8150734f: am 6b53fb62: Merge "docs: Updating support library pages for v.21."...
Andrew Solovay [Fri, 17 Oct 2014 00:05:10 +0000 (00:05 +0000)]
am 8150734f: am 6b53fb62: Merge "docs: Updating support library pages for v.21." into lmp-dev

* commit '8150734faa7feb8547f369db949c1149663ae2ee':
  docs: Updating support library pages for v.21.

9 years agoam 32b459e5: am 4461e926: Merge "docs: Restored the preview license." into lmp-dev
Andrew Solovay [Fri, 17 Oct 2014 00:05:06 +0000 (00:05 +0000)]
am 32b459e5: am 4461e926: Merge "docs: Restored the preview license." into lmp-dev

* commit '32b459e5c56cd1ccb0c9bb15336f796cb75e75f0':
  docs: Restored the preview license.

9 years agoMerge "Update AM/PM selectors for clock face TimePicker" into lmp-mr1-dev
Alan Viverette [Thu, 16 Oct 2014 23:48:35 +0000 (23:48 +0000)]
Merge "Update AM/PM selectors for clock face TimePicker" into lmp-mr1-dev

9 years agoMerge "telephony re-registry error" into lmp-mr1-dev
xinhe [Thu, 16 Oct 2014 22:37:42 +0000 (22:37 +0000)]
Merge "telephony re-registry error" into lmp-mr1-dev

9 years agoMerge "Use Telecom API for checking if a number is voicemail (1/2)" into lmp-sprout-dev
Nancy Chen [Thu, 16 Oct 2014 22:00:28 +0000 (22:00 +0000)]
Merge "Use Telecom API for checking if a number is voicemail (1/2)" into lmp-sprout-dev

9 years agotelephony re-registry error
xinhe [Thu, 16 Oct 2014 18:49:45 +0000 (11:49 -0700)]
telephony re-registry error

telephony re-registry do not update the callback and other parameter

Bug:17920733

Change-Id: I288e8b9a6747fc3c5c4794553435b29b49d379f0

9 years agoUse Telecom API for checking if a number is voicemail (1/2)
Nancy Chen [Wed, 15 Oct 2014 22:48:21 +0000 (15:48 -0700)]
Use Telecom API for checking if a number is voicemail (1/2)

Since we don't want to communicate directly with Telephony in dialer, call
PhoneNumberUtils.isVoiceMailNumber (a Telephony method) through the
Telecom API. Add a method in TelecomManager to do this.

Bug: 17925501

Change-Id: Iecea82a0e5f0b106eaf105e9026d606110acf122

9 years agoam 040d89bb: Merge "Eliminate race condition around backup completion + resumption...
Christopher Tate [Thu, 16 Oct 2014 21:30:39 +0000 (21:30 +0000)]
am 040d89bb: Merge "Eliminate race condition around backup completion + resumption" into lmp-dev

* commit '040d89bb0a4563d93073b7a27b3f201ce11dcf58':
  Eliminate race condition around backup completion + resumption

9 years agoMerge "Eliminate race condition around backup completion + resumption" into lmp-dev
Christopher Tate [Thu, 16 Oct 2014 21:26:25 +0000 (21:26 +0000)]
Merge "Eliminate race condition around backup completion + resumption" into lmp-dev

9 years agoMerge "Revert "Add API method to extract subscription ID from phone account (1/3...
Nancy Chen [Thu, 16 Oct 2014 21:16:59 +0000 (21:16 +0000)]
Merge "Revert "Add API method to extract subscription ID from phone account (1/3)"" into lmp-sprout-dev

9 years agoam 6b53fb62: Merge "docs: Updating support library pages for v.21." into lmp-dev
Andrew Solovay [Thu, 16 Oct 2014 21:14:56 +0000 (21:14 +0000)]
am 6b53fb62: Merge "docs: Updating support library pages for v.21." into lmp-dev

* commit '6b53fb6227b884db2761fa146ed2f4f28100962d':
  docs: Updating support library pages for v.21.

9 years agoMerge "docs: Updating support library pages for v.21." into lmp-dev
Andrew Solovay [Thu, 16 Oct 2014 21:10:19 +0000 (21:10 +0000)]
Merge "docs: Updating support library pages for v.21." into lmp-dev

9 years agoam 4461e926: Merge "docs: Restored the preview license." into lmp-dev
Andrew Solovay [Thu, 16 Oct 2014 21:09:57 +0000 (21:09 +0000)]
am 4461e926: Merge "docs: Restored the preview license." into lmp-dev

* commit '4461e9268ba010f9cd6e8881a57b7af7b031ea31':
  docs: Restored the preview license.

9 years agoRevert "Add API method to extract subscription ID from phone account (1/3)"
Nancy Chen [Thu, 16 Oct 2014 21:08:39 +0000 (21:08 +0000)]
Revert "Add API method to extract subscription ID from phone account (1/3)"

This reverts commit b0cad32c3cadd0387f6dcd82aade629e6f2f6bee.

Change-Id: I54b6373ba0fc7d1ecc64c6ceedc7b371c7017cd8

9 years agoam 76ed803f: Merge "Add system property config.disable_networktime to configure Netwo...
Chenjie Luo [Thu, 16 Oct 2014 21:05:51 +0000 (21:05 +0000)]
am 76ed803f: Merge "Add system property config.disable_networktime to configure NetworkTimeUpdateService" into lmp-sprout-dev

* commit '76ed803fbd3d7be015cc25f521b73a9436c14fdb':
  Add system property config.disable_networktime to configure NetworkTimeUpdateService

9 years agoMerge "docs: Restored the preview license." into lmp-dev
Andrew Solovay [Thu, 16 Oct 2014 21:01:06 +0000 (21:01 +0000)]
Merge "docs: Restored the preview license." into lmp-dev

9 years agoMerge "Add system property config.disable_networktime to configure NetworkTimeUpdateS...
Chenjie Luo [Thu, 16 Oct 2014 20:57:55 +0000 (20:57 +0000)]
Merge "Add system property config.disable_networktime to configure NetworkTimeUpdateService" into lmp-sprout-dev

9 years agodocs: Restored the preview license.
Andrew Solovay [Tue, 14 Oct 2014 19:23:31 +0000 (12:23 -0700)]
docs: Restored the preview license.

Added the preview license back, with changes as previously negotiated
with legal.

See first comment for staging directory link.

Change-Id: Ibc23d4d89b4380546d61ed052ba15dc81b8b1336

9 years agoEliminate race condition around backup completion + resumption
Christopher Tate [Thu, 16 Oct 2014 20:44:00 +0000 (13:44 -0700)]
Eliminate race condition around backup completion + resumption

Ensure that the callback always sees the current-operation state in sync
with the various other bits of internal backup-operation state.  Previously
only the current-operation state was managed inside the critical section;
this resulted in a slim race window where a callback could see an ongoing
operation as still valid, but after the internal state on which that
operation depended had already been cleared.

Bug 17931760

Change-Id: Ia032668e7a9d22f1029c57fc98db9e86484d5719

9 years agoam 68c537f1: am 60e74b49: Merge ":docs Platform Tools Rel Note Nexus 6/9 dpi updates...
Rich Slogar [Thu, 16 Oct 2014 20:49:53 +0000 (20:49 +0000)]
am 68c537f1: am 60e74b49: Merge ":docs Platform Tools Rel Note Nexus 6/9 dpi updates" into lmp-dev

* commit '68c537f1981970f0ccac0fe46d5c522d5e05a82c':
  :docs Platform Tools Rel Note Nexus 6/9 dpi updates

9 years agoam 60e74b49: Merge ":docs Platform Tools Rel Note Nexus 6/9 dpi updates" into lmp-dev
Rich Slogar [Thu, 16 Oct 2014 20:45:31 +0000 (20:45 +0000)]
am 60e74b49: Merge ":docs Platform Tools Rel Note Nexus 6/9 dpi updates" into lmp-dev

* commit '60e74b4924dee6d033ca61854cac42768006ced5':
  :docs Platform Tools Rel Note Nexus 6/9 dpi updates

9 years agoMerge ":docs Platform Tools Rel Note Nexus 6/9 dpi updates" into lmp-dev
Rich Slogar [Thu, 16 Oct 2014 20:41:17 +0000 (20:41 +0000)]
Merge ":docs Platform Tools Rel Note Nexus 6/9 dpi updates" into lmp-dev

9 years agoAdd system property config.disable_networktime to configure NetworkTimeUpdateService
Chenjie Luo [Thu, 16 Oct 2014 20:31:39 +0000 (13:31 -0700)]
Add system property config.disable_networktime to configure NetworkTimeUpdateService

Bug: 17934875
Change-Id: Ie5acf7266a5766f407db8f23d2c3d26920fa4020

9 years agoam fe09db1e: Merge "Revert "Add system property config.disable_timeupdate to configur...
Chenjie Luo [Thu, 16 Oct 2014 20:28:02 +0000 (20:28 +0000)]
am fe09db1e: Merge "Revert "Add system property config.disable_timeupdate to configure NetworkTimeUpdateService"" into lmp-sprout-dev

* commit 'fe09db1e0d5af46e7b643c37ba52f62500b7f043':
  Revert "Add system property config.disable_timeupdate to configure NetworkTimeUpdateService"

9 years agoMerge "Revert "Add system property config.disable_timeupdate to configure NetworkTime...
Chenjie Luo [Thu, 16 Oct 2014 20:23:09 +0000 (20:23 +0000)]
Merge "Revert "Add system property config.disable_timeupdate to configure NetworkTimeUpdateService"" into lmp-sprout-dev

9 years agoRevert "Add system property config.disable_timeupdate to configure NetworkTimeUpdateS...
Chenjie Luo [Thu, 16 Oct 2014 20:22:24 +0000 (20:22 +0000)]
Revert "Add system property config.disable_timeupdate to configure NetworkTimeUpdateService"

This reverts commit c597c55ffeb9debcf2dba8a77a80caa9016ea4d1.

Change-Id: Idc83e582c10dda2c6245ec19921785f361a07a68

9 years agoam 515f14d4: am b22552c3: Merge "Send accessibility events with no window." into...
Svet Ganov [Thu, 16 Oct 2014 19:47:27 +0000 (19:47 +0000)]
am 515f14d4: am b22552c3: Merge "Send accessibility events with no window." into lmp-dev

* commit '515f14d4659626ebf8381a5cc2d6a44063d30b42':
  Send accessibility events with no window.

9 years agoam b22552c3: Merge "Send accessibility events with no window." into lmp-dev
Svet Ganov [Thu, 16 Oct 2014 19:40:15 +0000 (19:40 +0000)]
am b22552c3: Merge "Send accessibility events with no window." into lmp-dev

* commit 'b22552c35bc939619c2e7c967e4eae618d8b93cc':
  Send accessibility events with no window.

9 years agoMerge "Send accessibility events with no window." into lmp-dev
Svet Ganov [Thu, 16 Oct 2014 19:35:40 +0000 (19:35 +0000)]
Merge "Send accessibility events with no window." into lmp-dev

9 years ago:docs Platform Tools Rel Note Nexus 6/9 dpi updates
Rich Slogar [Thu, 16 Oct 2014 19:07:35 +0000 (12:07 -0700)]
:docs Platform Tools Rel Note Nexus 6/9 dpi updates

Change-Id: I34d71a4c42fababbce1ad13dee4fa8f722798e7b

9 years agoam 8fac6682: Merge "Add system property config.disable_timeupdate to configure Networ...
Chenjie Luo [Thu, 16 Oct 2014 19:01:30 +0000 (19:01 +0000)]
am 8fac6682: Merge "Add system property config.disable_timeupdate to configure NetworkTimeUpdateService" into lmp-sprout-dev

* commit '8fac66821cc12104999bb87c900abff659160a44':
  Add system property config.disable_timeupdate to configure NetworkTimeUpdateService

9 years agoam c9f6bb8e: am 447369f2: am a1e3063e: am ab64919c: Merge "docs: update reference...
Scott Rowe [Thu, 16 Oct 2014 19:01:26 +0000 (19:01 +0000)]
am c9f6bb8e: am 447369f2: am a1e3063e: am ab64919c: Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs

* commit 'c9f6bb8e3675461268e9543369ff39d8dd465da5':
  docs: update reference to FragmentRetainInstance

9 years agoam 518a54ae: am 7e19b402: am 2f9ea27c: am 58c64870: Merge "Typo fixed in sample code...
Joe Fernandez [Thu, 16 Oct 2014 19:01:22 +0000 (19:01 +0000)]
am 518a54ae: am 7e19b402: am 2f9ea27c: am 58c64870: Merge "Typo fixed in sample code" into klp-modular-docs

* commit '518a54aed60878329e5e5492f10820108a056d6a':
  Typo fixed in sample code

9 years agoam b0683f0c: am d12e6de6: Merge "OpenGL 3.1 and AEP documentation for L-release....
David Friedman [Thu, 16 Oct 2014 19:00:16 +0000 (19:00 +0000)]
am b0683f0c: am d12e6de6: Merge "OpenGL 3.1 and AEP documentation for L-release." into lmp-dev

* commit 'b0683f0c3f5eedb332a66203e4850f60eb83dcc5':
  OpenGL 3.1 and AEP documentation for L-release.

9 years agoam 349e3640: am 70807ab1: Merge "docs:Build and Platform Tools Updates for Android...
Rich Slogar [Thu, 16 Oct 2014 19:00:03 +0000 (19:00 +0000)]
am 349e3640: am 70807ab1: Merge "docs:Build and Platform Tools Updates for Android 5" into lmp-dev

* commit '349e3640b784c277f983ec9c849db3131d135ccf':
  docs:Build and Platform Tools Updates for Android 5

9 years agoam 0b7e1baf: am 34ef4ff9: Merge "Moved TV Input Framework (TIF) page out of preview...
Andrew Solovay [Thu, 16 Oct 2014 18:59:59 +0000 (18:59 +0000)]
am 0b7e1baf: am 34ef4ff9: Merge "Moved TV Input Framework (TIF) page out of preview." into lmp-dev

* commit '0b7e1bafe5e722bd8c620f8d404e39a2c37d893c':
  Moved TV Input Framework (TIF) page out of preview.

9 years agoMerge "Add system property config.disable_timeupdate to configure NetworkTimeUpdateSe...
Chenjie Luo [Thu, 16 Oct 2014 18:45:07 +0000 (18:45 +0000)]
Merge "Add system property config.disable_timeupdate to configure NetworkTimeUpdateService" into lmp-sprout-dev

9 years agoam 447369f2: am a1e3063e: am ab64919c: Merge "docs: update reference to FragmentRetai...
Scott Rowe [Thu, 16 Oct 2014 18:42:20 +0000 (18:42 +0000)]
am 447369f2: am a1e3063e: am ab64919c: Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs

* commit '447369f2d2b02f78d01d4a4923fedfca96c1950f':
  docs: update reference to FragmentRetainInstance

9 years agoam 7e19b402: am 2f9ea27c: am 58c64870: Merge "Typo fixed in sample code" into klp...
Joe Fernandez [Thu, 16 Oct 2014 18:42:16 +0000 (18:42 +0000)]
am 7e19b402: am 2f9ea27c: am 58c64870: Merge "Typo fixed in sample code" into klp-modular-docs

* commit '7e19b402c6651112a56ab8569ea53a7004a3a552':
  Typo fixed in sample code

9 years agoAdd system property config.disable_timeupdate to configure NetworkTimeUpdateService
Chenjie Luo [Thu, 16 Oct 2014 17:55:33 +0000 (10:55 -0700)]
Add system property config.disable_timeupdate to configure NetworkTimeUpdateService

Bug: 17934875
Change-Id: Ic1acff13190f38cedb1ecf22783d4dfd3373511d

9 years agoam a3bc95c5: am 8f93624e: docs: delete preview pages
Scott Rowe [Thu, 16 Oct 2014 18:35:40 +0000 (18:35 +0000)]
am a3bc95c5: am 8f93624e: docs: delete preview pages

* commit 'a3bc95c50638b869a4d9aa8b0fefb6862b8cdc05':
  docs: delete preview pages

9 years agoam 56302744: am 248edc3e: Update javadoc comments for getBluetoothLeAdvertiser()
Prerepa Viswanadham [Thu, 16 Oct 2014 18:35:33 +0000 (18:35 +0000)]
am 56302744: am 248edc3e: Update javadoc comments for getBluetoothLeAdvertiser()

* commit '56302744c4b22342798e3a08c03b34322a8a9dd3':
  Update javadoc comments for getBluetoothLeAdvertiser()