OSDN Git Service

android-x86/frameworks-base.git
9 years agoam 8474bf48: (-s ours) am 8320436c: (-s ours) Merge "Revert "Import translations...
Geoff Mendal [Mon, 1 Jun 2015 15:25:42 +0000 (15:25 +0000)]
am 8474bf48: (-s ours) am 8320436c: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into mnc-dev

* commit '8474bf48aa37487270e335441005cea19515cf13':
  Revert "Import translations. DO NOT MERGE"

9 years agoam 6c15c153: (-s ours) am 99177687: (-s ours) Merge "Revert "Import translations...
Geoff Mendal [Mon, 1 Jun 2015 15:25:36 +0000 (15:25 +0000)]
am 6c15c153: (-s ours) am 99177687: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into mnc-dev

* commit '6c15c153fa831264f1134b703107acf40e206728':
  Revert "Import translations. DO NOT MERGE"

9 years agoam 8cf1276c: am 4402f4bb: Merge "Tuner: add battery pct preference." into mnc-dev
John Spurlock [Mon, 1 Jun 2015 15:25:31 +0000 (15:25 +0000)]
am 8cf1276c: am 4402f4bb: Merge "Tuner: add battery pct preference." into mnc-dev

* commit '8cf1276c8e08abcfe744309d3ce78f3e7b37ed31':
  Tuner: add battery pct preference.

9 years agoam 060b2ce9: (-s ours) am e7961129: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Mon, 1 Jun 2015 15:25:25 +0000 (15:25 +0000)]
am 060b2ce9: (-s ours) am e7961129: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '060b2ce9eaf77155024676f419ca37aa6c5ab895':
  Import translations. DO NOT MERGE

9 years agoam 76625fec: (-s ours) am 0bdf1aab: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Mon, 1 Jun 2015 15:25:20 +0000 (15:25 +0000)]
am 76625fec: (-s ours) am 0bdf1aab: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '76625fec224a0fffa0664060f72d6cc1a7e9ba49':
  Import translations. DO NOT MERGE

9 years agoam 57103ebf: (-s ours) am df55ecbf: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Mon, 1 Jun 2015 15:25:15 +0000 (15:25 +0000)]
am 57103ebf: (-s ours) am df55ecbf: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '57103ebfa6188b2c421ba860d7063b62ca935af5':
  Import translations. DO NOT MERGE

9 years agoam 408606f3: (-s ours) am 78a247da: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Mon, 1 Jun 2015 15:25:10 +0000 (15:25 +0000)]
am 408606f3: (-s ours) am 78a247da: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '408606f31eb126bad9a8c1da28026ffe9c4943f4':
  Import translations. DO NOT MERGE

9 years agoam 223826b3: am e103029d: Merge "Avoid keyguard UI layout dimensions underflow" into...
Xiyuan Xia [Mon, 1 Jun 2015 15:25:02 +0000 (15:25 +0000)]
am 223826b3: am e103029d: Merge "Avoid keyguard UI layout dimensions underflow" into mnc-dev

* commit '223826b3cd1c7dc00706efc137b8a4dcaf7595fa':
  Avoid keyguard UI layout dimensions underflow

9 years agoam 7ec9264f: (-s ours) am 642c4fc5: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Jun 2015 15:24:55 +0000 (15:24 +0000)]
am 7ec9264f: (-s ours) am 642c4fc5: (-s ours) Import translations. DO NOT MERGE

* commit '7ec9264f40087f48dcab821c65a93f8628dd0e93':
  Import translations. DO NOT MERGE

9 years agoam 2de63d7c: am d644c563: Merge "Avoid inspecting packages twice to deduce ABIs for...
Narayan Kamath [Mon, 1 Jun 2015 15:24:49 +0000 (15:24 +0000)]
am 2de63d7c: am d644c563: Merge "Avoid inspecting packages twice to deduce ABIs for moves / installs." into mnc-dev

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

9 years agoam 015a95ff: am 6a299907: Merge "Zen: Use account name instead of calendar id in...
John Spurlock [Mon, 1 Jun 2015 15:24:42 +0000 (15:24 +0000)]
am 015a95ff: am 6a299907: Merge "Zen: Use account name instead of calendar id in event conditions." into mnc-dev

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

9 years agoam 4dbe7c0d: am ff3bf4b1: Increased the falsing treashold for quick settings
Selim Cinek [Mon, 1 Jun 2015 15:24:32 +0000 (15:24 +0000)]
am 4dbe7c0d: am ff3bf4b1: Increased the falsing treashold for quick settings

* commit '4dbe7c0d16944ba4b8df4216f730acfc06818eca':
  Increased the falsing treashold for quick settings

9 years agoam 4b9d724c: am 34cca12b: am 906a91b4: am 08710f1b: Add video for families page....
Dirk Dougherty [Mon, 1 Jun 2015 15:24:23 +0000 (15:24 +0000)]
am 4b9d724c: 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 '4b9d724cd666bdad3703f383be8c024f4a6016a1':
  Add video for families page. Add Studio version reqts and beta notice for data binding lib. Add new gps video.

9 years agoam bc0e7f28: am 95af201a: am 2ed3a89c: am 90042a5f: Docs: Corrects technical content...
David Friedman [Mon, 1 Jun 2015 15:24:15 +0000 (15:24 +0000)]
am bc0e7f28: am 95af201a: am 2ed3a89c: am 90042a5f: Docs: Corrects technical content of one sentence, and deletes another.

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

9 years agoam 0ca15144: am 9bb76544: fix NPE in shutdown thread
Guang Zhu [Mon, 1 Jun 2015 15:24:03 +0000 (15:24 +0000)]
am 0ca15144: am 9bb76544: fix NPE in shutdown thread

* commit '0ca15144e375e7439a64fabcbb53d6813135cfc4':
  fix NPE in shutdown thread

9 years agoam 74f4e4f1: am 832654a8: am 2f85475c: am 7d36a250: docs: Quick spelling fix
Andrew Solovay [Mon, 1 Jun 2015 15:23:55 +0000 (15:23 +0000)]
am 74f4e4f1: am 832654a8: am 2f85475c: am 7d36a250: docs: Quick spelling fix

* commit '74f4e4f1b8016a586d6a0b3ca6ebe06840c21573':
  docs: Quick spelling fix

9 years agoam f819ac38: am 6dddc7d1: Merge "Send a message with data in MediaController.MessageH...
Sungsoo Lim [Mon, 1 Jun 2015 15:23:46 +0000 (15:23 +0000)]
am f819ac38: am 6dddc7d1: Merge "Send a message with data in MediaController.MessageHandler.post()" into mnc-dev

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

9 years agoam 923df3da: am d600966c: Merge "Make ACTION_CONNECTION_SERVICE_CONFIGURE public...
Yorke Lee [Mon, 1 Jun 2015 15:23:37 +0000 (15:23 +0000)]
am 923df3da: am d600966c: Merge "Make ACTION_CONNECTION_SERVICE_CONFIGURE public" into mnc-dev

* commit '923df3da935b006b983ea1837538f6baecf26b86':
  Make ACTION_CONNECTION_SERVICE_CONFIGURE public

9 years agoam a84e73a7: am ad432203: Merge "Improve error handling for AudioTrack write with...
Glenn Kasten [Mon, 1 Jun 2015 15:23:23 +0000 (15:23 +0000)]
am a84e73a7: am ad432203: Merge "Improve error handling for AudioTrack write with PTS" into mnc-dev

* commit 'a84e73a7bc99e4ef5c50125400d319a4124b4296':
  Improve error handling for AudioTrack write with PTS

9 years agoam 023973ec: am 71a28764: Merge "Use getRunAdvance to position cursor" into mnc-dev
Raph Levien [Mon, 1 Jun 2015 15:23:16 +0000 (15:23 +0000)]
am 023973ec: am 71a28764: Merge "Use getRunAdvance to position cursor" into mnc-dev

* commit '023973ecc66c62f2b83d9154097bb370966ed96d':
  Use getRunAdvance to position cursor

9 years agoam 4e419432: am a4d66f39: Merge "Synchronize Theme.Material and Theme.Material light...
Alan Viverette [Mon, 1 Jun 2015 15:23:09 +0000 (15:23 +0000)]
am 4e419432: am a4d66f39: Merge "Synchronize Theme.Material and Theme.Material light attributes" into mnc-dev

* commit '4e419432e1717de6154ea5c8177c519fe449b8f0':
  Synchronize Theme.Material and Theme.Material light attributes

9 years agoam 8c48834b: am 0d889cde: Merge "CountryDetector no longer requires location permissi...
Makoto Onuki [Mon, 1 Jun 2015 15:23:03 +0000 (15:23 +0000)]
am 8c48834b: am 0d889cde: Merge "CountryDetector no longer requires location permissions." into mnc-dev

* commit '8c48834b112cf10d43bacd668aadf6f3cf4a9ad1':
  CountryDetector no longer requires location permissions.

9 years agoam 92086e06: am 5176b545: Merge "Rely on IMM#focusOut() to close input session."...
Yohei Yukawa [Mon, 1 Jun 2015 15:22:58 +0000 (15:22 +0000)]
am 92086e06: am 5176b545: Merge "Rely on IMM#focusOut() to close input session." into mnc-dev

* commit '92086e06ad3167ebfadbc746d32e86c335878a8f':
  Rely on IMM#focusOut() to close input session.

9 years agoam 4ababd27: am 19d9d0ca: Merge "Rename "end" to "endExclusive" in addPhoneTtsSpan...
Brian Attwell [Mon, 1 Jun 2015 15:22:52 +0000 (15:22 +0000)]
am 4ababd27: am 19d9d0ca: Merge "Rename "end" to "endExclusive" in addPhoneTtsSpan" into mnc-dev

* commit '4ababd27401db430afb2f30d29efce972f8b1ccb':
  Rename "end" to "endExclusive" in addPhoneTtsSpan

9 years agoam 9ddcef8e: am 3c436cb9: Merge "Postpone AnimatedVectorDrawable animator inflation...
Alan Viverette [Mon, 1 Jun 2015 15:22:47 +0000 (15:22 +0000)]
am 9ddcef8e: am 3c436cb9: Merge "Postpone AnimatedVectorDrawable animator inflation until applyTheme()" into mnc-dev

* commit '9ddcef8eec56bd161d8f8e91c854b740232f6a64':
  Postpone AnimatedVectorDrawable animator inflation until applyTheme()

9 years agoam 8d61ab00: am a5705a4a: Merge "[partition checking] re-enable bootimage/bootloader...
Andres Morales [Mon, 1 Jun 2015 15:22:42 +0000 (15:22 +0000)]
am 8d61ab00: am a5705a4a: Merge "[partition checking] re-enable bootimage/bootloader, add recovery" into mnc-dev

* commit '8d61ab0003e26952349a959a4a38d3ebdea664d0':
  [partition checking] re-enable bootimage/bootloader, add recovery

9 years agoam 59b24040: am e761938c: Merge "Fix javadocs based on recent case consistency change"
Neil Fuller [Mon, 1 Jun 2015 12:26:01 +0000 (12:26 +0000)]
am 59b24040: am e761938c: Merge "Fix javadocs based on recent case consistency change"

* commit '59b240404f19f3450e710e07a90d4e8d35fabcaf':
  Fix javadocs based on recent case consistency change

9 years agoam e761938c: Merge "Fix javadocs based on recent case consistency change"
Neil Fuller [Mon, 1 Jun 2015 12:14:47 +0000 (12:14 +0000)]
am e761938c: Merge "Fix javadocs based on recent case consistency change"

* commit 'e761938c39c1cafa80d0c474e107041316a49cbd':
  Fix javadocs based on recent case consistency change

9 years agoMerge "Fix javadocs based on recent case consistency change"
Neil Fuller [Mon, 1 Jun 2015 12:01:44 +0000 (12:01 +0000)]
Merge "Fix javadocs based on recent case consistency change"

9 years agoam 0189c6ef: am dd783301: Merge "Add optional additional entropy to finish"
Chad Brubaker [Fri, 29 May 2015 21:44:34 +0000 (21:44 +0000)]
am 0189c6ef: am dd783301: Merge "Add optional additional entropy to finish"

* commit '0189c6efed4f36db0661d827d998a49bc34ece12':
  Add optional additional entropy to finish

9 years agoam dd783301: Merge "Add optional additional entropy to finish"
Chad Brubaker [Fri, 29 May 2015 21:31:52 +0000 (21:31 +0000)]
am dd783301: Merge "Add optional additional entropy to finish"

* commit 'dd78330140ad0e02fc693fc1f5bf041adcf64a1f':
  Add optional additional entropy to finish

9 years agoMerge "Add optional additional entropy to finish"
Chad Brubaker [Fri, 29 May 2015 21:17:54 +0000 (21:17 +0000)]
Merge "Add optional additional entropy to finish"

9 years agoAdd optional additional entropy to finish
Chad Brubaker [Fri, 29 May 2015 19:32:51 +0000 (12:32 -0700)]
Add optional additional entropy to finish

If provided the extra entropy will be added to the device before calling
finish. If entropy is provided and the device does not support supplying
additional entropy then finish will fail with KM_ERROR_UNIMPLEMENTED.

Change-Id: If26be118bf382604f6f8e96e833b76e6f9e94d58

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 "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 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 agoresolved conflicts for merge of 57e82aad to mnc-dev-plus-aosp
Narayan Kamath [Fri, 29 May 2015 09:58:32 +0000 (10:58 +0100)]
resolved conflicts for merge of 57e82aad to mnc-dev-plus-aosp

Change-Id: Ib895c959b7403f959f326881a1dea4b81dda73e3

9 years agoam d6acfc62: am 90cfc192: Merge "Close race condition in binderDied()"
Narayan Kamath [Fri, 29 May 2015 09:43:23 +0000 (09:43 +0000)]
am d6acfc62: am 90cfc192: Merge "Close race condition in binderDied()"

* commit 'd6acfc6219fd6a47b267e8f31a83773862759890':
  Close race condition in binderDied()

9 years agoam 4993da92: Merge "Patches for IKeyguardStateCallback"
Narayan Kamath [Fri, 29 May 2015 09:39:43 +0000 (09:39 +0000)]
am 4993da92: Merge "Patches for IKeyguardStateCallback"

* commit '4993da924c6f25194aded71e70eefd07208eee81':
  Patches for IKeyguardStateCallback

9 years agoMerge "Patches for IKeyguardStateCallback"
Narayan Kamath [Fri, 29 May 2015 09:26:16 +0000 (09:26 +0000)]
Merge "Patches for IKeyguardStateCallback"

9 years agoPatches for IKeyguardStateCallback
dooyoung.hwang [Thu, 21 May 2015 07:09:43 +0000 (16:09 +0900)]
Patches for IKeyguardStateCallback

1. Also notify input is restricted or not when IKeyguardStateCallback callback is added.
When first Keyguard is showing after boot, the mInputRestricted is not updated. So,
inKeyguardRestrictedInputMode still returns false, although device is locked.

2. If mShowing remains false during setup time of KeyguardViewMediator, mInputRestricted
is not updated. This is because updateInputRestrictedLocked is called only if showing
value is changed during setup time.
For this reason, when device is not provisioned, inKeyguardRestrictedInputMode returns
false, and device does not restrict key.

3. If one of callbacks causes RemoteException, the other callbacks are not called.
This is because catching RemoteException breaks for-loop.

Change-Id: I0281405127bcc75285b908d01485da3ac9b40b52
Signed-off-by: Dooyoung Hwang <dooyoung.hwang@lge.com>
9 years agoam 90cfc192: Merge "Close race condition in binderDied()"
Narayan Kamath [Fri, 29 May 2015 09:25:16 +0000 (09:25 +0000)]
am 90cfc192: Merge "Close race condition in binderDied()"

* commit '90cfc1923ae0a9fe98b97d123b2250f01e8bc3f2':
  Close race condition in binderDied()

9 years agoMerge "Close race condition in binderDied()"
Narayan Kamath [Fri, 29 May 2015 08:34:02 +0000 (08:34 +0000)]
Merge "Close race condition in binderDied()"

9 years agoClose race condition in binderDied()
Christopher Tate [Wed, 20 May 2015 01:16:58 +0000 (18:16 -0700)]
Close race condition in binderDied()

It was possible for a binderDied() call to occur while the death
recipient list containing the object was being iterated, in which
case we could invalidate an object reference out from under the
iteration, causing a VM abort.  We now interlock the binderDied()
deref operation with the list's locking semantics to prevent this.

Bug 15831054

(cherry picked from commit 090c08ff2a7525c830b4edfd1a79aa8ee3893c60)

Change-Id: If0027d3ac4da1153284a425dd9b2819a203481ab

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

9 years agofix NPE in shutdown thread
Guang Zhu [Fri, 29 May 2015 03:50:03 +0000 (20:50 -0700)]
fix NPE in shutdown thread

null reboot reason is used when it's a simple reboot.

Change-Id: I9d3110ca733a1b0401721fde907924c101997c4f

9 years agoam 2f85475c: am 7d36a250: docs: Quick spelling fix
Andrew Solovay [Fri, 29 May 2015 02:28:05 +0000 (02:28 +0000)]
am 2f85475c: am 7d36a250: docs: Quick spelling fix

* commit '2f85475c18d68d8719f20e4385dccb3ba0117d1a':
  docs: Quick spelling fix

9 years agoam d600966c: Merge "Make ACTION_CONNECTION_SERVICE_CONFIGURE public" into mnc-dev
Yorke Lee [Fri, 29 May 2015 02:23:34 +0000 (02:23 +0000)]
am d600966c: Merge "Make ACTION_CONNECTION_SERVICE_CONFIGURE public" into mnc-dev

* commit 'd600966c396ce457062795893a7972f3bf2b3617':
  Make ACTION_CONNECTION_SERVICE_CONFIGURE public

9 years agoam ad432203: Merge "Improve error handling for AudioTrack write with PTS" into mnc-dev
Glenn Kasten [Fri, 29 May 2015 02:23:22 +0000 (02:23 +0000)]
am ad432203: Merge "Improve error handling for AudioTrack write with PTS" into mnc-dev

* commit 'ad43220384f2ee1627397cafeac34144dbfda8d6':
  Improve error handling for AudioTrack write with PTS

9 years agoam 71a28764: Merge "Use getRunAdvance to position cursor" into mnc-dev
Raph Levien [Fri, 29 May 2015 02:23:16 +0000 (02:23 +0000)]
am 71a28764: Merge "Use getRunAdvance to position cursor" into mnc-dev

* commit '71a2876497385cd61083cf3a7a86db068ae4b0b3':
  Use getRunAdvance to position cursor

9 years agoam a4d66f39: Merge "Synchronize Theme.Material and Theme.Material light attributes...
Alan Viverette [Fri, 29 May 2015 02:23:07 +0000 (02:23 +0000)]
am a4d66f39: Merge "Synchronize Theme.Material and Theme.Material light attributes" into mnc-dev

* commit 'a4d66f3933d2369a87e7c3d36e69244ff2029e74':
  Synchronize Theme.Material and Theme.Material light attributes

9 years agoam 0d889cde: Merge "CountryDetector no longer requires location permissions." into...
Makoto Onuki [Fri, 29 May 2015 02:23:01 +0000 (02:23 +0000)]
am 0d889cde: Merge "CountryDetector no longer requires location permissions." into mnc-dev

* commit '0d889cdeb78410cd4cb7f05d7fa4820985f0d679':
  CountryDetector no longer requires location permissions.

9 years agoam 5176b545: Merge "Rely on IMM#focusOut() to close input session." into mnc-dev
Yohei Yukawa [Fri, 29 May 2015 02:22:52 +0000 (02:22 +0000)]
am 5176b545: Merge "Rely on IMM#focusOut() to close input session." into mnc-dev

* commit '5176b5451a8447de3ff86712a95efd6af93aa556':
  Rely on IMM#focusOut() to close input session.

9 years agoam 19d9d0ca: Merge "Rename "end" to "endExclusive" in addPhoneTtsSpan" into mnc-dev
Brian Attwell [Fri, 29 May 2015 02:22:46 +0000 (02:22 +0000)]
am 19d9d0ca: Merge "Rename "end" to "endExclusive" in addPhoneTtsSpan" into mnc-dev

* commit '19d9d0ca2e95eca34e8f7b28023aa10f15d82f88':
  Rename "end" to "endExclusive" in addPhoneTtsSpan

9 years agoam 3c436cb9: Merge "Postpone AnimatedVectorDrawable animator inflation until applyThe...
Alan Viverette [Fri, 29 May 2015 02:22:41 +0000 (02:22 +0000)]
am 3c436cb9: Merge "Postpone AnimatedVectorDrawable animator inflation until applyTheme()" into mnc-dev

* commit '3c436cb99f1cc0db82e342fb9dc145fd524f5029':
  Postpone AnimatedVectorDrawable animator inflation until applyTheme()

9 years agoam a5705a4a: Merge "[partition checking] re-enable bootimage/bootloader, add recovery...
Andres Morales [Fri, 29 May 2015 02:22:33 +0000 (02:22 +0000)]
am a5705a4a: Merge "[partition checking] re-enable bootimage/bootloader, add recovery" into mnc-dev

* commit 'a5705a4ada8e719ebf73ed757c514b74785e7ae3':
  [partition checking] re-enable bootimage/bootloader, add recovery

9 years agoam 7d36a250: docs: Quick spelling fix
Andrew Solovay [Fri, 29 May 2015 02:15:04 +0000 (02:15 +0000)]
am 7d36a250: docs: Quick spelling fix

* commit '7d36a25097099b958262e90d22992ce4cac485c9':
  docs: Quick spelling fix

9 years agoZen: Use account name instead of calendar id in event conditions.
John Spurlock [Fri, 29 May 2015 02:13:03 +0000 (22:13 -0400)]
Zen: Use account name instead of calendar id in event conditions.

 - Migrate the existing calendar attribute in the event condition
   from a long calendar id to the calendar account name.  More
   portable across a backup/restore.
 - Also skip restoring transient state (like the current condition
   state) from restored automatic rules.

Bug: 17755700
Change-Id: I9bdb421d2209e3ce90873008665c254d67c788d2

9 years agoMerge "Send a message with data in MediaController.MessageHandler.post()" into mnc-dev
Sungsoo Lim [Fri, 29 May 2015 01:36:57 +0000 (01:36 +0000)]
Merge "Send a message with data in MediaController.MessageHandler.post()" into mnc-dev

9 years agodocs: Quick spelling fix
Andrew Solovay [Fri, 29 May 2015 01:33:29 +0000 (18:33 -0700)]
docs: Quick spelling fix

Fix is quick and the misspelling was embarassing (spelled channel as
"chanel" three times) so I'm just going to +2 this myself.

Change-Id: Icc4dcd5f47ba2337db29cc81b6afe426e6986e95

9 years agoMerge "Make ACTION_CONNECTION_SERVICE_CONFIGURE public" into mnc-dev
Yorke Lee [Fri, 29 May 2015 00:55:11 +0000 (00:55 +0000)]
Merge "Make ACTION_CONNECTION_SERVICE_CONFIGURE public" into mnc-dev