OSDN Git Service

android-x86/frameworks-base.git
9 years agoam e95fa264: am e17b0a14: am 87499b27: Merge "Re-fixing link, and removing trailing...
Eric Gilmore [Thu, 5 Mar 2015 23:04:27 +0000 (23:04 +0000)]
am e95fa264: am e17b0a14: am 87499b27: Merge "Re-fixing link, and removing trailing white space." into lmp-docs

* commit 'e95fa2649b62a3fbccd096b43925a17c6ff03228':
  Re-fixing link, and removing trailing white space.

9 years agoam e17b0a14: am 87499b27: Merge "Re-fixing link, and removing trailing white space...
Eric Gilmore [Thu, 5 Mar 2015 22:50:16 +0000 (22:50 +0000)]
am e17b0a14: am 87499b27: Merge "Re-fixing link, and removing trailing white space." into lmp-docs

* commit 'e17b0a14ccc427bff386517537fcf23e00a087d4':
  Re-fixing link, and removing trailing white space.

9 years agoam 87499b27: Merge "Re-fixing link, and removing trailing white space." into lmp...
Eric Gilmore [Thu, 5 Mar 2015 22:34:58 +0000 (22:34 +0000)]
am 87499b27: Merge "Re-fixing link, and removing trailing white space." into lmp-docs

* commit '87499b275bc7a8d4a12a3134646769a5c6c34829':
  Re-fixing link, and removing trailing white space.

9 years agoMerge "Re-fixing link, and removing trailing white space." into lmp-docs
Eric Gilmore [Thu, 5 Mar 2015 22:00:20 +0000 (22:00 +0000)]
Merge "Re-fixing link, and removing trailing white space." into lmp-docs

9 years agoRe-fixing link, and removing trailing white space.
Eric Gilmore [Thu, 5 Mar 2015 21:39:21 +0000 (13:39 -0800)]
Re-fixing link, and removing trailing white space.

Change-Id: Ic6cef9862424d5581cf0ad5b8366c7033a9fdd93

9 years agoam dad1cbeb: am 9f485e97: am 4aba69a8: docs: sdk tools date fix
Rich Slogar [Thu, 5 Mar 2015 19:46:12 +0000 (19:46 +0000)]
am dad1cbeb: am 9f485e97: am 4aba69a8: docs: sdk tools date fix

* commit 'dad1cbebfabf421efc90d366d9c4fd67becf930f':
  docs: sdk tools date fix

9 years agoam 9f485e97: am 4aba69a8: docs: sdk tools date fix
Rich Slogar [Thu, 5 Mar 2015 19:39:47 +0000 (19:39 +0000)]
am 9f485e97: am 4aba69a8: docs: sdk tools date fix

* commit '9f485e971e06dad399dd70712787f4c30da9515e':
  docs: sdk tools date fix

9 years agoam 4aba69a8: docs: sdk tools date fix
Rich Slogar [Thu, 5 Mar 2015 19:33:56 +0000 (19:33 +0000)]
am 4aba69a8: docs: sdk tools date fix

* commit '4aba69a8a7f58541ce76429252dd0c9650b40f35':
  docs: sdk tools date fix

9 years agodocs: sdk tools date fix
Rich Slogar [Thu, 5 Mar 2015 19:24:45 +0000 (11:24 -0800)]
docs: sdk tools date fix

Change-Id: Ieb0a5193a5bbf7efd1e5852be4b0db421d08db14

9 years agoam 182059f8: am ca10a435: am f4bbec09: Merge "add tags for wakelock and other API...
smain@google.com [Thu, 5 Mar 2015 06:10:54 +0000 (06:10 +0000)]
am 182059f8: am ca10a435: am f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs

* commit '182059f875bedc778a3ce9710a4f634197d1e959':
  add tags for wakelock and other API names

9 years agoam ca10a435: am f4bbec09: Merge "add tags for wakelock and other API names" into...
smain@google.com [Thu, 5 Mar 2015 01:12:15 +0000 (01:12 +0000)]
am ca10a435: am f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs

* commit 'ca10a4352f07652d82da59f6c1630e8607d82dda':
  add tags for wakelock and other API names

9 years agoam f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs
smain@google.com [Thu, 5 Mar 2015 00:59:24 +0000 (00:59 +0000)]
am f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs

* commit 'f4bbec09a4c3795bc72d6a95aab3488c6c49ce6e':
  add tags for wakelock and other API names

9 years agoMerge "add tags for wakelock and other API names" into lmp-docs
smain@google.com [Thu, 5 Mar 2015 00:49:48 +0000 (00:49 +0000)]
Merge "add tags for wakelock and other API names" into lmp-docs

9 years agoam 62777b18: am 5c30adfd: am 22d1c1ce: Merge "Fixing broken link per b/19503824....
Eric Gilmore [Thu, 5 Mar 2015 00:49:21 +0000 (00:49 +0000)]
am 62777b18: am 5c30adfd: am 22d1c1ce: Merge "Fixing broken link per b/19503824." into lmp-docs

* commit '62777b189dc31c250c4ae06915aae0a337950e1c':
  Fixing broken link per b/19503824.

9 years agoMerge "Merge commit '83a63bac' into manualmerge" into lmp-mr1-dev
Bart Sears [Thu, 5 Mar 2015 00:35:07 +0000 (00:35 +0000)]
Merge "Merge commit '83a63bac' into manualmerge" into lmp-mr1-dev

9 years agoMediaProjectionPermissionActivity: Fix NPE.
John Spurlock [Tue, 24 Feb 2015 17:14:06 +0000 (12:14 -0500)]
MediaProjectionPermissionActivity: Fix NPE.

Avoid dismissing a null dialog.

Bug: 19492919
Change-Id: I6642bb5194d9818ff3db1266c7c78ed752e23ecf
(cherry picked from commit 3d332f4e67a484abe597576bf329d89655afe720)

9 years agoMerge commit '83a63bac' into manualmerge
Craig Mautner [Wed, 4 Mar 2015 18:10:34 +0000 (10:10 -0800)]
Merge commit '83a63bac' into manualmerge

9 years agoam 5c30adfd: am 22d1c1ce: Merge "Fixing broken link per b/19503824." into lmp-docs
Eric Gilmore [Wed, 4 Mar 2015 17:53:31 +0000 (17:53 +0000)]
am 5c30adfd: am 22d1c1ce: Merge "Fixing broken link per b/19503824." into lmp-docs

* commit '5c30adfdb6ef4b004ef0b88006660598f40eb6f5':
  Fixing broken link per b/19503824.

9 years agoam 22d1c1ce: Merge "Fixing broken link per b/19503824." into lmp-docs
Eric Gilmore [Wed, 4 Mar 2015 17:47:01 +0000 (17:47 +0000)]
am 22d1c1ce: Merge "Fixing broken link per b/19503824." into lmp-docs

* commit '22d1c1ce1dc3c84d7517ba64a5d07b5946e49514':
  Fixing broken link per b/19503824.

9 years agoMerge "Fixing broken link per b/19503824." into lmp-docs
Eric Gilmore [Wed, 4 Mar 2015 17:40:15 +0000 (17:40 +0000)]
Merge "Fixing broken link per b/19503824." into lmp-docs

9 years agoam 8fa394fa: Merge "Do not make ActivityContainer available to apps. DO NOT MERGE...
Craig Mautner [Wed, 4 Mar 2015 16:15:35 +0000 (16:15 +0000)]
am 8fa394fa: Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-dev

* commit '8fa394fa8c4eb3ca832dac36baf5645a40d449f1':
  Do not make ActivityContainer available to apps. DO NOT MERGE

9 years agoMerge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-dev
Craig Mautner [Wed, 4 Mar 2015 16:09:28 +0000 (16:09 +0000)]
Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-dev

9 years agoFixing broken link per b/19503824.
Eric Gilmore [Tue, 3 Mar 2015 20:10:19 +0000 (12:10 -0800)]
Fixing broken link per b/19503824.

Change-Id: I4140decb254cf9c9f0eadfce1a3897c240d640d9

9 years agoam 14fcef3b: am c4418980: am a31378dc: Merge "Minor typo fixes in managed profile...
Joe Fernandez [Tue, 3 Mar 2015 06:29:33 +0000 (06:29 +0000)]
am 14fcef3b: am c4418980: am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs

* commit '14fcef3bf02f46a057676d7a6d755daee735c4ea':
  Minor typo fixes in managed profile Javadoc reference pages.

9 years agoam c4418980: am a31378dc: Merge "Minor typo fixes in managed profile Javadoc referenc...
Joe Fernandez [Tue, 3 Mar 2015 06:22:42 +0000 (06:22 +0000)]
am c4418980: am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs

* commit 'c4418980a083c1cd26b789297f084e03036b5fdd':
  Minor typo fixes in managed profile Javadoc reference pages.

9 years agoam a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages....
Joe Fernandez [Tue, 3 Mar 2015 06:15:29 +0000 (06:15 +0000)]
am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs

* commit 'a31378dc49868412a2e632bcc46a44877a9b397f':
  Minor typo fixes in managed profile Javadoc reference pages.

9 years agoMerge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs
Joe Fernandez [Tue, 3 Mar 2015 06:11:49 +0000 (06:11 +0000)]
Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs

9 years agodocs: support library updates for sdk 22
Rich Slogar [Tue, 3 Mar 2015 00:09:21 +0000 (16:09 -0800)]
docs: support library updates for sdk 22

Change-Id: I4cb14e6c941652fe02d98ffac32451eea6f4576c

9 years agodocs: platform revisions 5.1
Rich Slogar [Tue, 3 Mar 2015 01:54:10 +0000 (17:54 -0800)]
docs: platform revisions 5.1

Change-Id: Iabbd8617e3d334228fec94254160f2e43cdd22c6

9 years agoMerge "Doc change: Add diff report for API 22." into lmp-mr1-dev
Joe Fernandez [Tue, 3 Mar 2015 02:03:43 +0000 (02:03 +0000)]
Merge "Doc change: Add diff report for API 22." into lmp-mr1-dev

9 years agoMerge "docs: update Android docs build to include API 22, Android 5.1" into lmp-mr1-dev
Joe Fernandez [Tue, 3 Mar 2015 01:42:40 +0000 (01:42 +0000)]
Merge "docs: update Android docs build to include API 22, Android 5.1" into lmp-mr1-dev

9 years agoam d54fe112: am 2cbda290: am 69b58e74: Merge "docs: sdk tools 24.1 update" into lmp...
Rich Slogar [Tue, 3 Mar 2015 01:27:07 +0000 (01:27 +0000)]
am d54fe112: am 2cbda290: am 69b58e74: Merge "docs: sdk tools 24.1 update" into lmp-docs

* commit 'd54fe112a24ec3a692d35a4ccf1f73fa5caaaf5e':
  docs: sdk tools 24.1 update

9 years agoMinor typo fixes in managed profile Javadoc reference pages.
Andrew Solovay [Tue, 3 Mar 2015 00:37:59 +0000 (16:37 -0800)]
Minor typo fixes in managed profile Javadoc reference pages.

See first comment for stage location.

bug: 19389235
Change-Id: I2e1d5169a77e3f4000e73f08d493953ce4eee78c

9 years agoam 2cbda290: am 69b58e74: Merge "docs: sdk tools 24.1 update" into lmp-docs
Rich Slogar [Tue, 3 Mar 2015 01:20:33 +0000 (01:20 +0000)]
am 2cbda290: am 69b58e74: Merge "docs: sdk tools 24.1 update" into lmp-docs

* commit '2cbda290f66b5a17d3542ada26f7e91b3893f72d':
  docs: sdk tools 24.1 update

9 years agoam 69b58e74: Merge "docs: sdk tools 24.1 update" into lmp-docs
Rich Slogar [Tue, 3 Mar 2015 01:13:36 +0000 (01:13 +0000)]
am 69b58e74: Merge "docs: sdk tools 24.1 update" into lmp-docs

* commit '69b58e74e087159ed5950632b4ab3738a841c633':
  docs: sdk tools 24.1 update

9 years agoMerge "docs: sdk tools 24.1 update" into lmp-docs
Rich Slogar [Tue, 3 Mar 2015 01:07:38 +0000 (01:07 +0000)]
Merge "docs: sdk tools 24.1 update" into lmp-docs

9 years agoMerge "docs: Add Android 5.1 to the uses-sdk manifest docs" into lmp-mr1-dev
Joe Fernandez [Tue, 3 Mar 2015 01:02:54 +0000 (01:02 +0000)]
Merge "docs: Add Android 5.1 to the uses-sdk manifest docs" into lmp-mr1-dev

9 years agoMerge "docs: Android 5.1 API Release notes (Lollipop MR1)" into lmp-mr1-dev
Joe Fernandez [Tue, 3 Mar 2015 00:56:42 +0000 (00:56 +0000)]
Merge "docs: Android 5.1 API Release notes (Lollipop MR1)" into lmp-mr1-dev

9 years agodocs: Add Android 5.1 to the uses-sdk manifest docs
Joe Fernandez [Tue, 3 Mar 2015 00:43:14 +0000 (16:43 -0800)]
docs: Add Android 5.1 to the uses-sdk manifest docs

Change-Id: Idf9962af4250e68ed885571a57b9a51a40f74267

9 years agodocs: update Android docs build to include API 22, Android 5.1
Joe Fernandez [Mon, 2 Mar 2015 23:53:38 +0000 (15:53 -0800)]
docs: update Android docs build to include API 22, Android 5.1

Change-Id: If41c1a142db0f2df439afaa9cf5d0fe0ca47d2c0

9 years agodocs: Android 5.1 API Release notes (Lollipop MR1)
Joe Fernandez [Fri, 27 Feb 2015 05:55:07 +0000 (21:55 -0800)]
docs: Android 5.1 API Release notes (Lollipop MR1)

Change-Id: I47f59ade26086b8368d8b395f92992edc27510d0

9 years agoMerge "Fix incorrect condition for sub id check." into lmp-mr1-dev
Shishir Agrawal [Mon, 2 Mar 2015 22:32:16 +0000 (22:32 +0000)]
Merge "Fix incorrect condition for sub id check." into lmp-mr1-dev

9 years agoam 6ed9b75a: am 72d75f8d: Merge "Correct PorterDuff filters." into lmp-dev
Deepanshu Gupta [Mon, 2 Mar 2015 19:52:33 +0000 (19:52 +0000)]
am 6ed9b75a: am 72d75f8d: Merge "Correct PorterDuff filters." into lmp-dev

* commit '6ed9b75a45ec4bc62b4a0fac2c86479d61918863':
  Correct PorterDuff filters.

9 years agoam d003e813: am 369ad57b: Merge "Fix codestyle for switch statements." into lmp-dev
Deepanshu Gupta [Mon, 2 Mar 2015 19:52:29 +0000 (19:52 +0000)]
am d003e813: am 369ad57b: Merge "Fix codestyle for switch statements." into lmp-dev

* commit 'd003e8133167f2b6741f8eb925fdc9f77c2800a5':
  Fix codestyle for switch statements.

9 years agoam 81449b2c: am 10d620ff: Merge "Better error msg for StateList/Hexadecimal Color...
Deepanshu Gupta [Mon, 2 Mar 2015 19:52:25 +0000 (19:52 +0000)]
am 81449b2c: am 10d620ff: Merge "Better error msg for StateList/Hexadecimal Color." into lmp-dev

* commit '81449b2c4a63392bff22d77f331f4db52011884b':
  Better error msg for StateList/Hexadecimal Color.

9 years agoam 72d75f8d: Merge "Correct PorterDuff filters." into lmp-dev
Deepanshu Gupta [Mon, 2 Mar 2015 19:44:51 +0000 (19:44 +0000)]
am 72d75f8d: Merge "Correct PorterDuff filters." into lmp-dev

* commit '72d75f8d9fb46c04f0458e1f36b064e2b8c3de71':
  Correct PorterDuff filters.

9 years agoam 369ad57b: Merge "Fix codestyle for switch statements." into lmp-dev
Deepanshu Gupta [Mon, 2 Mar 2015 19:44:47 +0000 (19:44 +0000)]
am 369ad57b: Merge "Fix codestyle for switch statements." into lmp-dev

* commit '369ad57b00f1c94c80f0f80ef2e7063a23a94a84':
  Fix codestyle for switch statements.

9 years agoam 10d620ff: Merge "Better error msg for StateList/Hexadecimal Color." into lmp-dev
Deepanshu Gupta [Mon, 2 Mar 2015 19:44:43 +0000 (19:44 +0000)]
am 10d620ff: Merge "Better error msg for StateList/Hexadecimal Color." into lmp-dev

* commit '10d620ff2c4770e926b693e833105e8dbbd5fa86':
  Better error msg for StateList/Hexadecimal Color.

9 years agoMerge "Correct PorterDuff filters." into lmp-dev
Deepanshu Gupta [Mon, 2 Mar 2015 19:40:12 +0000 (19:40 +0000)]
Merge "Correct PorterDuff filters." into lmp-dev

9 years agoMerge "Fix codestyle for switch statements." into lmp-dev
Deepanshu Gupta [Mon, 2 Mar 2015 19:37:30 +0000 (19:37 +0000)]
Merge "Fix codestyle for switch statements." into lmp-dev

9 years agoMerge "Better error msg for StateList/Hexadecimal Color." into lmp-dev
Deepanshu Gupta [Mon, 2 Mar 2015 19:36:57 +0000 (19:36 +0000)]
Merge "Better error msg for StateList/Hexadecimal Color." into lmp-dev

9 years agoMerge "Add status bar time for 5.1" into lmp-mr1-dev
Deepanshu Gupta [Mon, 2 Mar 2015 19:26:14 +0000 (19:26 +0000)]
Merge "Add status bar time for 5.1" into lmp-mr1-dev

9 years agoam 6a0c8084: am 9b94a539: am 97a1173b: docs: March 2015 Dashboard update
Joe Fernandez [Mon, 2 Mar 2015 18:04:39 +0000 (18:04 +0000)]
am 6a0c8084: am 9b94a539: am 97a1173b: docs: March 2015 Dashboard update

* commit '6a0c808487392f6cd8d62ad4abb51c0f077ace0f':
  docs: March 2015 Dashboard update

9 years agoam 9b94a539: am 97a1173b: docs: March 2015 Dashboard update
Joe Fernandez [Mon, 2 Mar 2015 17:14:51 +0000 (17:14 +0000)]
am 9b94a539: am 97a1173b: docs: March 2015 Dashboard update

* commit '9b94a5399845efc9d52ebf37e8fde320885c07c8':
  docs: March 2015 Dashboard update

9 years agoam 97a1173b: docs: March 2015 Dashboard update
Joe Fernandez [Mon, 2 Mar 2015 17:09:01 +0000 (17:09 +0000)]
am 97a1173b: docs: March 2015 Dashboard update

* commit '97a1173b63be900ab5aed694e8022c60f3817fa0':
  docs: March 2015 Dashboard update

9 years agodocs: March 2015 Dashboard update
Joe Fernandez [Mon, 2 Mar 2015 16:53:54 +0000 (08:53 -0800)]
docs: March 2015 Dashboard update

Change-Id: Icaf390b6e55c216c45730190ab31bec7b746e361

9 years agodocs: sdk tools 24.1 update
Rich Slogar [Thu, 26 Feb 2015 23:10:54 +0000 (15:10 -0800)]
docs: sdk tools 24.1 update

Change-Id: I995c1012c22b8b6fa45c4cfd33f90b8b82ddb0eb

9 years agoam 191131d4: am 50e8b020: am a83f6445: Merge "docs: gradle plugin version update...
Rich Slogar [Fri, 27 Feb 2015 22:50:34 +0000 (22:50 +0000)]
am 191131d4: am 50e8b020: am a83f6445: Merge "docs: gradle plugin version update" into lmp-docs

* commit '191131d4494f0b6c51463ae9e771672bad5c970a':
  docs: gradle plugin version update

9 years agoam 50e8b020: am a83f6445: Merge "docs: gradle plugin version update" into lmp-docs
Rich Slogar [Fri, 27 Feb 2015 22:43:42 +0000 (22:43 +0000)]
am 50e8b020: am a83f6445: Merge "docs: gradle plugin version update" into lmp-docs

* commit '50e8b020f69687f11a0abce4ec5312697f9a1449':
  docs: gradle plugin version update

9 years agoam a83f6445: Merge "docs: gradle plugin version update" into lmp-docs
Rich Slogar [Fri, 27 Feb 2015 22:37:17 +0000 (22:37 +0000)]
am a83f6445: Merge "docs: gradle plugin version update" into lmp-docs

* commit 'a83f64451d55882366491e66c7479f194e0625ea':
  docs: gradle plugin version update

9 years agoMerge "docs: gradle plugin version update" into lmp-docs
Rich Slogar [Fri, 27 Feb 2015 22:31:32 +0000 (22:31 +0000)]
Merge "docs: gradle plugin version update" into lmp-docs

9 years agodocs: gradle plugin version update
Rich Slogar [Mon, 23 Feb 2015 18:22:22 +0000 (10:22 -0800)]
docs: gradle plugin version update

b.android 153270

Change-Id: I0c752fdf28181c50924a1ca946b5110f773659dc

9 years agoam d57871e0: am 8aa8960e: am a464d409: Merge "docs: Add steps to enable adb debugging...
Luan Nguyen [Fri, 27 Feb 2015 16:53:47 +0000 (16:53 +0000)]
am d57871e0: am 8aa8960e: am a464d409: Merge "docs: Add steps to enable adb debugging on Wear device" into lmp-docs

* commit 'd57871e00d77bc852948de30a01b6856a6cfeb9b':
  docs: Add steps to enable adb debugging on Wear device

9 years agoam b8593133: am c1120b45: am 8f0e9c75: Merge "doc: Add Japanese version of DAC/distri...
Ryosuke Matsuuchi [Fri, 27 Feb 2015 16:53:42 +0000 (16:53 +0000)]
am b8593133: am c1120b45: am 8f0e9c75: Merge "doc: Add Japanese version of DAC/distribute/ page." into lmp-docs

* commit 'b859313312a85285c2c243a5e58d133e308ee590':
  doc: Add Japanese version of DAC/distribute/ page.

9 years agoam 3daee377: am 7f26f2b9: am b5e00e5c: docs: Documented new IABv5 sub upgrade/downgra...
Andrew Solovay [Fri, 27 Feb 2015 16:53:37 +0000 (16:53 +0000)]
am 3daee377: am 7f26f2b9: am b5e00e5c: docs: Documented new IABv5 sub upgrade/downgrade and manual renewal

* commit '3daee37705d23a0f91680aa954e4bcdb2dfdf4e8':
  docs: Documented new IABv5 sub upgrade/downgrade and manual renewal

9 years agoam 8aa8960e: am a464d409: Merge "docs: Add steps to enable adb debugging on Wear...
Luan Nguyen [Fri, 27 Feb 2015 16:46:56 +0000 (16:46 +0000)]
am 8aa8960e: am a464d409: Merge "docs: Add steps to enable adb debugging on Wear device" into lmp-docs

* commit '8aa8960edb10089570acd5d3b19cfd9be7253fab':
  docs: Add steps to enable adb debugging on Wear device

9 years agoam c1120b45: am 8f0e9c75: Merge "doc: Add Japanese version of DAC/distribute/ page...
Ryosuke Matsuuchi [Fri, 27 Feb 2015 16:46:53 +0000 (16:46 +0000)]
am c1120b45: am 8f0e9c75: Merge "doc: Add Japanese version of DAC/distribute/ page." into lmp-docs

* commit 'c1120b459eb1ecabd54966cef1873f0f0707382d':
  doc: Add Japanese version of DAC/distribute/ page.

9 years agoam 7f26f2b9: am b5e00e5c: docs: Documented new IABv5 sub upgrade/downgrade and manual...
Andrew Solovay [Fri, 27 Feb 2015 16:46:49 +0000 (16:46 +0000)]
am 7f26f2b9: am b5e00e5c: docs: Documented new IABv5 sub upgrade/downgrade and manual renewal

* commit '7f26f2b96a23f32bca69862b254dbbe8b59049d9':
  docs: Documented new IABv5 sub upgrade/downgrade and manual renewal

9 years agoam a464d409: Merge "docs: Add steps to enable adb debugging on Wear device" into...
Luan Nguyen [Fri, 27 Feb 2015 16:37:46 +0000 (16:37 +0000)]
am a464d409: Merge "docs: Add steps to enable adb debugging on Wear device" into lmp-docs

* commit 'a464d409f68ca9a59ac4261edd46866ae2af68bf':
  docs: Add steps to enable adb debugging on Wear device

9 years agoam 8f0e9c75: Merge "doc: Add Japanese version of DAC/distribute/ page." into lmp...
Ryosuke Matsuuchi [Fri, 27 Feb 2015 16:37:42 +0000 (16:37 +0000)]
am 8f0e9c75: Merge "doc: Add Japanese version of DAC/distribute/ page." into lmp-docs

* commit '8f0e9c7593fee981fc4b3831aae76a1f20e236db':
  doc: Add Japanese version of DAC/distribute/ page.

9 years agoam b5e00e5c: docs: Documented new IABv5 sub upgrade/downgrade and manual renewal
Andrew Solovay [Fri, 27 Feb 2015 16:37:38 +0000 (16:37 +0000)]
am b5e00e5c: docs: Documented new IABv5 sub upgrade/downgrade and manual renewal

* commit 'b5e00e5c3db7fc7121aeff6dc7d20b21740d47e5':
  docs: Documented new IABv5 sub upgrade/downgrade and manual renewal

9 years agoMerge "docs: Add steps to enable adb debugging on Wear device" into lmp-docs
Luan Nguyen [Fri, 27 Feb 2015 15:07:01 +0000 (15:07 +0000)]
Merge "docs: Add steps to enable adb debugging on Wear device" into lmp-docs

9 years agoMerge "doc: Add Japanese version of DAC/distribute/ page." into lmp-docs
Ryosuke Matsuuchi [Fri, 27 Feb 2015 03:41:48 +0000 (03:41 +0000)]
Merge "doc: Add Japanese version of DAC/distribute/ page." into lmp-docs

9 years agoAdd status bar time for 5.1
Deepanshu Gupta [Fri, 27 Feb 2015 03:29:36 +0000 (19:29 -0800)]
Add status bar time for 5.1

Change-Id: I9469cdbbc5cbfe5cb99d9c4ee6f4e299246d409f

9 years agoCorrect PorterDuff filters.
Deepanshu Gupta [Thu, 26 Feb 2015 22:34:57 +0000 (14:34 -0800)]
Correct PorterDuff filters.

1. Remove unused modes - makes the class more manageable, and missing
modes can always be readded from the git history.
2. Reuse the existing BlendComposite instances where possible.
3. Fix incorrect alpha computation for multiply mode.
4. Change the alpha computation for all blend modes to compenstate for
the fact that the color filter image that we create extends beyond the
image it is inteded to be applied to.

Change-Id: Iedebf289a23325ee4c6d406dcad46a9edb1855c7

9 years agodocs: Documented new IABv5 sub upgrade/downgrade and manual renewal
Andrew Solovay [Tue, 27 Jan 2015 03:35:37 +0000 (19:35 -0800)]
docs: Documented new IABv5 sub upgrade/downgrade and manual renewal

Documented new support for users upgrading/downgrading subscriptions
in the middle of a sub period, and for users manually renewing
before the subscription period ends. Also updated testing docs
to reflect that sandbox now supports testing subscriptions, and
documented new "autoRenewing" field in INAPP_PURCHASE_DATA.

See first comment for doc stage location.

bug: 18982828
bug: 18916814
bug: 18951608
bug: 18908756
Change-Id: I530b57d840ed5aeefe4c6a688a2e59aec41ec7d0

9 years agoFix codestyle for switch statements.
Deepanshu Gupta [Thu, 26 Feb 2015 22:32:30 +0000 (14:32 -0800)]
Fix codestyle for switch statements.

Fix intellij's codestyle settings for indenting switch/case statement.

Change-Id: I905231538fef0fcd7fa4e742f937b8da34f2e30f

9 years agoMerge "Changing usage of carrier name field of SubInfoRecord" into lmp-mr1-dev
Sanket Padawe [Thu, 26 Feb 2015 21:58:27 +0000 (21:58 +0000)]
Merge "Changing usage of carrier name field of SubInfoRecord" into lmp-mr1-dev

9 years agoMerge "Keyguard: Use plmn/spn broadcast when no SIMs" into lmp-mr1-dev
Jason Monk [Thu, 26 Feb 2015 21:54:20 +0000 (21:54 +0000)]
Merge "Keyguard: Use plmn/spn broadcast when no SIMs" into lmp-mr1-dev

9 years agoam 6bb23d62: am 29936684: am 0a504745: Merge "docs: 9patch tool update" into lmp...
Rich Slogar [Thu, 26 Feb 2015 18:22:34 +0000 (18:22 +0000)]
am 6bb23d62: am 29936684: am 0a504745: Merge "docs: 9patch tool update" into lmp-docs

* commit '6bb23d627f608461f6dd5f40308ac176a327d99b':
  docs: 9patch tool update

9 years agoam 29936684: am 0a504745: Merge "docs: 9patch tool update" into lmp-docs
Rich Slogar [Thu, 26 Feb 2015 18:15:41 +0000 (18:15 +0000)]
am 29936684: am 0a504745: Merge "docs: 9patch tool update" into lmp-docs

* commit '299366847f50059fb3e13b573247d9a05d29eb3c':
  docs: 9patch tool update

9 years agoam 0a504745: Merge "docs: 9patch tool update" into lmp-docs
Rich Slogar [Thu, 26 Feb 2015 18:08:39 +0000 (18:08 +0000)]
am 0a504745: Merge "docs: 9patch tool update" into lmp-docs

* commit '0a504745b4f63bd9f1d5e40addf50a6e90b8522d':
  docs: 9patch tool update

9 years agoMerge "docs: 9patch tool update" into lmp-docs
Rich Slogar [Thu, 26 Feb 2015 18:02:41 +0000 (18:02 +0000)]
Merge "docs: 9patch tool update" into lmp-docs

9 years agoam 1836eea0: am 41104632: am eedf6ad8: Merge "docs: remove exploring sdk link" into...
Rich Slogar [Wed, 25 Feb 2015 23:32:51 +0000 (23:32 +0000)]
am 1836eea0: am 41104632: am eedf6ad8: Merge "docs: remove exploring sdk link" into lmp-docs

* commit '1836eea08229dda72ff89d24f75f9f4948be957e':
  docs: remove exploring sdk link

9 years agoam f8a95b0b: am 84994e87: am db2ebca7: Merge "docs: note to install linux packages...
Rich Slogar [Wed, 25 Feb 2015 23:32:46 +0000 (23:32 +0000)]
am f8a95b0b: am 84994e87: am db2ebca7: Merge "docs: note to install linux packages v2 update" into lmp-docs

* commit 'f8a95b0b6fc4e19c7935a2fb46c5b7b6cef3a194':
  docs: note to install linux packages v2 update

9 years agoam 41104632: am eedf6ad8: Merge "docs: remove exploring sdk link" into lmp-docs
Rich Slogar [Wed, 25 Feb 2015 23:25:11 +0000 (23:25 +0000)]
am 41104632: am eedf6ad8: Merge "docs: remove exploring sdk link" into lmp-docs

* commit '411046324743055e9eef3b04109c998b5354b496':
  docs: remove exploring sdk link

9 years agoam 84994e87: am db2ebca7: Merge "docs: note to install linux packages v2 update"...
Rich Slogar [Wed, 25 Feb 2015 23:25:07 +0000 (23:25 +0000)]
am 84994e87: am db2ebca7: Merge "docs: note to install linux packages v2 update" into lmp-docs

* commit '84994e876e728fa57f06d803f7c4abfbc9df40db':
  docs: note to install linux packages v2 update

9 years agoam eedf6ad8: Merge "docs: remove exploring sdk link" into lmp-docs
Rich Slogar [Wed, 25 Feb 2015 23:17:31 +0000 (23:17 +0000)]
am eedf6ad8: Merge "docs: remove exploring sdk link" into lmp-docs

* commit 'eedf6ad8ce1e15276311a78488e27388f049b4c0':
  docs: remove exploring sdk link

9 years agoam db2ebca7: Merge "docs: note to install linux packages v2 update" into lmp-docs
Rich Slogar [Wed, 25 Feb 2015 23:17:23 +0000 (23:17 +0000)]
am db2ebca7: Merge "docs: note to install linux packages v2 update" into lmp-docs

* commit 'db2ebca7ed10a4d5d943e414a35d4734b9987e91':
  docs: note to install linux packages v2 update

9 years agoMerge "docs: remove exploring sdk link" into lmp-docs
Rich Slogar [Wed, 25 Feb 2015 23:12:32 +0000 (23:12 +0000)]
Merge "docs: remove exploring sdk link" into lmp-docs

9 years agoMerge "docs: note to install linux packages v2 update" into lmp-docs
Rich Slogar [Wed, 25 Feb 2015 23:11:22 +0000 (23:11 +0000)]
Merge "docs: note to install linux packages v2 update" into lmp-docs

9 years agodocs: Add steps to enable adb debugging on Wear device
Luan Nguyen [Wed, 25 Feb 2015 17:42:07 +0000 (09:42 -0800)]
docs: Add steps to enable adb debugging on Wear device

bug: 19425073
Change-Id: Iead63dfe12c5187c5ed8e452fe7e934402ebd056

9 years agoMerge "Remove TrustAgent whitelisting API" into lmp-mr1-dev
Jim Miller [Wed, 25 Feb 2015 18:04:57 +0000 (18:04 +0000)]
Merge "Remove TrustAgent whitelisting API" into lmp-mr1-dev

9 years agoam f7224396: am c427b721: am 41418826: Merge "docs: Android for Work developer landin...
Joe Fernandez [Wed, 25 Feb 2015 13:09:56 +0000 (13:09 +0000)]
am f7224396: am c427b721: am 41418826: Merge "docs: Android for Work developer landing page" into lmp-docs

* commit 'f7224396ee8416630b9387995a79faae1ee68b7c':
  docs: Android for Work developer landing page

9 years agoam e64301e6: am 790b1bc8: am d3cd0948: docs: New doc for creating an AfW Work Policy...
Andrew Solovay [Wed, 25 Feb 2015 13:09:33 +0000 (13:09 +0000)]
am e64301e6: am 790b1bc8: am d3cd0948: docs: New doc for creating an AfW Work Policy Controller

* commit 'e64301e639e73f346a78584af2727bc98f3d81ae':
  docs: New doc for creating an AfW Work Policy Controller

9 years agoam 032e931a: am 6ffe1058: am a2ae6c9d: Merge "docs: New "implementing app restriction...
Andrew Solovay [Wed, 25 Feb 2015 13:09:29 +0000 (13:09 +0000)]
am 032e931a: am 6ffe1058: am a2ae6c9d: Merge "docs: New "implementing app restrictions" doc" into lmp-docs

* commit '032e931a806d21d5fa190d1d28f8d65ee0fb4926':
  docs: New "implementing app restrictions" doc

9 years agoam a9ad0fc7: am f2525ed3: am ea2a0648: Explain behavior of boundless ripple projection
Chris Craik [Wed, 25 Feb 2015 13:09:24 +0000 (13:09 +0000)]
am a9ad0fc7: am f2525ed3: am ea2a0648: Explain behavior of boundless ripple projection

* commit 'a9ad0fc793e3479e678441f2ed7abd47994ab74d':
  Explain behavior of boundless ripple projection

9 years agoam c427b721: am 41418826: Merge "docs: Android for Work developer landing page" into...
Joe Fernandez [Wed, 25 Feb 2015 08:06:01 +0000 (08:06 +0000)]
am c427b721: am 41418826: Merge "docs: Android for Work developer landing page" into lmp-docs

* commit 'c427b721b681b19f40e45ed82ae0c628f3f5b528':
  docs: Android for Work developer landing page

9 years agoam 41418826: Merge "docs: Android for Work developer landing page" into lmp-docs
Joe Fernandez [Wed, 25 Feb 2015 07:59:48 +0000 (07:59 +0000)]
am 41418826: Merge "docs: Android for Work developer landing page" into lmp-docs

* commit '414188262311ec48235095a5dec622b24f7e69ef':
  docs: Android for Work developer landing page

9 years agoMerge "docs: Android for Work developer landing page" into lmp-docs
Joe Fernandez [Wed, 25 Feb 2015 07:52:29 +0000 (07:52 +0000)]
Merge "docs: Android for Work developer landing page" into lmp-docs