OSDN Git Service

android-x86/frameworks-base.git
9 years agoam 6392f3f4: am 7df68812: Merge "docs: NDK site - fix empty landing page section...
Joe Fernandez [Thu, 28 May 2015 00:19:17 +0000 (00:19 +0000)]
am 6392f3f4: am 7df68812: Merge "docs: NDK site - fix empty landing page section" into mnc-preview-docs

* commit '6392f3f4820325819ad6a66db17d6e04c0513cdf':
  docs: NDK site - fix empty landing page section

9 years agoMerge "Update intents for CarrierService" into mnc-dev
Zach Johnson [Thu, 28 May 2015 00:02:29 +0000 (00:02 +0000)]
Merge "Update intents for CarrierService" into mnc-dev

9 years agoam 7df68812: Merge "docs: NDK site - fix empty landing page section" into mnc-preview...
Joe Fernandez [Wed, 27 May 2015 23:58:24 +0000 (23:58 +0000)]
am 7df68812: Merge "docs: NDK site - fix empty landing page section" into mnc-preview-docs

* commit '7df688121480c5c13ab6a3d8932c286bc2d63e65':
  docs: NDK site - fix empty landing page section

9 years agoMerge "Fixed indentation in setProfileName method" into mnc-dev
Fyodor Kupolov [Wed, 27 May 2015 23:56:05 +0000 (23:56 +0000)]
Merge "Fixed indentation in setProfileName method" into mnc-dev

9 years agoUpdate intents for CarrierService
Zach Johnson [Wed, 27 May 2015 23:20:15 +0000 (16:20 -0700)]
Update intents for CarrierService

Keep the bind intent and the config intent separate.

Change-Id: I645a7e697d49d46a4870b7b3a252b3214ee85412

9 years agoFixed indentation in setProfileName method
Fyodor Kupolov [Wed, 27 May 2015 23:52:45 +0000 (16:52 -0700)]
Fixed indentation in setProfileName method

Change-Id: I819bfd509b184b7952d8f9c466c9418353f890cb

9 years agoMerge "Update docstrings for VoicemailContract to be more descriptive." into mnc-dev
Nancy Chen [Wed, 27 May 2015 23:51:59 +0000 (23:51 +0000)]
Merge "Update docstrings for VoicemailContract to be more descriptive." into mnc-dev

9 years agoMerge "docs: NDK site - fix empty landing page section" into mnc-preview-docs
Joe Fernandez [Wed, 27 May 2015 23:45:25 +0000 (23:45 +0000)]
Merge "docs: NDK site - fix empty landing page section" into mnc-preview-docs

9 years agodocs: NDK site - fix empty landing page section
Joe Fernandez [Wed, 27 May 2015 22:55:57 +0000 (15:55 -0700)]
docs: NDK site - fix empty landing page section

b/21461174

Change-Id: I8ad4ace747c90b5c30398112e38705956ec4ab1d

9 years agoam 4359117e: am 772dab7b: Merge "Docs: Final work on Reference tab for NDK minisite...
David Friedman [Wed, 27 May 2015 23:24:24 +0000 (23:24 +0000)]
am 4359117e: am 772dab7b: Merge "Docs: Final work on Reference tab for NDK minisite launch." into mnc-preview-docs

* commit '4359117e6991d223f13fab480cb1b5c33b299df8':
  Docs: Final work on Reference tab for NDK minisite launch.

9 years agoMerge "Disable GPS when in device-idle mode." into mnc-dev
Adam Lesinski [Wed, 27 May 2015 23:20:49 +0000 (23:20 +0000)]
Merge "Disable GPS when in device-idle mode." into mnc-dev

9 years agoMerge "Drop the "Config". Just "CarrierService". It's cleaner." into mnc-dev
Zach Johnson [Wed, 27 May 2015 23:06:41 +0000 (23:06 +0000)]
Merge "Drop the "Config". Just "CarrierService". It's cleaner." into mnc-dev

9 years agoMerge "Handle unknown duration in playMediaSamples test" into mnc-dev
Marco Nelissen [Wed, 27 May 2015 23:05:14 +0000 (23:05 +0000)]
Merge "Handle unknown duration in playMediaSamples test" into mnc-dev

9 years agoam 772dab7b: Merge "Docs: Final work on Reference tab for NDK minisite launch." into...
David Friedman [Wed, 27 May 2015 23:04:52 +0000 (23:04 +0000)]
am 772dab7b: Merge "Docs: Final work on Reference tab for NDK minisite launch." into mnc-preview-docs

* commit '772dab7b24ce8be1e8f0e57ad6f5ba2bfa0203ee':
  Docs: Final work on Reference tab for NDK minisite launch.

9 years agoMerge "Fix status bar window IME flags & layout" into mnc-dev
Jorim Jaggi [Wed, 27 May 2015 22:57:13 +0000 (22:57 +0000)]
Merge "Fix status bar window IME flags & layout" into mnc-dev

9 years agoam 29649e27: am 6ea840d1: am 4cbe359a: Add \'System\' group to DAC sample browser
Trevor Johns [Wed, 27 May 2015 22:56:08 +0000 (22:56 +0000)]
am 29649e27: am 6ea840d1: am 4cbe359a: Add \'System\' group to DAC sample browser

* commit '29649e27a3c73d4470dc41e4c9614da55fac1c54':
  Add 'System' group to DAC sample browser

9 years agoUpdate docstrings for VoicemailContract to be more descriptive.
Nancy Chen [Wed, 27 May 2015 22:52:28 +0000 (15:52 -0700)]
Update docstrings for VoicemailContract to be more descriptive.

Bug: 21343781
Change-Id: I221f61d4e9306a92c736a12b2cff3d9fccebdc47

9 years agoMerge "Docs: Final work on Reference tab for NDK minisite launch." into mnc-preview...
David Friedman [Wed, 27 May 2015 22:51:41 +0000 (22:51 +0000)]
Merge "Docs: Final work on Reference tab for NDK minisite launch." into mnc-preview-docs

9 years agoDocs: Final work on Reference tab for NDK minisite launch.
David Friedman [Wed, 27 May 2015 21:45:39 +0000 (14:45 -0700)]
Docs: Final work on Reference tab for NDK minisite launch.

Change-Id: Ia633e7664012c77c46a6e4ba894d60592bde8b09

9 years agoam 6ea840d1: am 4cbe359a: Add \'System\' group to DAC sample browser
Trevor Johns [Wed, 27 May 2015 22:41:19 +0000 (22:41 +0000)]
am 6ea840d1: am 4cbe359a: Add \'System\' group to DAC sample browser

* commit '6ea840d15e66a5d2ba6e70f9e07ff59adb4d6d2a':
  Add 'System' group to DAC sample browser

9 years agoam 6793b7b0: am 91a90991: Merge "docs: M Preview - System Image Downloads" into mnc...
Joe Fernandez [Wed, 27 May 2015 22:31:28 +0000 (22:31 +0000)]
am 6793b7b0: am 91a90991: Merge "docs: M Preview - System Image Downloads" into mnc-preview-docs

* commit '6793b7b0c6afdb2c234c224aeae205cc594338bb':
  docs: M Preview - System Image Downloads

9 years agoam 2e4ebfbd: am f7883698: Merge "Docs: Samples-tab material for NDK minisite." into...
David Friedman [Wed, 27 May 2015 22:31:23 +0000 (22:31 +0000)]
am 2e4ebfbd: am f7883698: Merge "Docs: Samples-tab material for NDK minisite." into mnc-preview-docs

* commit '2e4ebfbd70dea6f3f71f4776c08557683bce671c':
  Docs: Samples-tab material for NDK minisite.

9 years agoDrop the "Config". Just "CarrierService". It's cleaner.
Zach Johnson [Fri, 22 May 2015 22:56:09 +0000 (15:56 -0700)]
Drop the "Config". Just "CarrierService". It's cleaner.

b/21308727

Change-Id: I6515888c7804349ecd07c4dd74575ef89a4bea59

9 years agoam 4cbe359a: Add \'System\' group to DAC sample browser
Trevor Johns [Wed, 27 May 2015 22:22:53 +0000 (22:22 +0000)]
am 4cbe359a: Add \'System\' group to DAC sample browser

* commit '4cbe359abe26d749b1dbc9cf489a825af0cad005':
  Add 'System' group to DAC sample browser

9 years agoMerge "Don't erase backup metadata when an app is uninstalled" into mnc-dev
Christopher Tate [Wed, 27 May 2015 22:17:40 +0000 (22:17 +0000)]
Merge "Don't erase backup metadata when an app is uninstalled" into mnc-dev

9 years agoam 91a90991: Merge "docs: M Preview - System Image Downloads" into mnc-preview-docs
Joe Fernandez [Wed, 27 May 2015 22:14:20 +0000 (22:14 +0000)]
am 91a90991: Merge "docs: M Preview - System Image Downloads" into mnc-preview-docs

* commit '91a90991248b60b07674c321aca19f23f1f2b51e':
  docs: M Preview - System Image Downloads

9 years agoam f7883698: Merge "Docs: Samples-tab material for NDK minisite." into mnc-preview...
David Friedman [Wed, 27 May 2015 22:14:05 +0000 (22:14 +0000)]
am f7883698: Merge "Docs: Samples-tab material for NDK minisite." into mnc-preview-docs

* commit 'f7883698e19eafd678dfdb2af5a470b30f5153c8':
  Docs: Samples-tab material for NDK minisite.

9 years agoMerge "docs: M Preview - System Image Downloads" into mnc-preview-docs
Joe Fernandez [Wed, 27 May 2015 22:10:38 +0000 (22:10 +0000)]
Merge "docs: M Preview - System Image Downloads" into mnc-preview-docs

9 years agoDon't erase backup metadata when an app is uninstalled
Christopher Tate [Tue, 26 May 2015 19:57:56 +0000 (12:57 -0700)]
Don't erase backup metadata when an app is uninstalled

We still retain the data in the backup, in order to support the flow
in which a user has the app and its data is stored; then the app
is uninstalled; then later the app is reinstalled.  We depend on
having correct metadata for the data in the datastore in order to
evaluate its validity for restore-at-install, so we mustn't
forget that metadata just because the app is not currently
installed.

We also now permit the sentinel pseudopackage name "@pm@" as an
argument to dataChanged(), indicating specifically that the metadata
should be scheduled for backup without having to be piggybacked on
another app's requested backup pass.  That lets us now make sure to
schedule a backup pass for metadata-update in response to app
install activity.

Finally, fix a "min instead of max" bug in full backup scheduling
that was causing the OS to ignore the transport's inter-package
quiet time requirement when multiple packages were overdue for
backup.

Bug 21471973

Change-Id: I1dbc260edb91b8deadd2744e273dfa9578b9ef2a

9 years agodocs: M Preview - System Image Downloads
Joe Fernandez [Wed, 27 May 2015 22:04:22 +0000 (15:04 -0700)]
docs: M Preview - System Image Downloads

Change-Id: I0f88dea54b47512c7f4eb76b72c5bcba0bca41ed

9 years agoMerge "Docs: Samples-tab material for NDK minisite." into mnc-preview-docs
David Friedman [Wed, 27 May 2015 22:00:55 +0000 (22:00 +0000)]
Merge "Docs: Samples-tab material for NDK minisite." into mnc-preview-docs

9 years agoDocs: Samples-tab material for NDK minisite.
David Friedman [Wed, 27 May 2015 17:35:55 +0000 (10:35 -0700)]
Docs: Samples-tab material for NDK minisite.

Change-Id: I0ae1bf83feb2a8cab97e3911f7069b19ae818ffa

9 years agoAdd 'System' group to DAC sample browser
Trevor Johns [Wed, 27 May 2015 21:50:51 +0000 (14:50 -0700)]
Add 'System' group to DAC sample browser

Bug: 19708211
Change-Id: I55ad484647b859fce6c59f0e147523a8a709a527

9 years agoMerge "Allow priv apps to get local mac address" into mnc-dev
Svetoslav [Wed, 27 May 2015 21:41:29 +0000 (21:41 +0000)]
Merge "Allow priv apps to get local mac address" into mnc-dev

9 years agoAllow priv apps to get local mac address
Svetoslav [Wed, 27 May 2015 21:39:21 +0000 (14:39 -0700)]
Allow priv apps to get local mac address

Change-Id: I550847cedd5a407c9424778e483b525d4b97e46d

9 years agoMerge "Move ApplicationInfo hardware acceleration to public flags" into mnc-dev
Alan Viverette [Wed, 27 May 2015 21:30:05 +0000 (21:30 +0000)]
Merge "Move ApplicationInfo hardware acceleration to public flags" into mnc-dev

9 years agoMove ApplicationInfo hardware acceleration to public flags
Alan Viverette [Wed, 27 May 2015 21:29:20 +0000 (14:29 -0700)]
Move ApplicationInfo hardware acceleration to public flags

Bug: 21342038
Change-Id: I5af826f3f2921eef24725c909304243c67f3da78

9 years agoMerge "Adding NPE check when the system has no tasks." into mnc-dev
Winson Chung [Wed, 27 May 2015 21:27:20 +0000 (21:27 +0000)]
Merge "Adding NPE check when the system has no tasks." into mnc-dev

9 years agoMerge "Fixing issue with screenshot icon being stretched." into mnc-dev
Winson Chung [Wed, 27 May 2015 21:26:47 +0000 (21:26 +0000)]
Merge "Fixing issue with screenshot icon being stretched." into mnc-dev

9 years agoFixing issue with screenshot icon being stretched.
Winson Chung [Wed, 27 May 2015 19:41:29 +0000 (12:41 -0700)]
Fixing issue with screenshot icon being stretched.

Bug: 17491725
Change-Id: Iea36ed204dc9431fe1d80be5224a1fcbf6ff1c40

9 years agoMerge "Ensure that the copy notification is always cancelable." into mnc-dev
Ben Kwa [Wed, 27 May 2015 21:18:23 +0000 (21:18 +0000)]
Merge "Ensure that the copy notification is always cancelable." into mnc-dev

9 years agoMerge "MediaCodec: unhide mime type for EAC3" into mnc-dev
Chong Zhang [Wed, 27 May 2015 21:17:11 +0000 (21:17 +0000)]
Merge "MediaCodec: unhide mime type for EAC3" into mnc-dev

9 years agoMediaCodec: unhide mime type for EAC3
Chong Zhang [Wed, 27 May 2015 21:07:29 +0000 (14:07 -0700)]
MediaCodec: unhide mime type for EAC3

bug: 18723951
Change-Id: I8c77be6ede428e92b089b19b2bd627992466a591

9 years agoMerge "add event timers to all notification logs." into mnc-dev
Chris Wren [Wed, 27 May 2015 21:05:07 +0000 (21:05 +0000)]
Merge "add event timers to all notification logs." into mnc-dev

9 years agoam e15fa565: (-s ours) am 650f688c: am 6bf7bfb5: (-s ours) am 4b2d2add: am 958a7c1c...
Leon Scroggins III [Wed, 27 May 2015 20:51:15 +0000 (20:51 +0000)]
am e15fa565: (-s ours) am 650f688c: am 6bf7bfb5: (-s ours) am 4b2d2add: am 958a7c1c: am 3d3e3bb4: am c7a558fe: am 425d7c87: (-s ours) am 11297581: am 18d79267: Check that the parcel contained the expected amount of region data. DO NOT MERGE

* commit 'e15fa5654a902b79fa1ef5075f147e60ad90ae31':
  Check that the parcel contained the expected amount of region data. DO NOT MERGE

9 years agoam ffe36bfb: (-s ours) am 1b4eed56: am 557ee34d: (-s ours) am 2adefefa: am b6e3f930...
Leon Scroggins III [Wed, 27 May 2015 20:51:11 +0000 (20:51 +0000)]
am ffe36bfb: (-s ours) am 1b4eed56: am 557ee34d: (-s ours) am 2adefefa: am b6e3f930: am 2bbcc253: am b36ace74: Merge "Check that the parcel contained the expected amount of region data. DO NOT MERGE" into lmp-dev

* commit 'ffe36bfbec4fc5fca89dca713c385c0fa6ee75c0':
  Check that the parcel contained the expected amount of region data. DO NOT MERGE

9 years agoMerge "API Review: Drawable" into mnc-dev
Alan Viverette [Wed, 27 May 2015 20:33:53 +0000 (20:33 +0000)]
Merge "API Review: Drawable" into mnc-dev

9 years agoMerge "AnimatedVectorDrawable Attr proof of concept" into mnc-dev
Tenghui Zhu [Wed, 27 May 2015 20:33:47 +0000 (20:33 +0000)]
Merge "AnimatedVectorDrawable Attr proof of concept" into mnc-dev

9 years agoam 986cc34c: am 4575cadc: docs: supportlib icon fix
Rich Slogar [Wed, 27 May 2015 20:32:30 +0000 (20:32 +0000)]
am 986cc34c: am 4575cadc: docs: supportlib icon fix

* commit '986cc34c64728d38145c0e981e1f0dd86a83b96b':
  docs: supportlib icon fix

9 years agoam 60877970: am 5904628c: docs: Remove Voice Camera sample.
Luan Nguyen [Wed, 27 May 2015 20:32:24 +0000 (20:32 +0000)]
am 60877970: am 5904628c: docs: Remove Voice Camera sample.

* commit '608779702f0fccd5fe06cbc000a9a4073bef97a5':
  docs: Remove Voice Camera sample.

9 years agoam f42c6dfb: am 5380cb6a: Merge "docs: Remove \'s\' from Confirm Credential sample...
Luan Nguyen [Wed, 27 May 2015 20:32:20 +0000 (20:32 +0000)]
am f42c6dfb: am 5380cb6a: Merge "docs: Remove \'s\' from Confirm Credential sample." into mnc-preview-docs

* commit 'f42c6dfbc3ccf0c11c33a4054725f95725764699':
  docs: Remove 's' from Confirm Credential sample.

9 years agoam 3d3414e4: am 47badfeb: Merge "docs: M Preview - App links fix update" into mnc...
Joe Fernandez [Wed, 27 May 2015 20:32:15 +0000 (20:32 +0000)]
am 3d3414e4: am 47badfeb: Merge "docs: M Preview - App links fix update" into mnc-preview-docs

* commit '3d3414e4dc63b4d1c494368becdc59696336bae6':
  docs: M Preview - App links fix update

9 years agoam 35c53c54: am 27ce77ac: Merge "docs: Update instructions to download samples in...
Luan Nguyen [Wed, 27 May 2015 20:32:09 +0000 (20:32 +0000)]
am 35c53c54: am 27ce77ac: Merge "docs: Update instructions to download samples in Android Studio." into mnc-preview-docs

* commit '35c53c5453def1c97493b84298305e20688dccdc':
  docs: Update instructions to download samples in Android Studio.

9 years agoam 650f688c: am 6bf7bfb5: (-s ours) am 4b2d2add: am 958a7c1c: am 3d3e3bb4: am c7a558f...
Leon Scroggins III [Wed, 27 May 2015 20:31:41 +0000 (20:31 +0000)]
am 650f688c: am 6bf7bfb5: (-s ours) am 4b2d2add: am 958a7c1c: am 3d3e3bb4: am c7a558fe: am 425d7c87: (-s ours) am 11297581: am 18d79267: Check that the parcel contained the expected amount of region data. DO NOT MERGE

* commit '650f688c17f1439ac0e555668e4c454c3a3d273a':
  Check that the parcel contained the expected amount of region data. DO NOT MERGE

9 years agoam 1b4eed56: am 557ee34d: (-s ours) am 2adefefa: am b6e3f930: am 2bbcc253: am b36ace7...
Leon Scroggins III [Wed, 27 May 2015 20:31:37 +0000 (20:31 +0000)]
am 1b4eed56: am 557ee34d: (-s ours) am 2adefefa: am b6e3f930: am 2bbcc253: am b36ace74: Merge "Check that the parcel contained the expected amount of region data. DO NOT MERGE" into lmp-dev

* commit '1b4eed5659a4ac6e4a9f276c7f63da7dda4fa3b7':
  Check that the parcel contained the expected amount of region data. DO NOT MERGE

9 years agoAPI Review: Drawable
Alan Viverette [Wed, 27 May 2015 20:26:41 +0000 (13:26 -0700)]
API Review: Drawable

Renames boolean getters to isZzz(), callback from onChange to onChanged.

Bug: 21342040
Change-Id: I9700d645453354b608fd97a832359211d828b52f

9 years agoDisable GPS when in device-idle mode.
Adam Lesinski [Wed, 27 May 2015 20:24:13 +0000 (13:24 -0700)]
Disable GPS when in device-idle mode.

Bug:21270655
Change-Id: I3cbe95b355af61eedf66bdc0ea7b9dc1bd87e31a

9 years agoam 30788ec8: am f0560097: Merge "docs: Fixed targetSdkVersion in Auto Backup code...
Andrew Solovay [Wed, 27 May 2015 20:22:20 +0000 (20:22 +0000)]
am 30788ec8: am f0560097: Merge "docs: Fixed targetSdkVersion in Auto Backup code snippets" into mnc-preview-docs

* commit '30788ec81cec52eaf201f33eee9942016c18a8a9':
  docs: Fixed targetSdkVersion in Auto Backup code snippets

9 years agoam 36462020: am aa3d35e6: Merge "docs: support library 22.2 duplicate link removal...
Rich Slogar [Wed, 27 May 2015 20:22:15 +0000 (20:22 +0000)]
am 36462020: am aa3d35e6: Merge "docs: support library 22.2 duplicate link removal" into mnc-preview-docs

* commit '36462020d1d2cc6199115335bbf33c18829f64a8':
  docs: support library 22.2 duplicate link removal

9 years agoam b709b0e8: am b7227c2b: Merge "docs: Fixing typo on Auto Backup for Apps page....
Andrew Solovay [Wed, 27 May 2015 20:22:10 +0000 (20:22 +0000)]
am b709b0e8: am b7227c2b: Merge "docs: Fixing typo on Auto Backup for Apps page." into mnc-preview-docs

* commit 'b709b0e897c8feea38a211b6254c2dde33e319f6':
  docs: Fixing typo on Auto Backup for Apps page.

9 years agoam 9b57a20a: am be4fc248: Merge "Docs: Final, master CL for NDK-docs-to-DAC for IO...
David Friedman [Wed, 27 May 2015 20:22:04 +0000 (20:22 +0000)]
am 9b57a20a: am be4fc248: Merge "Docs: Final, master CL for NDK-docs-to-DAC for IO: "Guides," "Downloads" tabs." into mnc-preview-docs

* commit '9b57a20a555b32d5c1e8d11b7f580a7b8115dd79':
  Docs: Final, master CL for NDK-docs-to-DAC for IO: "Guides," "Downloads" tabs.

9 years agoam c33eba1a: am 8525b8a8: (-s ours) Merge "docs: Remove Google Play Services pages...
Quddus Chong [Wed, 27 May 2015 20:21:59 +0000 (20:21 +0000)]
am c33eba1a: am 8525b8a8: (-s ours) Merge "docs: Remove Google Play Services pages under Develop > Google Services. bug: 21407467" into mnc-preview-docs

* commit 'c33eba1aa53c9a591fd2c881c8008dbbef3ccf46':
  docs: Remove Google Play Services pages under Develop > Google Services. bug: 21407467

9 years agoam 4575cadc: docs: supportlib icon fix
Rich Slogar [Wed, 27 May 2015 20:21:30 +0000 (20:21 +0000)]
am 4575cadc: docs: supportlib icon fix

* commit '4575cadc54ed2c574a6198b7247a774c5f8297cb':
  docs: supportlib icon fix

9 years agoam 5904628c: docs: Remove Voice Camera sample.
Luan Nguyen [Wed, 27 May 2015 20:21:25 +0000 (20:21 +0000)]
am 5904628c: docs: Remove Voice Camera sample.

* commit '5904628c89a1757be9fde4983d4e7f8cff28eb7c':
  docs: Remove Voice Camera sample.

9 years agoam 5380cb6a: Merge "docs: Remove \'s\' from Confirm Credential sample." into mnc...
Luan Nguyen [Wed, 27 May 2015 20:21:20 +0000 (20:21 +0000)]
am 5380cb6a: Merge "docs: Remove \'s\' from Confirm Credential sample." into mnc-preview-docs

* commit '5380cb6a8880fc6622bd669bc06321c20e1320d9':
  docs: Remove 's' from Confirm Credential sample.

9 years agoam 47badfeb: Merge "docs: M Preview - App links fix update" into mnc-preview-docs
Joe Fernandez [Wed, 27 May 2015 20:21:15 +0000 (20:21 +0000)]
am 47badfeb: Merge "docs: M Preview - App links fix update" into mnc-preview-docs

* commit '47badfebebec011fb6df48360c647c6ec15800ff':
  docs: M Preview - App links fix update

9 years agoam 27ce77ac: Merge "docs: Update instructions to download samples in Android Studio...
Luan Nguyen [Wed, 27 May 2015 20:21:11 +0000 (20:21 +0000)]
am 27ce77ac: Merge "docs: Update instructions to download samples in Android Studio." into mnc-preview-docs

* commit '27ce77acfda17b04d14e70d5f30c160f72ad8733':
  docs: Update instructions to download samples in Android Studio.

9 years agoam 6bf7bfb5: (-s ours) am 4b2d2add: am 958a7c1c: am 3d3e3bb4: am c7a558fe: am 425d7c8...
Leon Scroggins III [Wed, 27 May 2015 20:20:42 +0000 (20:20 +0000)]
am 6bf7bfb5: (-s ours) am 4b2d2add: am 958a7c1c: am 3d3e3bb4: am c7a558fe: am 425d7c87: (-s ours) am 11297581: am 18d79267: Check that the parcel contained the expected amount of region data. DO NOT MERGE

* commit '6bf7bfb5d2b0693b8b1c4126eea7624e5cfb29f7':
  Check that the parcel contained the expected amount of region data. DO NOT MERGE

9 years agoam 557ee34d: (-s ours) am 2adefefa: am b6e3f930: am 2bbcc253: am b36ace74: Merge...
Leon Scroggins III [Wed, 27 May 2015 20:20:38 +0000 (20:20 +0000)]
am 557ee34d: (-s ours) am 2adefefa: am b6e3f930: am 2bbcc253: am b36ace74: Merge "Check that the parcel contained the expected amount of region data. DO NOT MERGE" into lmp-dev

* commit '557ee34d97c435e19034235aff258aea093efc3f':
  Check that the parcel contained the expected amount of region data. DO NOT MERGE

9 years agodocs: supportlib icon fix
Rich Slogar [Wed, 27 May 2015 20:03:14 +0000 (13:03 -0700)]
docs: supportlib icon fix

Change-Id: I423271109e479a8bacc8edb44801dcb5c05ef634

9 years agoMerge "Remove unused asset, prune large rarely-used Holo assets from preload" into...
Alan Viverette [Wed, 27 May 2015 19:59:11 +0000 (19:59 +0000)]
Merge "Remove unused asset, prune large rarely-used Holo assets from preload" into mnc-dev

9 years agoRemove unused asset, prune large rarely-used Holo assets from preload
Alan Viverette [Wed, 27 May 2015 19:55:49 +0000 (12:55 -0700)]
Remove unused asset, prune large rarely-used Holo assets from preload

Bug: 21352447
Change-Id: I4ad6bc99edf5af0a665827702457925339204f97

9 years agoAdding NPE check when the system has no tasks.
Winson Chung [Wed, 27 May 2015 19:45:20 +0000 (12:45 -0700)]
Adding NPE check when the system has no tasks.

Bug: 20640135
Change-Id: Ifb62d18dbf2125bc33325b7c2f2a44da51309325

9 years agoHandle unknown duration in playMediaSamples test
Marco Nelissen [Wed, 27 May 2015 19:33:03 +0000 (12:33 -0700)]
Handle unknown duration in playMediaSamples test

Bug: 21391417
Change-Id: I85d8f5921e8423da078acfe3aff34a6fcef69e78

9 years agoMerge "Use DeviceDefault (dark) theme for PrintActivity" into mnc-dev
Alan Viverette [Wed, 27 May 2015 19:26:25 +0000 (19:26 +0000)]
Merge "Use DeviceDefault (dark) theme for PrintActivity" into mnc-dev

9 years agoMerge "Fix assert when dumping view at 0 alpha" into mnc-dev
Chris Craik [Wed, 27 May 2015 19:22:43 +0000 (19:22 +0000)]
Merge "Fix assert when dumping view at 0 alpha" into mnc-dev

9 years agoMerge "Fix GL texture binding for TextureViews" into mnc-dev
Chris Craik [Wed, 27 May 2015 19:22:42 +0000 (19:22 +0000)]
Merge "Fix GL texture binding for TextureViews" into mnc-dev

9 years agoadd event timers to all notification logs.
Chris Wren [Wed, 27 May 2015 19:21:00 +0000 (15:21 -0400)]
add event timers to all notification logs.

previously, some logs had only some times, and not others.

Bug: 21394955
Change-Id: I0d7af163be23f5a989c35aba6e6f6879672543fc

9 years agoUse DeviceDefault (dark) theme for PrintActivity
Alan Viverette [Wed, 27 May 2015 19:17:26 +0000 (12:17 -0700)]
Use DeviceDefault (dark) theme for PrintActivity

Bug: 21433656
Change-Id: If90ba72fb5862f0eb583c8e64642920c49c5fea6

9 years agodocs: Remove Voice Camera sample.
Luan Nguyen [Wed, 27 May 2015 18:58:52 +0000 (11:58 -0700)]
docs: Remove Voice Camera sample.

Change-Id: I65ac20c33be9820519c0eb0e931272a0ef9bb34f

9 years agoam f0560097: Merge "docs: Fixed targetSdkVersion in Auto Backup code snippets" into...
Andrew Solovay [Wed, 27 May 2015 18:54:52 +0000 (18:54 +0000)]
am f0560097: Merge "docs: Fixed targetSdkVersion in Auto Backup code snippets" into mnc-preview-docs

* commit 'f0560097eef030d3bf65132c974dbc2f6b1cb681':
  docs: Fixed targetSdkVersion in Auto Backup code snippets

9 years agoam aa3d35e6: Merge "docs: support library 22.2 duplicate link removal" into mnc-previ...
Rich Slogar [Wed, 27 May 2015 18:54:48 +0000 (18:54 +0000)]
am aa3d35e6: Merge "docs: support library 22.2 duplicate link removal" into mnc-preview-docs

* commit 'aa3d35e677e027bf9a8a17c59b6507e588a1b9cb':
  docs: support library 22.2 duplicate link removal

9 years agoam b7227c2b: Merge "docs: Fixing typo on Auto Backup for Apps page." into mnc-preview...
Andrew Solovay [Wed, 27 May 2015 18:54:42 +0000 (18:54 +0000)]
am b7227c2b: Merge "docs: Fixing typo on Auto Backup for Apps page." into mnc-preview-docs

* commit 'b7227c2bf9f1893c5d9778a8344b1bfe6394c4d3':
  docs: Fixing typo on Auto Backup for Apps page.

9 years agoam be4fc248: Merge "Docs: Final, master CL for NDK-docs-to-DAC for IO: "Guides,"...
David Friedman [Wed, 27 May 2015 18:54:37 +0000 (18:54 +0000)]
am be4fc248: Merge "Docs: Final, master CL for NDK-docs-to-DAC for IO: "Guides," "Downloads" tabs." into mnc-preview-docs

* commit 'be4fc248b72e27dad6f677910566226c7dd9d670':
  Docs: Final, master CL for NDK-docs-to-DAC for IO: "Guides," "Downloads" tabs.

9 years agoam 8525b8a8: (-s ours) Merge "docs: Remove Google Play Services pages under Develop...
Quddus Chong [Wed, 27 May 2015 18:54:31 +0000 (18:54 +0000)]
am 8525b8a8: (-s ours) Merge "docs: Remove Google Play Services pages under Develop > Google Services. bug: 21407467" into mnc-preview-docs

* commit '8525b8a8b54e2f97839cb80eee79404ab196c2db':
  docs: Remove Google Play Services pages under Develop > Google Services. bug: 21407467

9 years agoMerge "docs: Remove 's' from Confirm Credential sample." into mnc-preview-docs
Luan Nguyen [Wed, 27 May 2015 18:52:32 +0000 (18:52 +0000)]
Merge "docs: Remove 's' from Confirm Credential sample." into mnc-preview-docs

9 years agodocs: Remove 's' from Confirm Credential sample.
Luan Nguyen [Wed, 27 May 2015 18:51:14 +0000 (11:51 -0700)]
docs: Remove 's' from Confirm Credential sample.

Change-Id: I4b33fec58014c54594210e0f5f4e759393adc618

9 years agoMerge "docs: M Preview - App links fix update" into mnc-preview-docs
Joe Fernandez [Wed, 27 May 2015 18:51:07 +0000 (18:51 +0000)]
Merge "docs: M Preview - App links fix update" into mnc-preview-docs

9 years agoMerge "Fix typo in Javadocs of KeyGenParameterSpec." into mnc-dev
Alex Klyubin [Wed, 27 May 2015 18:46:55 +0000 (18:46 +0000)]
Merge "Fix typo in Javadocs of KeyGenParameterSpec." into mnc-dev

9 years agoMerge "[LockSettings] migrate password attempt throttling to hardware" into mnc-dev
Andres Morales [Wed, 27 May 2015 18:37:21 +0000 (18:37 +0000)]
Merge "[LockSettings] migrate password attempt throttling to hardware" into mnc-dev

9 years agoFix status bar window IME flags & layout
Jorim Jaggi [Thu, 21 May 2015 01:04:16 +0000 (18:04 -0700)]
Fix status bar window IME flags & layout

When bouncer was showing, but keyguard was occluded, staus bar
window couldn't receive input, and thus the IME window was placed
below the status bar window. In addition to that, fix the layout when
IME is showing up on the bouncer screen.

Bug: 19969474
Change-Id: I38d21647801b57608d49c3f525d4840e6ba58296

9 years agodocs: M Preview - App links fix update
Joe Fernandez [Wed, 27 May 2015 18:28:36 +0000 (11:28 -0700)]
docs: M Preview - App links fix update

- final comments
- naming change to "App Links"

Change-Id: I2c8f105e0b75f95ca2e9d6bb86fd85d21dcd3326

9 years agoMerge "Fallback to priority activity if preferred activity not available." into mnc-dev
Julia Reynolds [Wed, 27 May 2015 18:28:40 +0000 (18:28 +0000)]
Merge "Fallback to priority activity if preferred activity not available." into mnc-dev

9 years agoFix assert when dumping view at 0 alpha
Chris Craik [Wed, 27 May 2015 18:28:14 +0000 (11:28 -0700)]
Fix assert when dumping view at 0 alpha

bug:21461177

Change-Id: Ib4aba7b9641254012471da44aa804813b9679423

9 years agoMerge "docs: Update instructions to download samples in Android Studio." into mnc...
Luan Nguyen [Wed, 27 May 2015 18:22:38 +0000 (18:22 +0000)]
Merge "docs: Update instructions to download samples in Android Studio." into mnc-preview-docs

9 years agodocs: Update instructions to download samples in Android Studio.
Luan Nguyen [Wed, 27 May 2015 15:51:32 +0000 (08:51 -0700)]
docs: Update instructions to download samples in Android Studio.

bug: 21425873
Change-Id: I0e5710c08f7fbe5f92ca16b366ea14a1b05d491a

9 years agoFix GL texture binding for TextureViews
Chris Craik [Wed, 27 May 2015 18:06:21 +0000 (11:06 -0700)]
Fix GL texture binding for TextureViews

bug:21431334

Should be explicitly passing target through, to ensure
GL_EXTERNAL_OES textures are bound correctly.

Change-Id: I997672ae292ea7fc016c02a59a3c7c8358ecfe0b

9 years agoMerge "Avoid strict mode violation during saveAttributeData" into mnc-dev
Alan Viverette [Wed, 27 May 2015 18:00:14 +0000 (18:00 +0000)]
Merge "Avoid strict mode violation during saveAttributeData" into mnc-dev

9 years agoam 4b2d2add: am 958a7c1c: am 3d3e3bb4: am c7a558fe: am 425d7c87: (-s ours) am 1129758...
Leon Scroggins III [Wed, 27 May 2015 17:52:58 +0000 (17:52 +0000)]
am 4b2d2add: am 958a7c1c: am 3d3e3bb4: am c7a558fe: am 425d7c87: (-s ours) am 11297581: am 18d79267: Check that the parcel contained the expected amount of region data. DO NOT MERGE

* commit '4b2d2add3fc1068645790a0bace239b9d868dd30':
  Check that the parcel contained the expected amount of region data. DO NOT MERGE

9 years agoam 2adefefa: am b6e3f930: am 2bbcc253: am b36ace74: Merge "Check that the parcel...
Leon Scroggins III [Wed, 27 May 2015 17:52:51 +0000 (17:52 +0000)]
am 2adefefa: am b6e3f930: am 2bbcc253: am b36ace74: Merge "Check that the parcel contained the expected amount of region data. DO NOT MERGE" into lmp-dev

* commit '2adefefa3576142767c45b84d97e05078ead3539':
  Check that the parcel contained the expected amount of region data. DO NOT MERGE