193877 Commits

Author SHA1 Message Date
Andy Hung
04065187d9 Clarify AudioFormat sample rate and encoding documentation
Bug: 21476142
Change-Id: I74fa3fcced5cc197a4cee6a7c10f3ed4690b0af1
2015-05-29 10:17:40 -07:00
Tyler Gunn
a2df92512b 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
2015-05-29 10:05:46 -07:00
Alex Klyubin
a8c837f11a Add algorithm aliases for Android Keystore HMACs.
The aliases have been copied from Conscrypt.

Bug: 18088752
Change-Id: I1c66d8c3655f57db41cc0b9cc88d08b44b4a774b
2015-05-29 10:02:31 -07:00
Alex Klyubin
7cbcfd4fc1 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
2015-05-29 09:53:05 -07:00
Tony Mantler
85b039f348 Merge "Move ZoneGetter into SettingsLib" into mnc-dev 2015-05-29 16:44:39 +00:00
Chris Wren
98d235bcba 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
2015-05-29 12:31:49 -04:00
John Spurlock
8be53eaaf7 Zen: Add warning text if total silence will eat the next alarm.
Bug: 21359239
Change-Id: I8a69738e6488f40f24eed622529c913b6c3865a0
2015-05-29 12:18:34 -04:00
Geoff Mendal
55b4b2d5a8 Merge "Revert "Import translations. DO NOT MERGE"" into mnc-dev 2015-05-29 15:57:51 +00:00
Geoff Mendal
bf2e5b5fa5 Revert "Import translations. DO NOT MERGE"
This reverts commit 27c652fd0293e707110165eb1f8918f489b50fca.

Change-Id: Idb1365c91c67c0eb8f472bf6f9ace1b6429e3b0e
2015-05-29 15:57:37 +00:00
Clara Bayarri
a447937dd3 Fix TextView ActionMode overflow finishes the ActionMode
stopSelectionActionMode() was called within hideCursors, and this
gets called in many scenarios. One of them is onWindowFocusChanged,
which is triggered when the user clicks the overflow icon in the
action bar. Removed the action mode call from this use case.

Bug: 21267270
Change-Id: I1cd359e87de67141627e25d2ec520fc91303a48d
2015-05-29 16:33:35 +01:00
Clara Bayarri
aee243b825 Make Text Selection Action Mode secondary items IF_ROOM
The fact that they were all ALWAYS caused the ActionBar version
of the ActionMode to show truncated text to try and fit them all.

In an ideal case we will always have a Floating ActionMode, but
the client can explicitely change this and hence we should fallback
gracefully.

Additionally, remove the SHOW_AS_ACTION_WITH_TEXT flags as we
removed the icons from the items anyway.

Bug: 21264711
Change-Id: I13a9aafd0fc6f6642d3a4a3399f71e739a1dce8d
2015-05-29 16:33:35 +01:00
Geoff Mendal
8320436ce5 Merge "Revert "Import translations. DO NOT MERGE"" into mnc-dev 2015-05-29 15:33:30 +00:00
Geoff Mendal
cdd71a3087 Revert "Import translations. DO NOT MERGE"
This reverts commit f3173d8a1797fd812997b9246502a05df0591363.

Change-Id: I7e24d340c24f7ba4b67a72d54e57c3558caa7267
2015-05-29 15:33:18 +00:00
Glenn Kasten
dedc768f82 Fix typo
Change-Id: I21ff7773056975b6941a5f1126d43b2e04aa5cd5
2015-05-29 08:11:24 -07:00
Selim Cinek
2c97e5cc5e Shortened the duration of HUNs
Bug: 20917402
Change-Id: I7c1af3507b28a70432c5352f07530d0ea47a731c
2015-05-29 17:08:05 +02:00
Geoff Mendal
9917768736 Merge "Revert "Import translations. DO NOT MERGE"" into mnc-dev 2015-05-29 15:04:52 +00:00
Geoff Mendal
66f49af2fe Revert "Import translations. DO NOT MERGE"
This reverts commit 29af96c4486c1baf8601482e54e6886139f49546.

Change-Id: Ie95b16f0ad99994e375484f1f2c6e99debbee37d
2015-05-29 15:04:40 +00:00
John Spurlock
4402f4bb12 Merge "Tuner: add battery pct preference." into mnc-dev 2015-05-29 15:03:16 +00:00
John Spurlock
f40d08f8a3 Tuner: add battery pct preference.
And fix questionable code organization choices in BatteryMeterView.

Change-Id: I7c13197892b33aa0df9af51fbabb81e0ad0e00e1
2015-05-29 10:52:29 -04:00
Geoff Mendal
e796112904 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-05-29 14:51:59 +00:00
Geoff Mendal
0bdf1aab31 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-05-29 14:51:29 +00:00
Geoff Mendal
df55ecbf9c Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-05-29 14:50:36 +00:00
Geoff Mendal
78a247da5f Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-05-29 14:49:45 +00:00
Geoff Mendal
27c652fd02 Import translations. DO NOT MERGE
Change-Id: I22703941cc87c8ad2aacc04671d3c62cb1e81037
Auto-generated-cl: translation import
2015-05-29 09:38:08 -05:00
Geoff Mendal
f3173d8a17 Import translations. DO NOT MERGE
Change-Id: I30219f300510a51079cb2e514c00f476590e06d5
Auto-generated-cl: translation import
2015-05-29 07:31:36 -07:00
Geoff Mendal
e8209fffe9 Import translations. DO NOT MERGE
Change-Id: I290120b9af321f28cbf754ebc76a154e8b806ddf
Auto-generated-cl: translation import
2015-05-29 09:28:27 -05:00
Geoff Mendal
29af96c448 Import translations. DO NOT MERGE
Change-Id: I08da4367a1ba723e7dfb701f47fba96b548e7f86
Auto-generated-cl: translation import
2015-05-29 07:27:57 -07:00
Xiyuan Xia
e103029dbc Merge "Avoid keyguard UI layout dimensions underflow" into mnc-dev 2015-05-29 14:24:22 +00:00
Geoff Mendal
642c4fc527 Import translations. DO NOT MERGE
Change-Id: I6fbaa6bb785894851b344f414fe5c8f830adbde3
Auto-generated-cl: translation import
2015-05-29 09:10:35 -05:00
Narayan Kamath
d644c56381 Merge "Avoid inspecting packages twice to deduce ABIs for moves / installs." into mnc-dev 2015-05-29 14:04:42 +00:00
Narayan Kamath
623b58b2cf 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
2015-05-29 14:48:07 +01:00
John Spurlock
6a2999073c Merge "Zen: Use account name instead of calendar id in event conditions." into mnc-dev 2015-05-29 13:22:33 +00:00
Selim Cinek
ff3bf4b12f Increased the falsing treashold for quick settings
Bug: 21433654
Change-Id: I593297e4577a40762e926353da046a53b9876245
2015-05-29 13:06:49 +00:00
Dirk Dougherty
34cca12bbd 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.
2015-05-29 07:00:58 +00:00
Dirk Dougherty
906a91b4e7 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.
2015-05-29 06:48:57 +00:00
Dirk Dougherty
08710f1b69 Add video for families page. Add Studio version reqts and beta notice for data binding lib. Add new gps video.
Change-Id: I7824c45a81078c1527a5b8bc20b2a9ac6773a5ad
2015-05-28 23:33:36 -07:00
David Friedman
95af201aea 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.
2015-05-29 05:45:00 +00:00
David Friedman
2ed3a89c1b am 90042a5f: Docs: Corrects technical content of one sentence, and deletes another.
* commit '90042a5f8c987582736f4eed714aeba9416003c6':
  Docs: Corrects technical content of one sentence, and deletes another.
2015-05-29 05:31:56 +00:00
David Friedman
90042a5f8c Docs: Corrects technical content of one sentence, and deletes another.
Change-Id: Iaf894f9d9d68e4e2be9a1d1f8173b83a781241f4
2015-05-28 22:03:54 -07:00
Guang Zhu
9bb765448d fix NPE in shutdown thread
null reboot reason is used when it's a simple reboot.

Change-Id: I9d3110ca733a1b0401721fde907924c101997c4f
2015-05-28 20:50:03 -07:00
Andrew Solovay
832654a857 am 2f85475c: am 7d36a250: docs: Quick spelling fix
* commit '2f85475c18d68d8719f20e4385dccb3ba0117d1a':
  docs: Quick spelling fix
2015-05-29 02:28:05 +00:00
Andrew Solovay
2f85475c18 am 7d36a250: docs: Quick spelling fix
* commit '7d36a25097099b958262e90d22992ce4cac485c9':
  docs: Quick spelling fix
2015-05-29 02:15:04 +00:00
John Spurlock
995a749f27 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
2015-05-28 22:13:03 -04:00
jinho.park
1acd32a60b DO NOT MERGE Fix bug regarding the comparator sorts Alarms into increasing time order.
The comparator used variable "when" in IncreasingTimeOrder class.
variable "when" means "elapsed time" or "real time"(RTC) and these types have different unit of time.
so, I recommend that you use a "whenElapsed" which has the equal unit of time as its default value.

Signed-off-by: Jinho Park <jinho.park@lge.com>

Cherry-pick from master

Change-Id: Ib95531bf235e8fc628a7eda1c24d187c12a9ab3b
2015-05-28 18:38:32 -07:00
Sungsoo Lim
6dddc7d1a9 Merge "Send a message with data in MediaController.MessageHandler.post()" into mnc-dev 2015-05-29 01:37:00 +00:00
Andrew Solovay
7d36a25097 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
2015-05-28 18:36:29 -07:00
Yorke Lee
d600966c39 Merge "Make ACTION_CONNECTION_SERVICE_CONFIGURE public" into mnc-dev 2015-05-29 00:55:12 +00:00
Doris Liu
9607fbe9d7 Fix calls to Rect.intersect() in package android.view
This CL checks for the return value for Rect.intersect() for whether
there is actually an intersection before taking the return intersected
rect. In the case of no intersection (Rect.intersect() returns false),
an empty rect will be used as the intersection.

bug: 7368679
Change-Id: Ib874345210c8f62550627544d717e958d46cfe13
2015-05-28 17:17:28 -07:00
Glenn Kasten
ad43220384 Merge "Improve error handling for AudioTrack write with PTS" into mnc-dev 2015-05-29 00:12:54 +00:00
Raph Levien
71a2876497 Merge "Use getRunAdvance to position cursor" into mnc-dev 2015-05-29 00:05:09 +00:00