OSDN Git Service

android-x86/frameworks-base.git
9 years agoam 0886dcc7: Merge "add time-in-mode metrics for zen mode" into mnc-dev
Chris Wren [Fri, 29 May 2015 21:47:21 +0000 (21:47 +0000)]
am 0886dcc7: Merge "add time-in-mode metrics for zen mode" into mnc-dev

* commit '0886dcc7686cfa1ecfb497cadc92479a84a14945':
  add time-in-mode metrics for zen mode

9 years agoam e67f67da: Merge "Hide KeyguardMessageArea if empty" into mnc-dev
Adrian Roos [Fri, 29 May 2015 21:47:14 +0000 (21:47 +0000)]
am e67f67da: Merge "Hide KeyguardMessageArea if empty" into mnc-dev

* commit 'e67f67da9a41bd089b980c04c1721f52adebb389':
  Hide KeyguardMessageArea if empty

9 years agoMerge "add time-in-mode metrics for zen mode" into mnc-dev
Chris Wren [Fri, 29 May 2015 21:33:57 +0000 (21:33 +0000)]
Merge "add time-in-mode metrics for zen mode" into mnc-dev

9 years agoMerge "Hide KeyguardMessageArea if empty" into mnc-dev
Adrian Roos [Fri, 29 May 2015 21:33:08 +0000 (21:33 +0000)]
Merge "Hide KeyguardMessageArea if empty" into mnc-dev

9 years agoam ce48c1c1: Allow INADDR_NONE as a valid configuration in AGpsStatus_v3. b/21516868
destradaa [Fri, 29 May 2015 21:27:46 +0000 (21:27 +0000)]
am ce48c1c1: Allow INADDR_NONE as a valid configuration in AGpsStatus_v3. b/21516868

* commit 'ce48c1c1d8033e0bb62e0b24645b5c600c4adfc6':
  Allow INADDR_NONE as a valid configuration in AGpsStatus_v3. b/21516868

9 years agoam 650a9135: Merge "Revert "Rely on IMM#focusOut() to close input session."" into...
Yohei Yukawa [Fri, 29 May 2015 20:52:17 +0000 (20:52 +0000)]
am 650a9135: Merge "Revert "Rely on IMM#focusOut() to close input session."" into mnc-dev

* commit '650a91356b59fe4100f624c0b32d397ec00d51d9':
  Revert "Rely on IMM#focusOut() to close input session."

9 years agoam f042cd84: Merge "Update doc to include how clipToPadding affects EdgeEffect" into...
Doris Liu [Fri, 29 May 2015 20:52:12 +0000 (20:52 +0000)]
am f042cd84: Merge "Update doc to include how clipToPadding affects EdgeEffect" into mnc-dev

* commit 'f042cd841fcc6607bb84f8ddb25db3f4b6ddb3e0':
  Update doc to include how clipToPadding affects EdgeEffect

9 years agoam 815be147: Merge "Use AtomicFile APIs correctly when reading." into mnc-dev
Svetoslav [Fri, 29 May 2015 20:51:58 +0000 (20:51 +0000)]
am 815be147: Merge "Use AtomicFile APIs correctly when reading." into mnc-dev

* commit '815be147a35452d52feb0610ff11d8645351ad9f':
  Use AtomicFile APIs correctly when reading.

9 years agoam d377b067: Merge "Cleanup Binder token resetting." into mnc-dev
Alex Klyubin [Fri, 29 May 2015 20:51:51 +0000 (20:51 +0000)]
am d377b067: Merge "Cleanup Binder token resetting." into mnc-dev

* commit 'd377b067358bf27eda2f1bdb806b9394a78e757c':
  Cleanup Binder token resetting.

9 years agoam 2473e1e9: Merge "Zen: Dim status bar alarm icon when zen = total silence." into...
John Spurlock [Fri, 29 May 2015 20:51:46 +0000 (20:51 +0000)]
am 2473e1e9: Merge "Zen: Dim status bar alarm icon when zen = total silence." into mnc-dev

* commit '2473e1e92241b532294524afb9e668497cd86258':
  Zen: Dim status bar alarm icon when zen = total silence.

9 years agoam 2400197f: Enable Keyguard debug logging
Jorim Jaggi [Fri, 29 May 2015 20:51:39 +0000 (20:51 +0000)]
am 2400197f: Enable Keyguard debug logging

* commit '2400197f10ff2ca8d393eac47a65a09dc0cea3e9':
  Enable Keyguard debug logging

9 years agoAllow INADDR_NONE as a valid configuration in AGpsStatus_v3.
destradaa [Fri, 29 May 2015 20:47:39 +0000 (13:47 -0700)]
Allow INADDR_NONE as a valid configuration in AGpsStatus_v3.
b/21516868

This change makes AGpsStatus_v3 consistent and compatible with the behavior
of AGpsStatus_v2.

Change-Id: Ia4e729d8ed1d61b51ae22c7eaf9bbe33f31b7a45

9 years agoMerge "Revert "Rely on IMM#focusOut() to close input session."" into mnc-dev
Yohei Yukawa [Fri, 29 May 2015 20:41:24 +0000 (20:41 +0000)]
Merge "Revert "Rely on IMM#focusOut() to close input session."" into mnc-dev

9 years agoMerge "Update doc to include how clipToPadding affects EdgeEffect" into mnc-dev
Doris Liu [Fri, 29 May 2015 20:28:19 +0000 (20:28 +0000)]
Merge "Update doc to include how clipToPadding affects EdgeEffect" into mnc-dev

9 years agoRevert "Rely on IMM#focusOut() to close input session."
Yohei Yukawa [Fri, 29 May 2015 18:07:02 +0000 (11:07 -0700)]
Revert "Rely on IMM#focusOut() to close input session."

This reverts commit 41bb4953dad33b56b6d039d5bc87a574a0b70fe9.

Ib1b037594ebbb4ad4cf2d59e21c7a8ca9d8dc930 caused Bug 21508503.
Since it looks like a timing issue, many other applications
could be affected potentially.

Bug 21508503 implies that re-enabling IMM#focusOut() globally
requires much more work than we thought.  Probably the memory
leak found in Bug 20820914 should be addressed in a more
conservative way at the moment, e.g., by plumbing events from
ViewGroup to IMMS.

Bug: 21508503
Bug: 20820914
Change-Id: I2228ae0c48ad3d9e0b55875f0dcb5ef8c55b0c5f

9 years agoMerge "Use AtomicFile APIs correctly when reading." into mnc-dev
Svetoslav [Fri, 29 May 2015 20:02:53 +0000 (20:02 +0000)]
Merge "Use AtomicFile APIs correctly when reading." into mnc-dev

9 years agoUse AtomicFile APIs correctly when reading.
Svetoslav [Fri, 29 May 2015 20:00:32 +0000 (13:00 -0700)]
Use AtomicFile APIs correctly when reading.

21280155

Change-Id: I354ebac8fc91d8f28eec6016474a9521ff2a490d

9 years agoMerge "Cleanup Binder token resetting." into mnc-dev
Alex Klyubin [Fri, 29 May 2015 19:59:33 +0000 (19:59 +0000)]
Merge "Cleanup Binder token resetting." into mnc-dev

9 years agoMerge "Zen: Dim status bar alarm icon when zen = total silence." into mnc-dev
John Spurlock [Fri, 29 May 2015 19:50:06 +0000 (19:50 +0000)]
Merge "Zen: Dim status bar alarm icon when zen = total silence." into mnc-dev

9 years agoCleanup Binder token resetting.
Alex Klyubin [Fri, 29 May 2015 19:39:32 +0000 (12:39 -0700)]
Cleanup Binder token resetting.

This is a follow-up to 7cbcfd4fc1e538bd391a20cdd00dd1494ace2d0e where
during the review it was pointed out that the code could be
streamlined.

Bug: 18088752
Change-Id: Iecb9fdbc31a0f3cdcb94ddb1b3e7e12a0543a231

9 years agoZen: Dim status bar alarm icon when zen = total silence.
John Spurlock [Fri, 29 May 2015 19:35:53 +0000 (15:35 -0400)]
Zen: Dim status bar alarm icon when zen = total silence.

Bug: 21359239
Change-Id: I5bf207c4c181869127ed8b90787cbd7d9bb0f6c2

9 years agoEnable Keyguard debug logging
Jorim Jaggi [Fri, 29 May 2015 19:32:48 +0000 (12:32 -0700)]
Enable Keyguard debug logging

Bug: 21320918
Change-Id: I2529bfb7cdaae6042bbc9e51340c7571a5a63ad0

9 years agoam 614b39f3: Merge "Refactor Android Keystore CipherSpi base class." into mnc-dev
Alex Klyubin [Fri, 29 May 2015 19:32:10 +0000 (19:32 +0000)]
am 614b39f3: Merge "Refactor Android Keystore CipherSpi base class." into mnc-dev

* commit '614b39f3de7747e9e1cd00d8985ec6fa9b356217':
  Refactor Android Keystore CipherSpi base class.

9 years agoam c1862737: am f253e7d5: am c4d39dfc: docs: Fix issue where images are not appearing...
Quddus Chong [Fri, 29 May 2015 19:22:34 +0000 (19:22 +0000)]
am c1862737: am f253e7d5: am c4d39dfc: docs: Fix issue where images are not appearing in mobile browsers. bug: 21517956

* commit 'c1862737f8fd5c1b366d488e22c020e565f543c3':
  docs: Fix issue where images are not appearing in mobile browsers. bug: 21517956

9 years agoam 2b26e8dc: Merge "Un-@hide some missed video APIs." into mnc-dev
Tyler Gunn [Fri, 29 May 2015 19:22:24 +0000 (19:22 +0000)]
am 2b26e8dc: Merge "Un-@hide some missed video APIs." into mnc-dev

* commit '2b26e8dcd130a371ef7ed170316766d0fbcd3212':
  Un-@hide some missed video APIs.

9 years agoam e648c5f1: Merge "Zen: Add warning text if total silence will eat the next alarm...
John Spurlock [Fri, 29 May 2015 19:22:17 +0000 (19:22 +0000)]
am e648c5f1: Merge "Zen: Add warning text if total silence will eat the next alarm." into mnc-dev

* commit 'e648c5f1cb41f72a3404a9a7d2656e764c52f8e1':
  Zen: Add warning text if total silence will eat the next alarm.

9 years agoam 1a23c317: Merge "Add algorithm aliases for Android Keystore HMACs." into mnc-dev
Alex Klyubin [Fri, 29 May 2015 19:22:11 +0000 (19:22 +0000)]
am 1a23c317: Merge "Add algorithm aliases for Android Keystore HMACs." into mnc-dev

* commit '1a23c31752f1295c708cf749a7828dc42e4e9d9e':
  Add algorithm aliases for Android Keystore HMACs.

9 years agoam 51c1e3bd: Merge "Clarify AudioFormat sample rate and encoding documentation" into...
Andy Hung [Fri, 29 May 2015 19:22:04 +0000 (19:22 +0000)]
am 51c1e3bd: Merge "Clarify AudioFormat sample rate and encoding documentation" into mnc-dev

* commit '51c1e3bd149d2e10e68ad72fd7d25ef826a6075c':
  Clarify AudioFormat sample rate and encoding documentation

9 years agoam 2280218a: Merge "Don\'t use string that has been removed." into mnc-dev
Jason Monk [Fri, 29 May 2015 19:21:58 +0000 (19:21 +0000)]
am 2280218a: Merge "Don\'t use string that has been removed." into mnc-dev

* commit '2280218a93cbda885a7530f3b30c3d8d4b3a1ff6':
  Don't use string that has been removed.

9 years agoam e5c38788: am 92614179: am dedc768f: Fix typo
Glenn Kasten [Fri, 29 May 2015 19:21:44 +0000 (19:21 +0000)]
am e5c38788: am 92614179: am dedc768f: Fix typo

* commit 'e5c3878864993a974d48b11790106adb2a09031c':
  Fix typo

9 years agoam 63b6320a: Merge "assist: Fix reported colors/styles for TextView/Switch" into...
James Cook [Fri, 29 May 2015 19:21:37 +0000 (19:21 +0000)]
am 63b6320a: Merge "assist: Fix reported colors/styles for TextView/Switch" into mnc-dev

* commit '63b6320af4302c0d190bbfaba739049b59c2418b':
  assist: Fix reported colors/styles for TextView/Switch

9 years agoam 85b039f3: Merge "Move ZoneGetter into SettingsLib" into mnc-dev
Tony Mantler [Fri, 29 May 2015 19:20:57 +0000 (19:20 +0000)]
am 85b039f3: Merge "Move ZoneGetter into SettingsLib" into mnc-dev

* commit '85b039f3488d15a926993b9df2a550a01a1938a4':
  Move ZoneGetter into SettingsLib

9 years agoam 55b4b2d5: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into mnc-dev
Geoff Mendal [Fri, 29 May 2015 19:20:42 +0000 (19:20 +0000)]
am 55b4b2d5: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into mnc-dev

* commit '55b4b2d5a82ef7999a32b8163340a15085b2df38':
  Revert "Import translations. DO NOT MERGE"

9 years agoam 8320436c: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into mnc-dev
Geoff Mendal [Fri, 29 May 2015 19:20:34 +0000 (19:20 +0000)]
am 8320436c: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into mnc-dev

* commit '8320436ce559ba6b80e32bf24d5917fe7ee6c241':
  Revert "Import translations. DO NOT MERGE"

9 years agoam 99177687: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into mnc-dev
Geoff Mendal [Fri, 29 May 2015 19:20:23 +0000 (19:20 +0000)]
am 99177687: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into mnc-dev

* commit '9917768736f7d8581ee094267d2a4e5ca2b31cbf':
  Revert "Import translations. DO NOT MERGE"

9 years agoam 4402f4bb: Merge "Tuner: add battery pct preference." into mnc-dev
John Spurlock [Fri, 29 May 2015 19:20:17 +0000 (19:20 +0000)]
am 4402f4bb: Merge "Tuner: add battery pct preference." into mnc-dev

* commit '4402f4bb12cc70eef3bae20631a4a9fe210c7c80':
  Tuner: add battery pct preference.

9 years agoam e7961129: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Fri, 29 May 2015 19:19:57 +0000 (19:19 +0000)]
am e7961129: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit 'e796112904a737e61f2ecce3f0fd42d2cba25436':
  Import translations. DO NOT MERGE

9 years agoam 0bdf1aab: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Fri, 29 May 2015 19:19:52 +0000 (19:19 +0000)]
am 0bdf1aab: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '0bdf1aab31d110b9e9de819e34e922f13442bf53':
  Import translations. DO NOT MERGE

9 years agoam df55ecbf: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Fri, 29 May 2015 19:19:47 +0000 (19:19 +0000)]
am df55ecbf: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit 'df55ecbf9ccb18793338aa7eb04f0faec45889cd':
  Import translations. DO NOT MERGE

9 years agoam 78a247da: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Fri, 29 May 2015 19:19:41 +0000 (19:19 +0000)]
am 78a247da: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '78a247da5f21415657a9ab6f20d4d8449a13f734':
  Import translations. DO NOT MERGE

9 years agoam e103029d: Merge "Avoid keyguard UI layout dimensions underflow" into mnc-dev
Xiyuan Xia [Fri, 29 May 2015 19:19:27 +0000 (19:19 +0000)]
am e103029d: Merge "Avoid keyguard UI layout dimensions underflow" into mnc-dev

* commit 'e103029dbc457596661ae4066aabcb2a35f07dfd':
  Avoid keyguard UI layout dimensions underflow

9 years agoam 642c4fc5: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Fri, 29 May 2015 19:19:20 +0000 (19:19 +0000)]
am 642c4fc5: (-s ours) Import translations. DO NOT MERGE

* commit '642c4fc527da40cf4697d3630bdebdfc1044ab82':
  Import translations. DO NOT MERGE

9 years agoam d644c563: Merge "Avoid inspecting packages twice to deduce ABIs for moves / instal...
Narayan Kamath [Fri, 29 May 2015 19:18:51 +0000 (19:18 +0000)]
am d644c563: Merge "Avoid inspecting packages twice to deduce ABIs for moves / installs." into mnc-dev

* commit 'd644c5638180d5d4218f34e1afb9e7782fc52e49':
  Avoid inspecting packages twice to deduce ABIs for moves / installs.

9 years agoam 6a299907: Merge "Zen: Use account name instead of calendar id in event conditions...
John Spurlock [Fri, 29 May 2015 19:18:45 +0000 (19:18 +0000)]
am 6a299907: Merge "Zen: Use account name instead of calendar id in event conditions." into mnc-dev

* commit '6a2999073ce4d4ac203e7e2d7b40aaaa794851d4':
  Zen: Use account name instead of calendar id in event conditions.

9 years agoam ff3bf4b1: Increased the falsing treashold for quick settings
Selim Cinek [Fri, 29 May 2015 19:18:36 +0000 (19:18 +0000)]
am ff3bf4b1: Increased the falsing treashold for quick settings

* commit 'ff3bf4b12f87d9aa552f517989f2b0dda4e43cc5':
  Increased the falsing treashold for quick settings

9 years agoam 34cca12b: am 906a91b4: am 08710f1b: Add video for families page. Add Studio versio...
Dirk Dougherty [Fri, 29 May 2015 19:18:31 +0000 (19:18 +0000)]
am 34cca12b: am 906a91b4: am 08710f1b: Add video for families page. Add Studio version reqts and beta notice for data binding lib. Add new gps video.

* commit '34cca12bbda96ea8aad86b0455eb61e4674a4616':
  Add video for families page. Add Studio version reqts and beta notice for data binding lib. Add new gps video.

9 years agoam 95af201a: am 2ed3a89c: am 90042a5f: Docs: Corrects technical content of one senten...
David Friedman [Fri, 29 May 2015 19:18:26 +0000 (19:18 +0000)]
am 95af201a: am 2ed3a89c: am 90042a5f: Docs: Corrects technical content of one sentence, and deletes another.

* commit '95af201aead0ce7dc5326220dd3ee8619a237ae6':
  Docs: Corrects technical content of one sentence, and deletes another.

9 years agoam 9bb76544: fix NPE in shutdown thread
Guang Zhu [Fri, 29 May 2015 19:18:19 +0000 (19:18 +0000)]
am 9bb76544: fix NPE in shutdown thread

* commit '9bb765448df43d41e0a3edb7de1d1641c9251c35':
  fix NPE in shutdown thread

9 years agoam 832654a8: am 2f85475c: am 7d36a250: docs: Quick spelling fix
Andrew Solovay [Fri, 29 May 2015 19:18:09 +0000 (19:18 +0000)]
am 832654a8: am 2f85475c: am 7d36a250: docs: Quick spelling fix

* commit '832654a8574b4371b5dc69216dd0b8377368fb5c':
  docs: Quick spelling fix

9 years agoam 6dddc7d1: Merge "Send a message with data in MediaController.MessageHandler.post...
Sungsoo Lim [Fri, 29 May 2015 19:18:01 +0000 (19:18 +0000)]
am 6dddc7d1: Merge "Send a message with data in MediaController.MessageHandler.post()" into mnc-dev

* commit '6dddc7d1a9ed7f94e37dd6127664e02e25ceb6c8':
  Send a message with data in MediaController.MessageHandler.post()

9 years agoMerge "Refactor Android Keystore CipherSpi base class." into mnc-dev
Alex Klyubin [Fri, 29 May 2015 19:15:17 +0000 (19:15 +0000)]
Merge "Refactor Android Keystore CipherSpi base class." into mnc-dev

9 years agoam f253e7d5: am c4d39dfc: docs: Fix issue where images are not appearing in mobile...
Quddus Chong [Fri, 29 May 2015 18:55:02 +0000 (18:55 +0000)]
am f253e7d5: am c4d39dfc: docs: Fix issue where images are not appearing in mobile browsers. bug: 21517956

* commit 'f253e7d547f22bb02ef943bd80f598ca30302bda':
  docs: Fix issue where images are not appearing in mobile browsers. bug: 21517956

9 years agoam c4d39dfc: docs: Fix issue where images are not appearing in mobile browsers. bug...
Quddus Chong [Fri, 29 May 2015 18:40:50 +0000 (18:40 +0000)]
am c4d39dfc: docs: Fix issue where images are not appearing in mobile browsers. bug: 21517956

* commit 'c4d39dfc6c00578d4f7b9970bc9b33b237a1da54':
  docs: Fix issue where images are not appearing in mobile browsers. bug: 21517956

9 years agodocs: Fix issue where images are not appearing in mobile browsers.
Quddus Chong [Fri, 29 May 2015 17:51:56 +0000 (10:51 -0700)]
docs: Fix issue where images are not appearing in mobile browsers.
bug: 21517956

Change-Id: Ia00a42cd5c195881885c2f2927ada9acf2e1f453

9 years agoUpdate doc to include how clipToPadding affects EdgeEffect
Doris Liu [Fri, 29 May 2015 00:26:46 +0000 (17:26 -0700)]
Update doc to include how clipToPadding affects EdgeEffect

Bug: 19126514
Change-Id: I72c6ac20b4c72421137d97f77da5425e74f2b09a

9 years agoMerge "Un-@hide some missed video APIs." into mnc-dev
Tyler Gunn [Fri, 29 May 2015 18:18:37 +0000 (18:18 +0000)]
Merge "Un-@hide some missed video APIs." into mnc-dev

9 years agoMerge "Zen: Add warning text if total silence will eat the next alarm." into mnc-dev
John Spurlock [Fri, 29 May 2015 18:07:35 +0000 (18:07 +0000)]
Merge "Zen: Add warning text if total silence will eat the next alarm." into mnc-dev

9 years agoMerge "Add algorithm aliases for Android Keystore HMACs." into mnc-dev
Alex Klyubin [Fri, 29 May 2015 18:01:07 +0000 (18:01 +0000)]
Merge "Add algorithm aliases for Android Keystore HMACs." into mnc-dev

9 years agoMerge "Clarify AudioFormat sample rate and encoding documentation" into mnc-dev
Andy Hung [Fri, 29 May 2015 17:51:49 +0000 (17:51 +0000)]
Merge "Clarify AudioFormat sample rate and encoding documentation" into mnc-dev

9 years agoMerge "Don't use string that has been removed." into mnc-dev
Jason Monk [Fri, 29 May 2015 17:50:49 +0000 (17:50 +0000)]
Merge "Don't use string that has been removed." into mnc-dev

9 years agoDon't use string that has been removed.
Jason Monk [Fri, 29 May 2015 17:44:32 +0000 (13:44 -0400)]
Don't use string that has been removed.

Change-Id: I60edc3f23f40e48013165dccab83af536582f1c4

9 years agoam 92614179: am dedc768f: Fix typo
Glenn Kasten [Fri, 29 May 2015 17:32:51 +0000 (17:32 +0000)]
am 92614179: am dedc768f: Fix typo

* commit '926141795c3115d674be2ed0a735e3b994e31c03':
  Fix typo

9 years agoMerge "assist: Fix reported colors/styles for TextView/Switch" into mnc-dev
James Cook [Fri, 29 May 2015 17:30:21 +0000 (17:30 +0000)]
Merge "assist: Fix reported colors/styles for TextView/Switch" into mnc-dev

9 years agoam dedc768f: Fix typo
Glenn Kasten [Fri, 29 May 2015 17:18:35 +0000 (17:18 +0000)]
am dedc768f: Fix typo

* commit 'dedc768f829908242bda75b56d4a77ff247d5609':
  Fix typo

9 years agoClarify AudioFormat sample rate and encoding documentation
Andy Hung [Thu, 28 May 2015 01:57:54 +0000 (18:57 -0700)]
Clarify AudioFormat sample rate and encoding documentation

Bug: 21476142
Change-Id: I74fa3fcced5cc197a4cee6a7c10f3ed4690b0af1

9 years agoUn-@hide some missed video APIs.
Tyler Gunn [Fri, 29 May 2015 17:05:46 +0000 (10:05 -0700)]
Un-@hide some missed video APIs.

- renamed some methods to match what is in the non-remote version of
the API.
- Renamed RemoteConnection.VideoProvider.Listener to Callback.

Bug: 21474356
Change-Id: I4840e19921dafb4db288a4f8362b14d5dfa0aea1

9 years agoAdd algorithm aliases for Android Keystore HMACs.
Alex Klyubin [Fri, 29 May 2015 17:01:55 +0000 (10:01 -0700)]
Add algorithm aliases for Android Keystore HMACs.

The aliases have been copied from Conscrypt.

Bug: 18088752
Change-Id: I1c66d8c3655f57db41cc0b9cc88d08b44b4a774b

9 years agoRefactor Android Keystore CipherSpi base class.
Alex Klyubin [Thu, 28 May 2015 18:07:19 +0000 (11:07 -0700)]
Refactor Android Keystore CipherSpi base class.

This makes Android Keystore's CipherSpi base class suitable for
implementing AES and RSA ciphers. Previously, the class was heavily
biased towards only AES.

Bug: 18088752
Change-Id: I6bd1ca54165592d28482e56471dcfe0344337cf4

9 years agoMerge "Move ZoneGetter into SettingsLib" into mnc-dev
Tony Mantler [Fri, 29 May 2015 16:44:28 +0000 (16:44 +0000)]
Merge "Move ZoneGetter into SettingsLib" into mnc-dev

9 years agoadd time-in-mode metrics for zen mode
Chris Wren [Wed, 27 May 2015 22:25:17 +0000 (18:25 -0400)]
add time-in-mode metrics for zen mode

Emit log whenever the mode changes, or periodically to catch devices that stay
in one mode for long stretches of time.

Bug: 20264417
Change-Id: I4efde180eef23c2afc34c6c2e78ef4d0b6c5b675

9 years agoZen: Add warning text if total silence will eat the next alarm.
John Spurlock [Fri, 29 May 2015 16:04:21 +0000 (12:04 -0400)]
Zen: Add warning text if total silence will eat the next alarm.

Bug: 21359239
Change-Id: I8a69738e6488f40f24eed622529c913b6c3865a0

9 years agoMerge "Revert "Import translations. DO NOT MERGE"" into mnc-dev
Geoff Mendal [Fri, 29 May 2015 15:57:50 +0000 (15:57 +0000)]
Merge "Revert "Import translations. DO NOT MERGE"" into mnc-dev

9 years agoRevert "Import translations. DO NOT MERGE"
Geoff Mendal [Fri, 29 May 2015 15:57:37 +0000 (15:57 +0000)]
Revert "Import translations. DO NOT MERGE"

This reverts commit 27c652fd0293e707110165eb1f8918f489b50fca.

Change-Id: Idb1365c91c67c0eb8f472bf6f9ace1b6429e3b0e

9 years agoMerge "Revert "Import translations. DO NOT MERGE"" into mnc-dev
Geoff Mendal [Fri, 29 May 2015 15:33:29 +0000 (15:33 +0000)]
Merge "Revert "Import translations. DO NOT MERGE"" into mnc-dev

9 years agoRevert "Import translations. DO NOT MERGE"
Geoff Mendal [Fri, 29 May 2015 15:33:18 +0000 (15:33 +0000)]
Revert "Import translations. DO NOT MERGE"

This reverts commit f3173d8a1797fd812997b9246502a05df0591363.

Change-Id: I7e24d340c24f7ba4b67a72d54e57c3558caa7267

9 years agoFix typo
Glenn Kasten [Fri, 29 May 2015 15:11:24 +0000 (08:11 -0700)]
Fix typo

Change-Id: I21ff7773056975b6941a5f1126d43b2e04aa5cd5

9 years agoMerge "Revert "Import translations. DO NOT MERGE"" into mnc-dev
Geoff Mendal [Fri, 29 May 2015 15:04:51 +0000 (15:04 +0000)]
Merge "Revert "Import translations. DO NOT MERGE"" into mnc-dev

9 years agoRevert "Import translations. DO NOT MERGE"
Geoff Mendal [Fri, 29 May 2015 15:04:40 +0000 (15:04 +0000)]
Revert "Import translations. DO NOT MERGE"

This reverts commit 29af96c4486c1baf8601482e54e6886139f49546.

Change-Id: Ie95b16f0ad99994e375484f1f2c6e99debbee37d

9 years agoMerge "Tuner: add battery pct preference." into mnc-dev
John Spurlock [Fri, 29 May 2015 15:03:14 +0000 (15:03 +0000)]
Merge "Tuner: add battery pct preference." into mnc-dev

9 years agoTuner: add battery pct preference.
John Spurlock [Fri, 29 May 2015 14:48:22 +0000 (10:48 -0400)]
Tuner: add battery pct preference.

And fix questionable code organization choices in BatteryMeterView.

Change-Id: I7c13197892b33aa0df9af51fbabb81e0ad0e00e1

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Fri, 29 May 2015 14:51:55 +0000 (14:51 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Fri, 29 May 2015 14:51:27 +0000 (14:51 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Fri, 29 May 2015 14:50:28 +0000 (14:50 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Fri, 29 May 2015 14:49:43 +0000 (14:49 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Fri, 29 May 2015 14:38:08 +0000 (09:38 -0500)]
Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Fri, 29 May 2015 14:31:36 +0000 (07:31 -0700)]
Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Fri, 29 May 2015 14:28:27 +0000 (09:28 -0500)]
Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Fri, 29 May 2015 14:27:57 +0000 (07:27 -0700)]
Import translations. DO NOT MERGE

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

9 years agoMerge "Avoid keyguard UI layout dimensions underflow" into mnc-dev
Xiyuan Xia [Fri, 29 May 2015 14:24:20 +0000 (14:24 +0000)]
Merge "Avoid keyguard UI layout dimensions underflow" into mnc-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Fri, 29 May 2015 14:10:35 +0000 (09:10 -0500)]
Import translations. DO NOT MERGE

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

9 years agoMerge "Avoid inspecting packages twice to deduce ABIs for moves / installs." into...
Narayan Kamath [Fri, 29 May 2015 14:04:40 +0000 (14:04 +0000)]
Merge "Avoid inspecting packages twice to deduce ABIs for moves / installs." into mnc-dev

9 years agoAvoid inspecting packages twice to deduce ABIs for moves / installs.
Narayan Kamath [Thu, 28 May 2015 10:23:57 +0000 (11:23 +0100)]
Avoid inspecting packages twice to deduce ABIs for moves / installs.

In the case of moves, we can use the existing ABIs from settings because
a move will not result in an ABI change. For new installs, we can just
use the ABI we deduced for compiling (dex2oat) the package.

bug: 21144503
Change-Id: I35e2e8abd47f547b6252271fc6b41d30719c4298

9 years agoMerge "Zen: Use account name instead of calendar id in event conditions." into mnc-dev
John Spurlock [Fri, 29 May 2015 13:22:31 +0000 (13:22 +0000)]
Merge "Zen: Use account name instead of calendar id in event conditions." into mnc-dev

9 years agoIncreased the falsing treashold for quick settings
Selim Cinek [Fri, 29 May 2015 12:39:08 +0000 (05:39 -0700)]
Increased the falsing treashold for quick settings

Bug: 21433654
Change-Id: I593297e4577a40762e926353da046a53b9876245

9 years agoam 906a91b4: am 08710f1b: Add video for families page. Add Studio version reqts and...
Dirk Dougherty [Fri, 29 May 2015 07:00:58 +0000 (07:00 +0000)]
am 906a91b4: am 08710f1b: Add video for families page. Add Studio version reqts and beta notice for data binding lib. Add new gps video.

* commit '906a91b4e794015bb2609ded232bb50d4478c3c7':
  Add video for families page. Add Studio version reqts and beta notice for data binding lib. Add new gps video.

9 years agoam 08710f1b: Add video for families page. Add Studio version reqts and beta notice...
Dirk Dougherty [Fri, 29 May 2015 06:48:57 +0000 (06:48 +0000)]
am 08710f1b: Add video for families page. Add Studio version reqts and beta notice for data binding lib. Add new gps video.

* commit '08710f1b69e2188a439b54f1ae59a574f71681d0':
  Add video for families page. Add Studio version reqts and beta notice for data binding lib. Add new gps video.

9 years agoAdd video for families page. Add Studio version reqts and beta notice for data bindin...
Dirk Dougherty [Fri, 29 May 2015 05:01:36 +0000 (22:01 -0700)]
Add video for families page. Add Studio version reqts and beta notice for data binding lib. Add new gps video.

Change-Id: I7824c45a81078c1527a5b8bc20b2a9ac6773a5ad

9 years agoam 2ed3a89c: am 90042a5f: Docs: Corrects technical content of one sentence, and delet...
David Friedman [Fri, 29 May 2015 05:45:00 +0000 (05:45 +0000)]
am 2ed3a89c: am 90042a5f: Docs: Corrects technical content of one sentence, and deletes another.

* commit '2ed3a89c1b6c57b45b08ab9e6bcf29c33d82cdd2':
  Docs: Corrects technical content of one sentence, and deletes another.

9 years agoam 90042a5f: Docs: Corrects technical content of one sentence, and deletes another.
David Friedman [Fri, 29 May 2015 05:31:56 +0000 (05:31 +0000)]
am 90042a5f: Docs: Corrects technical content of one sentence, and deletes another.

* commit '90042a5f8c987582736f4eed714aeba9416003c6':
  Docs: Corrects technical content of one sentence, and deletes another.

9 years agoDocs: Corrects technical content of one sentence, and deletes another.
David Friedman [Fri, 29 May 2015 04:07:46 +0000 (21:07 -0700)]
Docs: Corrects technical content of one sentence, and deletes another.

Change-Id: Iaf894f9d9d68e4e2be9a1d1f8173b83a781241f4