OSDN Git Service

android-x86/frameworks-base.git
10 years agoMerge "Revert "API Review: Change View viewName attribute to transitionName.""
John Reck [Mon, 23 Jun 2014 14:52:28 +0000 (14:52 +0000)]
Merge "Revert "API Review: Change View viewName attribute to transitionName.""

10 years agoRevert "API Review: Change View viewName attribute to transitionName."
John Reck [Mon, 23 Jun 2014 14:51:44 +0000 (14:51 +0000)]
Revert "API Review: Change View viewName attribute to transitionName."

This reverts commit f1b1adf51b2a84e0ac83685812c7e8d86590af12.

Change-Id: I0e49aeed84f2a548e272a59f4e13c3fb74c2bfd9

10 years agoMerge "API Review: Change View viewName attribute to transitionName."
George Mount [Mon, 23 Jun 2014 14:14:48 +0000 (14:14 +0000)]
Merge "API Review: Change View viewName attribute to transitionName."

10 years agoMerge "Show the icon of the personal space."
Nicolas Prevot [Mon, 23 Jun 2014 12:27:54 +0000 (12:27 +0000)]
Merge "Show the icon of the personal space."

10 years agoShow the icon of the personal space.
Nicolas Prevot [Wed, 14 May 2014 13:51:48 +0000 (14:51 +0100)]
Show the icon of the personal space.

In an intent disambiguation dialog from a managed profile,
when the intent can be forwarded to the personal space:
show the icon of the parent next to "Personal apps".
And put it at the bottom of the dialog.

Change-Id: I523222aac5dde9653e784eb26cf23cdaf018b86c

10 years agoam 12426cff: am 878325b3: Merge "docs: l-preview fixes" into klp-modular-dev
Robert Ly [Mon, 23 Jun 2014 10:40:23 +0000 (10:40 +0000)]
am 12426cff: am 878325b3: Merge "docs: l-preview fixes" into klp-modular-dev

* commit '12426cff730ec2e691005407b911ebe71fbb268d':
  docs: l-preview fixes

10 years agoam 2061f0a2: am 0cff6256: docs: more auto updates
Robert Ly [Mon, 23 Jun 2014 10:40:14 +0000 (10:40 +0000)]
am 2061f0a2: am 0cff6256: docs: more auto updates

* commit '2061f0a2dfdda9a9bf36d99d0b67f8d3821cdef7':
  docs: more auto updates

10 years agoam 878325b3: Merge "docs: l-preview fixes" into klp-modular-dev
Robert Ly [Mon, 23 Jun 2014 09:56:03 +0000 (09:56 +0000)]
am 878325b3: Merge "docs: l-preview fixes" into klp-modular-dev

* commit '878325b3677584e50536c128e661b4921f2aa154':
  docs: l-preview fixes

10 years agoam 0cff6256: docs: more auto updates
Robert Ly [Mon, 23 Jun 2014 09:55:53 +0000 (09:55 +0000)]
am 0cff6256: docs: more auto updates

* commit '0cff6256d829a79fa51c189eff765f42bb454907':
  docs: more auto updates

10 years agodocs: more auto updates
Robert Ly [Sun, 22 Jun 2014 21:37:38 +0000 (14:37 -0700)]
docs: more auto updates

Change-Id: I50b936217ba5933cbc01d81f1bd1d4b78df4239f

10 years agoam 5d9681a3: docs: auto landing cleanup
Robert Ly [Sun, 22 Jun 2014 18:38:19 +0000 (18:38 +0000)]
am 5d9681a3: docs: auto landing cleanup

* commit '5d9681a3986050c8b59201aac5b4243b6b2d0cda':
  docs: auto landing cleanup

10 years agodocs: auto landing cleanup
Robert Ly [Sun, 22 Jun 2014 18:33:33 +0000 (11:33 -0700)]
docs: auto landing cleanup

Change-Id: I9b9f706341047613fd536ba44b6e887922f13d54

10 years agoam e7e8c1b4: Merge "docs: Further work on the Android Auto dev site Added partner...
Robert Ly [Sat, 21 Jun 2014 22:07:04 +0000 (22:07 +0000)]
am e7e8c1b4: Merge "docs: Further work on the Android Auto dev site  Added partner logos (car OEMs, aftermarket, apps)  Added platform screenshots to the hero page" into klp-modular-dev

* commit 'e7e8c1b4c02544852ddcb07e77e8104a7d7f9e10':
  docs: Further work on the Android Auto dev site  Added partner logos (car OEMs, aftermarket, apps)  Added platform screenshots to the hero page

10 years agoam d7208fda: Merge "docs: remove description text for index" into klp-modular-dev
Robert Ly [Sat, 21 Jun 2014 21:11:37 +0000 (21:11 +0000)]
am d7208fda: Merge "docs: remove description text for index" into klp-modular-dev

* commit 'd7208fdaebd6625d8e25fdd4eff3c2d2b5eea065':
  docs: remove description text for index

10 years agoam 1aa273e0: Merge "docs: Updated Support page for L Developer Preview." into klp...
Quddus Chong [Sat, 21 Jun 2014 20:50:35 +0000 (20:50 +0000)]
am 1aa273e0: Merge "docs: Updated Support page for L Developer Preview." into klp-modular-dev

* commit '1aa273e0da3a4be9a6e48ba21593ed3b6d0c1014':
  docs: Updated Support page for L Developer Preview.

10 years agoam efa289e2: docs: add device icons for index page
Robert Ly [Sat, 21 Jun 2014 20:46:43 +0000 (20:46 +0000)]
am efa289e2: docs: add device icons for index page

* commit 'efa289e2f01aa069505d830c57e3ef6e46288c9c':
  docs: add device icons for index page

10 years agodocs: add device icons for index page
Robert Ly [Sat, 21 Jun 2014 20:40:48 +0000 (13:40 -0700)]
docs: add device icons for index page

Change-Id: I255cff3d4771c5bebc48f3d6a03a4ebacb248a89

10 years agoam 50f08149: Merge "docs: add whitelisting instructions and new index icons" into...
Robert Ly [Sat, 21 Jun 2014 20:16:37 +0000 (20:16 +0000)]
am 50f08149: Merge "docs: add whitelisting instructions and new index icons" into klp-modular-dev

* commit '50f08149ec7d5ede16f44a855ccf4db450336e93':
  docs: add whitelisting instructions and new index icons

10 years agoam ceaa57c9: am 39b707c8: am bf66c17e: Merge "remove extraneous tag causing extra...
Dirk Dougherty [Sat, 21 Jun 2014 20:16:25 +0000 (20:16 +0000)]
am ceaa57c9: am 39b707c8: am bf66c17e: Merge "remove extraneous tag causing extra spacing between heading/text." into klp-docs

* commit 'ceaa57c927ad61ed8a8a1fc8c1b5c28d5472a50a':
  remove extraneous tag causing extra spacing between heading/text.

10 years agoam e77f41a6: prettier sdk buttons
smain@google.com [Sat, 21 Jun 2014 20:16:16 +0000 (20:16 +0000)]
am e77f41a6: prettier sdk buttons

* commit 'e77f41a6e388258d24a29228b8f41d01bd9ae81f':
  prettier sdk buttons

10 years agoam 941f800a: update Edu pages for launch of Chrome edu apps on play store removes...
smain@google.com [Sat, 21 Jun 2014 20:16:07 +0000 (20:16 +0000)]
am 941f800a: update Edu pages for launch of Chrome edu apps on play store removes the FAQ and Guidelines docs, redirect to devsite copy will be implemented with separate CL

* commit '941f800a848a5dad4d4541a214477e95f738a5c8':
  update Edu pages for launch of Chrome edu apps on play store removes the FAQ and Guidelines docs, redirect to devsite copy will be implemented with separate CL

10 years agoam 371d68cc: add link back to main dev site home
smain@google.com [Sat, 21 Jun 2014 20:15:59 +0000 (20:15 +0000)]
am 371d68cc: add link back to main dev site home

* commit '371d68ccb03e4c3827f8b548ebb128cddd8c4bd3':
  add link back to main dev site home

10 years agoam 270c099f: Merge "Move emulator check & save system properties access" into klp...
Michael Kolb [Sat, 21 Jun 2014 20:15:47 +0000 (20:15 +0000)]
am 270c099f: Merge "Move emulator check & save system properties access" into klp-modular-dev

* commit '270c099faf63868dcc21836a84de778337ff3be9':
  Move emulator check & save system properties access

10 years agoam 90c9fffc: Merge "Do not delete stack if empty task is being reused." into klp...
Craig Mautner [Sat, 21 Jun 2014 20:15:36 +0000 (20:15 +0000)]
am 90c9fffc: Merge "Do not delete stack if empty task is being reused." into klp-modular-dev

* commit '90c9fffc956589f06d4a0c45a893c5db6a85fabc':
  Do not delete stack if empty task is being reused.

10 years agoam db9fed74: Merge "Make WindowInsets.isRound work with emulator" into klp-modular-dev
Michael Kolb [Sat, 21 Jun 2014 20:15:24 +0000 (20:15 +0000)]
am db9fed74: Merge "Make WindowInsets.isRound work with emulator" into klp-modular-dev

* commit 'db9fed74c2bbf97157683b47f3cbdcd04c729839':
  Make WindowInsets.isRound work with emulator

10 years agoam 8b19cdf7: am 845835c7: am 2d7b3ded: Merge "ExoPlayer developer guide" into klp...
Joe Fernandez [Sat, 21 Jun 2014 20:15:12 +0000 (20:15 +0000)]
am 8b19cdf7: am 845835c7: am 2d7b3ded: Merge "ExoPlayer developer guide" into klp-docs

* commit '8b19cdf7535b193c2633bc311038521f749ebc70':
  ExoPlayer developer guide

10 years agoam d8b94456: fix build
Robert Ly [Sat, 21 Jun 2014 20:15:07 +0000 (20:15 +0000)]
am d8b94456: fix build

* commit 'd8b94456c49578fa152fe5bd6a07a131056e3288':
  fix build

10 years agoam 8c573178: Merge "docs: fix l preview bugs" into klp-modular-dev
Robert Ly [Sat, 21 Jun 2014 20:14:59 +0000 (20:14 +0000)]
am 8c573178: Merge "docs: fix l preview bugs" into klp-modular-dev

* commit '8c573178dfa68fc57594124128c9fd8e2abe8f01':
  docs: fix l preview bugs

10 years agoam 448f823e: Merge "docs: fix margins and add partners back" into klp-modular-dev
Robert Ly [Sat, 21 Jun 2014 20:14:55 +0000 (20:14 +0000)]
am 448f823e: Merge "docs: fix margins and add partners back" into klp-modular-dev

* commit '448f823e2048e2e5843557fe255b751c5a1b2961':
  docs: fix margins and add partners back

10 years agoMerge "docs: Further work on the Android Auto dev site Added partner logos (car...
Robert Ly [Sat, 21 Jun 2014 22:04:29 +0000 (22:04 +0000)]
Merge "docs: Further work on the Android Auto dev site  Added partner logos (car OEMs, aftermarket, apps)  Added platform screenshots to the hero page" into klp-modular-dev

10 years agodocs: Further work on the Android Auto dev site
Ricardo Cervera [Sat, 21 Jun 2014 01:42:30 +0000 (18:42 -0700)]
docs: Further work on the Android Auto dev site
 Added partner logos (car OEMs, aftermarket, apps)
 Added platform screenshots to the hero page

Change-Id: I41669dd4ec29569f300b64ed9689c0a8dd78fda4

10 years agoam 39b707c8: am bf66c17e: Merge "remove extraneous tag causing extra spacing between...
Dirk Dougherty [Sat, 21 Jun 2014 02:37:39 +0000 (02:37 +0000)]
am 39b707c8: am bf66c17e: Merge "remove extraneous tag causing extra spacing between heading/text." into klp-docs

* commit '39b707c8d543149e449c04e502ee84361fe3fa47':
  remove extraneous tag causing extra spacing between heading/text.

10 years agoam bf66c17e: Merge "remove extraneous tag causing extra spacing between heading/text...
Dirk Dougherty [Sat, 21 Jun 2014 02:33:40 +0000 (02:33 +0000)]
am bf66c17e: Merge "remove extraneous tag causing extra spacing between heading/text." into klp-docs

* commit 'bf66c17e4ad64c8420d3d3b5e8d789af00479eab':
  remove extraneous tag causing extra spacing between heading/text.

10 years agoprettier sdk buttons
smain@google.com [Sat, 21 Jun 2014 02:06:06 +0000 (19:06 -0700)]
prettier sdk buttons

Change-Id: I4b15c88e4e218dc2d964470d6010cdb3f19d748c

10 years agoupdate Edu pages for launch of Chrome edu apps on play store
smain@google.com [Wed, 18 Jun 2014 23:13:56 +0000 (16:13 -0700)]
update Edu pages for launch of Chrome edu apps on play store
removes the FAQ and Guidelines docs, redirect to devsite copy will
be implemented with separate CL

Change-Id: I006d2374b1d49fbf41ce60a39f08fe1ad96096c1

10 years agoadd link back to main dev site home
smain@google.com [Sat, 21 Jun 2014 00:45:37 +0000 (17:45 -0700)]
add link back to main dev site home

Change-Id: Icab3fbd6a0a62d7a83ab41061956614d575b7bb4

10 years agoam a642a9ea: am d24f5577: Merge "Use openssl\'s SHA1 instead of bionic\'s."
Dan Albert [Fri, 20 Jun 2014 22:40:25 +0000 (22:40 +0000)]
am a642a9ea: am d24f5577: Merge "Use openssl\'s SHA1 instead of bionic\'s."

* commit 'a642a9ea3b2288b431ecb284b94a4657ae62889d':
  Use openssl's SHA1 instead of bionic's.

10 years agoam 4d30b1e6: make buttons "primary" red
smain@google.com [Fri, 20 Jun 2014 22:30:25 +0000 (22:30 +0000)]
am 4d30b1e6: make buttons "primary" red

* commit '4d30b1e663d975357e0e748a1bf4ab094e3afdde':
  make buttons "primary" red

10 years agoam 78dfcb3a: Merge "revised homepage to use static version of top banner" into klp...
smain@google.com [Fri, 20 Jun 2014 22:30:02 +0000 (22:30 +0000)]
am 78dfcb3a: Merge "revised homepage to use static version of top banner" into klp-modular-dev

* commit '78dfcb3aba8883ae13c62103172277dda32d87f1':
  revised homepage to use static version of top banner

10 years agoam 845835c7: am 2d7b3ded: Merge "ExoPlayer developer guide" into klp-docs
Joe Fernandez [Fri, 20 Jun 2014 21:46:57 +0000 (21:46 +0000)]
am 845835c7: am 2d7b3ded: Merge "ExoPlayer developer guide" into klp-docs

* commit '845835c779557392c1b25a25082f6fe66ed0f066':
  ExoPlayer developer guide

10 years agofix build
Robert Ly [Fri, 20 Jun 2014 21:42:12 +0000 (14:42 -0700)]
fix build

Change-Id: I9d9610137823656b63e5983ba93d390b2ab4cabc

10 years agoam 2d7b3ded: Merge "ExoPlayer developer guide" into klp-docs
Joe Fernandez [Fri, 20 Jun 2014 21:41:30 +0000 (21:41 +0000)]
am 2d7b3ded: Merge "ExoPlayer developer guide" into klp-docs

* commit '2d7b3dedd0ddccd5a44b7c289f5075ea1696c06c':
  ExoPlayer developer guide

10 years agoMerge "docs: l-preview fixes" into klp-modular-dev
Robert Ly [Mon, 23 Jun 2014 05:48:09 +0000 (05:48 +0000)]
Merge "docs: l-preview fixes" into klp-modular-dev

10 years agodocs: l-preview fixes
Robert Ly [Mon, 23 Jun 2014 05:07:51 +0000 (22:07 -0700)]
docs: l-preview fixes

Change-Id: Ib51775739304118df10051f312de35dcca9bf179

10 years agoMerge "docs: remove description text for index" into klp-modular-dev
Robert Ly [Sat, 21 Jun 2014 21:08:44 +0000 (21:08 +0000)]
Merge "docs: remove description text for index" into klp-modular-dev

10 years agodocs: remove description text for index
Robert Ly [Sat, 21 Jun 2014 21:01:14 +0000 (14:01 -0700)]
docs: remove description text for index

Change-Id: I750e4d34ff37e52c39eb764131f82a23360e7c28

10 years agoMerge "docs: Updated Support page for L Developer Preview." into klp-modular-dev
Quddus Chong [Sat, 21 Jun 2014 20:46:22 +0000 (20:46 +0000)]
Merge "docs: Updated Support page for L Developer Preview." into klp-modular-dev

10 years agodocs: Updated Support page for L Developer Preview.
Quddus Chong [Sat, 21 Jun 2014 01:50:01 +0000 (18:50 -0700)]
docs: Updated Support page for L Developer Preview.

Change-Id: Ib890188994cf4f23b20ec7d037db368bac2b620b

10 years agoMerge "docs: add whitelisting instructions and new index icons" into klp-modular-dev
Robert Ly [Sat, 21 Jun 2014 07:58:18 +0000 (07:58 +0000)]
Merge "docs: add whitelisting instructions and new index icons" into klp-modular-dev

10 years agodocs: add whitelisting instructions and new index icons
Robert Ly [Sat, 21 Jun 2014 07:56:48 +0000 (00:56 -0700)]
docs: add whitelisting instructions and new index icons

Change-Id: If720e2a5c3cae1d5cceff397d06001e551443fce

10 years agoMerge "Make WindowInsets.isRound work with emulator" into klp-modular-dev
Michael Kolb [Fri, 20 Jun 2014 22:20:14 +0000 (22:20 +0000)]
Merge "Make WindowInsets.isRound work with emulator" into klp-modular-dev

10 years agoMake WindowInsets.isRound work with emulator
Michael Kolb [Fri, 20 Jun 2014 20:28:44 +0000 (13:28 -0700)]
Make WindowInsets.isRound work with emulator

  Bug: 15775489

Change-Id: I53a14ccd3be776d46c9cea43c0d5d3f41674dd75

10 years agoMerge "docs: fix l preview bugs" into klp-modular-dev
Robert Ly [Fri, 20 Jun 2014 21:14:38 +0000 (21:14 +0000)]
Merge "docs: fix l preview bugs" into klp-modular-dev

10 years agodocs: fix l preview bugs
Robert Ly [Fri, 20 Jun 2014 16:33:39 +0000 (09:33 -0700)]
docs: fix l preview bugs

Change-Id: Ic89fea620ba458c604ccdeeb6da471c807a71fef

10 years agoMerge "Move emulator check & save system properties access" into klp-modular-dev
Michael Kolb [Fri, 20 Jun 2014 23:15:59 +0000 (23:15 +0000)]
Merge "Move emulator check & save system properties access" into klp-modular-dev

10 years agoMove emulator check & save system properties access
Michael Kolb [Fri, 20 Jun 2014 22:39:04 +0000 (15:39 -0700)]
Move emulator check & save system properties access

  Bug: 15775489

Change-Id: I375aee36b212ae044101a65b65c51e6f889fd263

10 years agoam d24f5577: Merge "Use openssl\'s SHA1 instead of bionic\'s."
Dan Albert [Fri, 20 Jun 2014 19:53:36 +0000 (19:53 +0000)]
am d24f5577: Merge "Use openssl\'s SHA1 instead of bionic\'s."

* commit 'd24f557798d04bdd50f2a45e48b70b009a205b4a':
  Use openssl's SHA1 instead of bionic's.

10 years agoam 1b3a5217: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Fri, 20 Jun 2014 19:48:52 +0000 (19:48 +0000)]
am 1b3a5217: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev

* commit '1b3a52170ab0f2ec82532a689d271eaf8b8997f9':
  Import translations. DO NOT MERGE

10 years agoam c9334fb1: fix typo on lmp-prev page
Robert Ly [Fri, 20 Jun 2014 19:48:48 +0000 (19:48 +0000)]
am c9334fb1: fix typo on lmp-prev page

* commit 'c9334fb1b884031ad0f522085542e80e71f73685':
  fix typo on lmp-prev page

10 years agoam 3323e554: Merge "add new image and landing page for l-preview" into klp-modular-dev
Robert Ly [Fri, 20 Jun 2014 19:48:40 +0000 (19:48 +0000)]
am 3323e554: Merge "add new image and landing page for l-preview" into klp-modular-dev

* commit '3323e554391e7cf5ddba03d9f468c8acfb35ee0e':
  add new image and landing page for l-preview

10 years agoAPI Review: Change View viewName attribute to transitionName.
George Mount [Wed, 18 Jun 2014 20:34:35 +0000 (13:34 -0700)]
API Review: Change View viewName attribute to transitionName.

Bug 15548520

Change-Id: I4009458d83dbffb20ff0100aaa42eea44d943378

10 years agoam ff6b0e24: am f1896106: Merge "Fixed VM memory leak in AudioSystem JNI interface"
Elliott Hughes [Fri, 20 Jun 2014 16:34:36 +0000 (16:34 +0000)]
am ff6b0e24: am f1896106: Merge "Fixed VM memory leak in AudioSystem JNI interface"

* commit 'ff6b0e24725c642f0681e214f143a8151e4e6bea':
  Fixed VM memory leak in AudioSystem JNI interface

10 years agoam f1896106: Merge "Fixed VM memory leak in AudioSystem JNI interface"
Elliott Hughes [Fri, 20 Jun 2014 16:30:40 +0000 (16:30 +0000)]
am f1896106: Merge "Fixed VM memory leak in AudioSystem JNI interface"

* commit 'f18961066b7029652dacb9016bacbf192a6cf73d':
  Fixed VM memory leak in AudioSystem JNI interface

10 years agomake buttons "primary" red
smain@google.com [Fri, 20 Jun 2014 05:33:50 +0000 (22:33 -0700)]
make buttons "primary" red

Change-Id: Ife5f2b565f52621df953593b9b3bd7cc05500f81

10 years agoMerge "Adds cross-profile intent filters for the Settings app"
Alexandra Gherghina [Mon, 23 Jun 2014 09:54:09 +0000 (09:54 +0000)]
Merge "Adds cross-profile intent filters for the Settings app"

10 years agoFix missing param to system audio mode action.
Jungshik Jang [Mon, 23 Jun 2014 07:00:07 +0000 (16:00 +0900)]
Fix missing param to system audio mode action.

Change-Id: I3a4aa3dcdcf8378b51e86367f9bca1fc87a28603

10 years agoMerge "Use openssl's SHA1 instead of bionic's."
Dan Albert [Fri, 20 Jun 2014 19:51:20 +0000 (19:51 +0000)]
Merge "Use openssl's SHA1 instead of bionic's."

10 years agoMerge "Fixed VM memory leak in AudioSystem JNI interface"
Elliott Hughes [Fri, 20 Jun 2014 16:26:45 +0000 (16:26 +0000)]
Merge "Fixed VM memory leak in AudioSystem JNI interface"

10 years agoMerge "docs: fix margins and add partners back" into klp-modular-dev
Robert Ly [Fri, 20 Jun 2014 21:14:24 +0000 (21:14 +0000)]
Merge "docs: fix margins and add partners back" into klp-modular-dev

10 years agodocs: fix margins and add partners back
Robert Ly [Fri, 20 Jun 2014 04:23:46 +0000 (21:23 -0700)]
docs: fix margins and add partners back

Change-Id: I0430079f136fb6197a9a53e44f55a0292d8975a7

10 years agoMerge "remove extraneous tag causing extra spacing between heading/text." into klp...
Dirk Dougherty [Sat, 21 Jun 2014 02:29:54 +0000 (02:29 +0000)]
Merge "remove extraneous tag causing extra spacing between heading/text." into klp-docs

10 years agoMerge "revised homepage to use static version of top banner" into klp-modular-dev
smain@google.com [Fri, 20 Jun 2014 01:29:18 +0000 (01:29 +0000)]
Merge "revised homepage to use static version of top banner" into klp-modular-dev

10 years agorevised homepage to use static version of top banner
smain@google.com [Fri, 20 Jun 2014 00:06:54 +0000 (17:06 -0700)]
revised homepage to use static version of top banner

Change-Id: Id337f67640a648cf28cbf20ccd2dba1524475aae

10 years agoMerge "Do not delete stack if empty task is being reused." into klp-modular-dev
Craig Mautner [Fri, 20 Jun 2014 22:35:07 +0000 (22:35 +0000)]
Merge "Do not delete stack if empty task is being reused." into klp-modular-dev

10 years agoDo not delete stack if empty task is being reused.
Craig Mautner [Fri, 20 Jun 2014 21:04:39 +0000 (14:04 -0700)]
Do not delete stack if empty task is being reused.

If a task is being cleared due to Intent flags and that clearing
was causing the last activity in the last task on a stack to be
deleted, then we were deleting the stack. Immediately after
this we were refilling the task with the same activity but the
stack had already been deleted.

This fix preserves the task and stack when it is only being
cleared for the new activity.

Fixes bug 15611901.

Change-Id: I7bcfa826d0852d9c640daa73fe1324b89471fecd

10 years agoMerge "ExoPlayer developer guide" into klp-docs
Joe Fernandez [Fri, 20 Jun 2014 21:36:25 +0000 (21:36 +0000)]
Merge "ExoPlayer developer guide" into klp-docs

10 years agoExoPlayer developer guide
Joe Fernandez [Wed, 11 Jun 2014 06:45:58 +0000 (23:45 -0700)]
ExoPlayer developer guide

Change-Id: Icacaa0e68e602fc77946e10729b3649baaf4331b

10 years agoMerge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Fri, 20 Jun 2014 00:08:58 +0000 (00:08 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev

10 years agofix typo on lmp-prev page
Robert Ly [Fri, 20 Jun 2014 00:00:55 +0000 (17:00 -0700)]
fix typo on lmp-prev page

Change-Id: I3cc4c457d12c71a466b2be16022ac1e6835227b3

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 19 Jun 2014 23:53:45 +0000 (16:53 -0700)]
Import translations. DO NOT MERGE

Change-Id: I7f78f8188fd6b2f04f96a5846c13314687c2554e
Auto-generated-cl: translation import

10 years agoMerge "Add for System Audio Mode"
Jungshik Jang [Mon, 23 Jun 2014 06:44:41 +0000 (06:44 +0000)]
Merge "Add for System Audio Mode"

10 years agoFix native calls to null pointer
Wonsik Kim [Fri, 20 Jun 2014 08:27:32 +0000 (17:27 +0900)]
Fix native calls to null pointer

Since DEVICE_AVAILABLE event fires right after initialization, it
could happen before TvInputHal.mPtr is set, which causes calls to
null pointer. Fix the bug by allowing TvInputHal to wait for mPtr to
be set before calling native methods.

Change-Id: Id07f15130beb69f77c16bf3c735285c31ae4a3a4

10 years agoAdd for System Audio Mode
Jungshik Jang [Thu, 19 Jun 2014 13:19:20 +0000 (22:19 +0900)]
Add for System Audio Mode

Note that this is skeleton change and do not merge
till get full review from outside of CEC team.

This change introduce four apis for System Audio Mode

1. boolean canChangeSystemAudioMode()
  -  Whether to change system audio mode or not.

2. setSystemAudioMode(boolean enabled, IHdmiControlCallback callback);
  - Change system audio mode.

3. add/removeSystemAudioModeChangeLister.
  - Register/deregister listner for AudioModeChange.

4. getSystemAudioMode()
  - Whether to system audio is enabled or not.

Change-Id: I1e82365155a9f7f6c3ac5d9db4871cf6bad46865

10 years agoMerge "Add a permission resource for the protected media id."
Yuncheol Heo [Sun, 22 Jun 2014 23:16:44 +0000 (23:16 +0000)]
Merge "Add a permission resource for the protected media id."

10 years agoam 1fd580b7: am 5d9681a3: docs: auto landing cleanup
Robert Ly [Sun, 22 Jun 2014 18:42:15 +0000 (18:42 +0000)]
am 1fd580b7: am 5d9681a3: docs: auto landing cleanup

* commit '1fd580b7c30529e772e3a1ce4ba6c55df689045d':
  docs: auto landing cleanup

10 years agoMobile_radio in battery history is not accurate
Wink Saville [Wed, 18 Jun 2014 23:43:14 +0000 (16:43 -0700)]
Mobile_radio in battery history is not accurate

Invoke TelephonyManager#listen to connect mPhoneStateListener to receive
the notifications.

Bug: 15568103
Change-Id: I5a3fa6347704e96ceb34289f74ba6e3157bbb333

10 years agoam d62cb584: am e7e8c1b4: Merge "docs: Further work on the Android Auto dev site...
Robert Ly [Sun, 22 Jun 2014 09:52:25 +0000 (09:52 +0000)]
am d62cb584: am e7e8c1b4: Merge "docs: Further work on the Android Auto dev site  Added partner logos (car OEMs, aftermarket, apps)  Added platform screenshots to the hero page" into klp-modular-dev

* commit 'd62cb5843ae01ee01b51fbcd56c029116aad34cf':
  docs: Further work on the Android Auto dev site  Added partner logos (car OEMs, aftermarket, apps)  Added platform screenshots to the hero page

10 years agoam ee80a268: am d7208fda: Merge "docs: remove description text for index" into klp...
Robert Ly [Sun, 22 Jun 2014 09:52:20 +0000 (09:52 +0000)]
am ee80a268: am d7208fda: Merge "docs: remove description text for index" into klp-modular-dev

* commit 'ee80a268ac8ce77c36448ed89720f0d78ff36f99':
  docs: remove description text for index

10 years agoam aef3e9e6: am 1aa273e0: Merge "docs: Updated Support page for L Developer Preview...
Quddus Chong [Sun, 22 Jun 2014 09:52:11 +0000 (09:52 +0000)]
am aef3e9e6: am 1aa273e0: Merge "docs: Updated Support page for L Developer Preview." into klp-modular-dev

* commit 'aef3e9e6fd313dd30acdbd6c40b8b5e12b181f49':
  docs: Updated Support page for L Developer Preview.

10 years agoam 901866cc: am efa289e2: docs: add device icons for index page
Robert Ly [Sun, 22 Jun 2014 09:52:03 +0000 (09:52 +0000)]
am 901866cc: am efa289e2: docs: add device icons for index page

* commit '901866ccd0e9f2c202e3200acf1a212cf7f1c260':
  docs: add device icons for index page

10 years agoam 54a7b932: am 50f08149: Merge "docs: add whitelisting instructions and new index...
Robert Ly [Sun, 22 Jun 2014 01:16:45 +0000 (01:16 +0000)]
am 54a7b932: am 50f08149: Merge "docs: add whitelisting instructions and new index icons" into klp-modular-dev

* commit '54a7b9325bfb55d124dd66534a2fdca60093ea7e':
  docs: add whitelisting instructions and new index icons

10 years agoam da6b3222: am ceaa57c9: am 39b707c8: am bf66c17e: Merge "remove extraneous tag...
Dirk Dougherty [Sun, 22 Jun 2014 01:16:39 +0000 (01:16 +0000)]
am da6b3222: am ceaa57c9: am 39b707c8: am bf66c17e: Merge "remove extraneous tag causing extra spacing between heading/text." into klp-docs

* commit 'da6b32226a40abaeeca3e00780ddffd3cd554241':
  remove extraneous tag causing extra spacing between heading/text.

10 years agoam 92cb2a75: am e77f41a6: prettier sdk buttons
smain@google.com [Sun, 22 Jun 2014 01:16:34 +0000 (01:16 +0000)]
am 92cb2a75: am e77f41a6: prettier sdk buttons

* commit '92cb2a75222d4b0055f155ae6f243925a4801403':
  prettier sdk buttons

10 years agoam 9ea14362: am 941f800a: update Edu pages for launch of Chrome edu apps on play...
smain@google.com [Sun, 22 Jun 2014 01:16:29 +0000 (01:16 +0000)]
am 9ea14362: am 941f800a: update Edu pages for launch of Chrome edu apps on play store removes the FAQ and Guidelines docs, redirect to devsite copy will be implemented with separate CL

* commit '9ea14362554e412564a65821a47762c4f28b87a9':
  update Edu pages for launch of Chrome edu apps on play store removes the FAQ and Guidelines docs, redirect to devsite copy will be implemented with separate CL

10 years agoam 3a4924d4: am 371d68cc: add link back to main dev site home
smain@google.com [Sun, 22 Jun 2014 01:16:24 +0000 (01:16 +0000)]
am 3a4924d4: am 371d68cc: add link back to main dev site home

* commit '3a4924d417640c13f9418a6dd1d68303b8b21e10':
  add link back to main dev site home

10 years agoam c6ffc840: am 270c099f: Merge "Move emulator check & save system properties access...
Michael Kolb [Sun, 22 Jun 2014 01:16:19 +0000 (01:16 +0000)]
am c6ffc840: am 270c099f: Merge "Move emulator check & save system properties access" into klp-modular-dev

* commit 'c6ffc840c4e34a61b537e1fc3e90b111d4150244':
  Move emulator check & save system properties access

10 years agoresolved conflicts for merge of aaadf922 to master
Craig Mautner [Sun, 22 Jun 2014 01:11:33 +0000 (18:11 -0700)]
resolved conflicts for merge of aaadf922 to master

Change-Id: I8b89a326453fc8827a84eb9516271d2bf3b71e2c

10 years agoam 3daec197: Merge "LayoutLib: Better support for compact/elegant fonts." into lmp...
Deepanshu Gupta [Sat, 21 Jun 2014 23:35:51 +0000 (23:35 +0000)]
am 3daec197: Merge "LayoutLib: Better support for compact/elegant fonts." into lmp-preview-dev

* commit '3daec1972493c1e867c6cac7f4a2a43a157d52b9':
  LayoutLib: Better support for compact/elegant fonts.

10 years agoam f791b120: Merge "Material navigation bar for layoutlib." into lmp-preview-dev
Deepanshu Gupta [Sat, 21 Jun 2014 23:35:43 +0000 (23:35 +0000)]
am f791b120: Merge "Material navigation bar for layoutlib." into lmp-preview-dev

* commit 'f791b1205192e525590f72c465e7e4c185112eb0':
  Material navigation bar for layoutlib.

10 years agoam 71f65485: am db9fed74: Merge "Make WindowInsets.isRound work with emulator" into...
Michael Kolb [Sat, 21 Jun 2014 20:24:28 +0000 (20:24 +0000)]
am 71f65485: am db9fed74: Merge "Make WindowInsets.isRound work with emulator" into klp-modular-dev

* commit '71f65485bf47c8bfbae2b3a0a9573b311668b4a2':
  Make WindowInsets.isRound work with emulator