OSDN Git Service
Mike Lockwood [Wed, 29 Apr 2015 20:40:07 +0000 (20:40 +0000)]
am
f105f61d: Merge "UsbDevice: Add support for retrieving version string for a USB device" into mnc-dev
* commit '
f105f61dd9ff790c6ace406e73c3bddac87a8925':
UsbDevice: Add support for retrieving version string for a USB device
Junda Liu [Wed, 29 Apr 2015 20:40:01 +0000 (20:40 +0000)]
am
bd0ffb8e: Merge "Moving all Telephony overlays to CarrierConfigManager." into mnc-dev
* commit '
bd0ffb8e34a91735e73fbc680539382dd5691191':
Moving all Telephony overlays to CarrierConfigManager.
Mike Lockwood [Wed, 29 Apr 2015 20:27:49 +0000 (20:27 +0000)]
Merge "UsbDevice: Add support for retrieving version string for a USB device" into mnc-dev
Junda Liu [Wed, 29 Apr 2015 20:25:24 +0000 (20:25 +0000)]
Merge "Moving all Telephony overlays to CarrierConfigManager." into mnc-dev
Jonathan Basseri [Mon, 27 Apr 2015 21:14:38 +0000 (14:14 -0700)]
Moving all Telephony overlays to CarrierConfigManager.
This adds every variable and its default value from
packages/services/Telephony/res/values/config.xml to the new
CarrierConfigManager API. Variable docstrings are also taken from
config.xml, with minimal edits.
These variables were not included because either they are not carrier
specific, or they are device specific:
OtaPlaySuccessFailureTone
OtaShowActivateFailTimes
OtaShowActivationScreen
OtaShowListeningScreen
carrier_settings
carrier_settings_menu
config_allow_hfa_outside_of_setup_wizard
config_enabled_lte
csp_enabled
dialer_default_class
dtmf_type_enabled
hac_enabled
send_mic_mute_to_AudioManager
ui_default_package
This also adds BOOL_HIDE_CARRIER_NETWORK_SETTINGS which is a replacement
for android.provider.Settings.Global.HIDE_CARRIER_NETWORK_SETTINGS.
Bug:
20270007
Change-Id: I985a55cf88d3bd1863e28af7790b59eef01d6504
Chris Craik [Wed, 29 Apr 2015 20:21:44 +0000 (20:21 +0000)]
am
81bd735a: Merge "Require minimum 4 bit stencil for layers." into mnc-dev
* commit '
81bd735a010771ab502dabe7ef4d20ea520cf6ac':
Require minimum 4 bit stencil for layers.
John Reck [Wed, 29 Apr 2015 20:21:39 +0000 (20:21 +0000)]
am
b2cec86a: Merge "Skip frames with no damage" into mnc-dev
* commit '
b2cec86a44f3fe937079b26827bdc031f5aec731':
Skip frames with no damage
Chris Craik [Wed, 29 Apr 2015 20:17:42 +0000 (20:17 +0000)]
Merge "Require minimum 4 bit stencil for layers." into mnc-dev
John Reck [Wed, 29 Apr 2015 20:10:25 +0000 (20:10 +0000)]
Merge "Skip frames with no damage" into mnc-dev
Abodunrinwa Toki [Wed, 29 Apr 2015 20:09:20 +0000 (20:09 +0000)]
am
05a56db3: Merge "DO NOT MERGE: Minor fixes to FloatingToolbar." into mnc-dev
* commit '
05a56db39d26e1e6ee160e82b79df39c15d1804c':
DO NOT MERGE: Minor fixes to FloatingToolbar.
Mike Lockwood [Wed, 29 Apr 2015 20:05:55 +0000 (13:05 -0700)]
UsbDevice: Add support for retrieving version string for a USB device
Change-Id: Ia8630f5ffd05f90347b971110a81f4927060cc4b
Chris Craik [Wed, 29 Apr 2015 00:55:50 +0000 (17:55 -0700)]
Require minimum 4 bit stencil for layers.
bug:
19270131
Change-Id: I81367179d268e7c1642259c456c1f3d0018f6c0d
Abodunrinwa Toki [Wed, 29 Apr 2015 19:57:46 +0000 (19:57 +0000)]
Merge "DO NOT MERGE: Minor fixes to FloatingToolbar." into mnc-dev
Svet Ganov [Wed, 29 Apr 2015 19:44:33 +0000 (19:44 +0000)]
am
56867804: Merge "Respect the record audio app op - framework" into mnc-dev
* commit '
5686780404a41901d226cc7ba506c1c0ba284713':
Respect the record audio app op - framework
Svet Ganov [Wed, 29 Apr 2015 19:34:05 +0000 (19:34 +0000)]
Merge "Respect the record audio app op - framework" into mnc-dev
Chris Craik [Wed, 29 Apr 2015 19:32:42 +0000 (19:32 +0000)]
am
7201bf2b: Merge "Unify View alpha implies clipping behavior" into mnc-dev
* commit '
7201bf2b7ebac4ed0be6efd6b046f93a8de5b2d0':
Unify View alpha implies clipping behavior
Chris Craik [Wed, 29 Apr 2015 19:23:40 +0000 (19:23 +0000)]
Merge "Unify View alpha implies clipping behavior" into mnc-dev
destradaa [Wed, 29 Apr 2015 18:14:17 +0000 (18:14 +0000)]
am
c0667853: Merge "Add SystemApis in GpsMeasurements APIs to reflect changes in GPS HAL. b/
19938206" into mnc-dev
* commit '
c0667853ffad211a5dd40202ff1a4601449b745e':
Add SystemApis in GpsMeasurements APIs to reflect changes in GPS HAL. b/
19938206
destradaa [Wed, 29 Apr 2015 18:01:03 +0000 (18:01 +0000)]
Merge "Add SystemApis in GpsMeasurements APIs to reflect changes in GPS HAL. b/
19938206" into mnc-dev
Abodunrinwa Toki [Fri, 24 Apr 2015 23:28:56 +0000 (00:28 +0100)]
DO NOT MERGE: Minor fixes to FloatingToolbar.
* Changes to isShowing() method.
* Changes to initial content visibility on show().
Change-Id: I1b20cd5a3fc86ae7427b55c44efd3cc1118148ae
Abodunrinwa Toki [Wed, 29 Apr 2015 17:32:36 +0000 (17:32 +0000)]
am
47ea8b3d: Merge "DO NOT MERGE: Update floatingtoolbar position when cursor moves." into mnc-dev
* commit '
47ea8b3d6bcef193a2d0ec9f0141525c83a0bcda':
DO NOT MERGE: Update floatingtoolbar position when cursor moves.
Cedric Ho [Wed, 29 Apr 2015 17:32:32 +0000 (17:32 +0000)]
am
80fa2cc8: Merge "Add android.speech.RecognizerIntent EXTRA_PREFER_OFFLINE to indicate whether to only use an offline speech recognition engine." into mnc-dev
* commit '
80fa2cc8a96e05cec574bd06c9038ad4255ecafb':
Add android.speech.RecognizerIntent EXTRA_PREFER_OFFLINE to indicate whether to only use an offline speech recognition engine.
Chad Brubaker [Wed, 29 Apr 2015 17:32:27 +0000 (17:32 +0000)]
am
721474bb: Merge "Add OP_AUTH_NEEDED KeyStore result code" into mnc-dev
* commit '
721474bb9cfb76e29e0fe6e98c6b582c6fa78fe4':
Add OP_AUTH_NEEDED KeyStore result code
Abodunrinwa Toki [Wed, 29 Apr 2015 17:26:27 +0000 (17:26 +0000)]
Merge "DO NOT MERGE: Update floatingtoolbar position when cursor moves." into mnc-dev
Cedric Ho [Wed, 29 Apr 2015 17:19:38 +0000 (17:19 +0000)]
Merge "Add android.speech.RecognizerIntent EXTRA_PREFER_OFFLINE to indicate whether to only use an offline speech recognition engine." into mnc-dev
Chad Brubaker [Wed, 29 Apr 2015 17:17:29 +0000 (17:17 +0000)]
Merge "Add OP_AUTH_NEEDED KeyStore result code" into mnc-dev
Alan Viverette [Wed, 29 Apr 2015 16:58:00 +0000 (16:58 +0000)]
am
2333912c: Restore checkbox checked color to colorControlActivated
* commit '
2333912c6e4d51995a3fd01286c21c4d0328eb1a':
Restore checkbox checked color to colorControlActivated
Geoff Mendal [Wed, 29 Apr 2015 16:57:54 +0000 (16:57 +0000)]
am
0e0c9d93: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
0e0c9d9392e4b4580939632ca4e74f2073e59290':
Import translations. DO NOT MERGE
Alan Viverette [Wed, 29 Apr 2015 16:51:35 +0000 (09:51 -0700)]
Restore checkbox checked color to colorControlActivated
Bug:
20683633
Change-Id: I8997ad5829eda7afa03b7c56d4f44e4abfe34bee
Geoff Mendal [Wed, 29 Apr 2015 16:46:28 +0000 (16:46 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Alan Viverette [Wed, 29 Apr 2015 16:46:08 +0000 (16:46 +0000)]
am
7a6caae6: Merge "Adjust display inversion matrix to account for luminance" into mnc-dev
* commit '
7a6caae616fedab08aa3bcb1e37edf5f1e756dda':
Adjust display inversion matrix to account for luminance
Alan Viverette [Wed, 29 Apr 2015 16:38:42 +0000 (16:38 +0000)]
Merge "Adjust display inversion matrix to account for luminance" into mnc-dev
Andrei Stingaceanu [Wed, 29 Apr 2015 16:35:23 +0000 (16:35 +0000)]
am
eea5a9e0: Merge "DO NOT MERGE - Minor clean up: redundant functionality in Editor and TextView." into mnc-dev
* commit '
eea5a9e0de5825bf3629ad52a51a0dcf5f064fe5':
DO NOT MERGE - Minor clean up: redundant functionality in Editor and TextView.
Geoff Mendal [Wed, 29 Apr 2015 16:27:09 +0000 (09:27 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie2516ab34be72c0de86e3d546b349118be9c093c
Auto-generated-cl: translation import
Andrei Stingaceanu [Wed, 29 Apr 2015 16:21:14 +0000 (16:21 +0000)]
Merge "DO NOT MERGE - Minor clean up: redundant functionality in Editor and TextView." into mnc-dev
Xiyuan Xia [Wed, 29 Apr 2015 15:59:59 +0000 (15:59 +0000)]
am
19be9d31: Merge "Update bottom area alpha when stack height changes" into mnc-dev
* commit '
19be9d31c834f7703a4584eba84bbf4d22027a93':
Update bottom area alpha when stack height changes
Xiyuan Xia [Wed, 29 Apr 2015 15:46:23 +0000 (15:46 +0000)]
Merge "Update bottom area alpha when stack height changes" into mnc-dev
John Reck [Wed, 29 Apr 2015 14:59:23 +0000 (14:59 +0000)]
am
b77a7551: Merge "Remove View:hasStaticLayer()" into mnc-dev
* commit '
b77a7551121561f4ea7d5ce0c4030aeb7ce709e8':
Remove View:hasStaticLayer()
John Reck [Wed, 29 Apr 2015 14:48:27 +0000 (14:48 +0000)]
Merge "Remove View:hasStaticLayer()" into mnc-dev
Geoff Mendal [Wed, 29 Apr 2015 14:29:19 +0000 (14:29 +0000)]
am
e1b43ee9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
e1b43ee91898b4c24a45cbdaa62b572068f998cf':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 29 Apr 2015 14:18:40 +0000 (14:18 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 29 Apr 2015 14:18:14 +0000 (07:18 -0700)]
Import translations. DO NOT MERGE
Change-Id: Icf8a8e3bc6d5a88293a6954c35e766ac8c494a4d
Auto-generated-cl: translation import
Geoff Mendal [Wed, 29 Apr 2015 14:11:39 +0000 (14:11 +0000)]
am
62cb506f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
62cb506f27374aecb414d8fa3f064c194d3c69ec':
Import translations. DO NOT MERGE
John Spurlock [Wed, 29 Apr 2015 14:11:35 +0000 (14:11 +0000)]
am
8dbcda1b: Merge "Volume: Simple dialog footer, DND in quick settings." into mnc-dev
* commit '
8dbcda1b33ad9cd1c19052a332404cc221da42ee':
Volume: Simple dialog footer, DND in quick settings.
Geoff Mendal [Wed, 29 Apr 2015 14:08:23 +0000 (14:08 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 29 Apr 2015 14:03:31 +0000 (07:03 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ied1d50de849ab195e9f3c9e70c0f8e8dbf9104fe
Auto-generated-cl: translation import
John Spurlock [Wed, 29 Apr 2015 14:02:49 +0000 (14:02 +0000)]
Merge "Volume: Simple dialog footer, DND in quick settings." into mnc-dev
John Spurlock [Tue, 28 Apr 2015 15:19:13 +0000 (11:19 -0400)]
Volume: Simple dialog footer, DND in quick settings.
- Show DND tile by default, this is now the only
place to manage DND modes / end conditions.
- Remove super footer from volume dialog, replace with
a simplified version that displays the current mode
and allows ending DND.
- Remove obsolete text-only footer from codebase.
- Migrate remaining volume items into main resource files.
- Rename "No interruptions" to "Total silence".
- Add new user information banner for "Total silence"
- Crude media filtering for Total Silence.
(deeper muting changes will be done as a followup)
- Disable volume dialog sliders completely if muted due
to zen.
- Cleanup ZenModePanel: assume embedded mode, remove
expandable subhead
- Remember "favorite" DND mode inside the DND config panel.
- AudioService: consult ringer-mode-delegate before voluming
down into silent.
- Add new hour options to time-based exit conditions.
- Volume dialog visual updates to move closer to final visuals.
- Unify ringer=silent with DND.
Bug:
19260237
Change-Id: I05d7e001eca3b5125418ec3bc4087d0cb8866717
Nicolas Prevot [Wed, 29 Apr 2015 13:35:01 +0000 (13:35 +0000)]
am
1c4a44e5: Do not return cross-profile intent results to a non-enabled user.
* commit '
1c4a44e577c7b8316172d1bf5357d006776ae75e':
Do not return cross-profile intent results to a non-enabled user.
Nicolas Prevot [Thu, 23 Apr 2015 16:11:47 +0000 (17:11 +0100)]
Do not return cross-profile intent results to a non-enabled user.
In PackageManagerService.queryIntentActivities, do not return
ResolveInfos targeting a user which is not enabled.
BUG:
19578138
Change-Id: Id4e730ca8671c26f8cf077bc9c66b3dbd37be482
Benjamin Franz [Wed, 29 Apr 2015 09:15:20 +0000 (09:15 +0000)]
am
c4aa3c78: Merge "Add status bar flag to disable quick settings" into mnc-dev
* commit '
c4aa3c781a0ddce64853cd5d88bf97f8a9faf98b':
Add status bar flag to disable quick settings
Benjamin Franz [Wed, 29 Apr 2015 08:35:57 +0000 (08:35 +0000)]
Merge "Add status bar flag to disable quick settings" into mnc-dev
Dongwon Kang [Wed, 29 Apr 2015 05:41:35 +0000 (05:41 +0000)]
am
25466e0a: Merge "TIF: throw an exception if an operation takes too long." into mnc-dev
* commit '
25466e0a8f3e0f7f1e758642519f3aa8643f6f26':
TIF: throw an exception if an operation takes too long.
Jeff Sharkey [Wed, 29 Apr 2015 05:41:30 +0000 (05:41 +0000)]
am
b42d6946: Method to wipe all adoptable disks.
* commit '
b42d694691e73d094df616fe78627ada7e1239ef':
Method to wipe all adoptable disks.
Dongwon Kang [Wed, 29 Apr 2015 05:34:24 +0000 (05:34 +0000)]
Merge "TIF: throw an exception if an operation takes too long." into mnc-dev
Dongwon Kang [Mon, 27 Apr 2015 08:43:52 +0000 (17:43 +0900)]
TIF: throw an exception if an operation takes too long.
Bug:
19383373
Change-Id: I915f77af3ab12d10810fd85e55d7d5c5da3d6136
Jeff Sharkey [Wed, 29 Apr 2015 05:29:50 +0000 (05:29 +0000)]
am
b36586a7: Split some VolumeInfo state into VolumeRecord.
* commit '
b36586a7c9b7718f33961406537e27bbd9b16211':
Split some VolumeInfo state into VolumeRecord.
Jeff Sharkey [Wed, 29 Apr 2015 05:25:26 +0000 (22:25 -0700)]
Method to wipe all adoptable disks.
Will be used by various classes doing factory reset.
Bug:
9433509
Change-Id: I0701abe00abc2fb9085ce1ffe6e28fb27c91ab51
Jeff Sharkey [Mon, 27 Apr 2015 15:42:28 +0000 (08:42 -0700)]
Split some VolumeInfo state into VolumeRecord.
VolumeRecord is a historical record of a volume that we've seen in
the past. It's now surfaced outside the framework for SystemUI to
drive the notifications that bug users to reinsert missing private
volumes.
Show progress notifications for both storage and package movement
operations. Notify when an empty disk is inserted (no usable volumes)
which launches into the normal format flow.
Add API to forget volumes.
Bug:
20275424,
20275424
Change-Id: I75602c17fdcd4d1f1f62324e1a08c4a33093eefa
David Friedman [Wed, 29 Apr 2015 04:20:41 +0000 (04:20 +0000)]
am
30565ed2: am
a39e4d37: am
77ad81b5: am
ff1bfac6: am
c637af9e: am
75f071df: Merge "Localized Android landing pages Bug:
19124242" into lmp-docs
* commit '
30565ed225e6d91c37b438a64f715725b1663058':
David Friedman [Wed, 29 Apr 2015 04:08:29 +0000 (04:08 +0000)]
am
16bf47e8: am
3d983dea: am
21a9fa47: am
75f071df: Merge "Localized Android landing pages Bug:
19124242" into lmp-docs
* commit '
16bf47e8d6c9b9b4a9618fef998d6c9808cb17cb':
Localized Android landing pages Bug:
19124242
David Friedman [Wed, 29 Apr 2015 04:05:47 +0000 (04:05 +0000)]
am
a39e4d37: am
77ad81b5: am
ff1bfac6: am
c637af9e: am
75f071df: Merge "Localized Android landing pages Bug:
19124242" into lmp-docs
* commit '
a39e4d3716a10e84acbfc0813745ee4303f1edb2':
David Friedman [Wed, 29 Apr 2015 03:51:39 +0000 (03:51 +0000)]
am
3d983dea: am
21a9fa47: am
75f071df: Merge "Localized Android landing pages Bug:
19124242" into lmp-docs
* commit '
3d983deace20df9437bc9efebc67550f3904eee3':
Localized Android landing pages Bug:
19124242
David Friedman [Wed, 29 Apr 2015 03:48:52 +0000 (03:48 +0000)]
am
77ad81b5: am
ff1bfac6: am
c637af9e: am
75f071df: Merge "Localized Android landing pages Bug:
19124242" into lmp-docs
* commit '
77ad81b5301bfbf1691bdad203dd70ce68ce40b3':
David Friedman [Wed, 29 Apr 2015 03:25:38 +0000 (03:25 +0000)]
am
ff1bfac6: am
c637af9e: am
75f071df: Merge "Localized Android landing pages Bug:
19124242" into lmp-docs
* commit '
ff1bfac68b977f577d537172d87daa5c816be3b7':
Localized Android landing pages Bug:
19124242
David Friedman [Wed, 29 Apr 2015 03:25:15 +0000 (03:25 +0000)]
am
21a9fa47: am
75f071df: Merge "Localized Android landing pages Bug:
19124242" into lmp-docs
* commit '
21a9fa471bcc57196a19e40ca29dbaa97233244c':
Localized Android landing pages Bug:
19124242
David Friedman [Wed, 29 Apr 2015 03:13:59 +0000 (03:13 +0000)]
am
c637af9e: am
75f071df: Merge "Localized Android landing pages Bug:
19124242" into lmp-docs
* commit '
c637af9eee48334e6d8d65428734c8928e9bac55':
Localized Android landing pages Bug:
19124242
David Friedman [Wed, 29 Apr 2015 03:01:57 +0000 (03:01 +0000)]
am
75f071df: Merge "Localized Android landing pages Bug:
19124242" into lmp-docs
* commit '
75f071df44d3231f2f9d2616277b9065e1dedc12':
Localized Android landing pages Bug:
19124242
David Friedman [Wed, 29 Apr 2015 03:01:10 +0000 (03:01 +0000)]
am
75f071df: Merge "Localized Android landing pages Bug:
19124242" into lmp-docs
* commit '
75f071df44d3231f2f9d2616277b9065e1dedc12':
Localized Android landing pages Bug:
19124242
David Friedman [Wed, 29 Apr 2015 02:49:23 +0000 (02:49 +0000)]
Merge "Localized Android landing pages Bug:
19124242" into lmp-docs
Alex Klyubin [Wed, 29 Apr 2015 01:45:24 +0000 (01:45 +0000)]
am
0838084a: Merge "Align AndroidKeyStore API with user auth API." into mnc-dev
* commit '
0838084a3c92d2c64b7eeec6b8a41156977dab59':
Align AndroidKeyStore API with user auth API.
Jeff Brown [Wed, 29 Apr 2015 01:45:20 +0000 (01:45 +0000)]
am
b957a742: Merge changes from topic \'brightness\' into mnc-dev
* commit '
b957a742b29fa6c7a2eda7d60cf61e8af4668ef8':
Add code to collect data about auto-brightness adjustments.
Add float support to binary event log.
Fabrice Di Meglio [Wed, 29 Apr 2015 01:45:04 +0000 (01:45 +0000)]
am
46fc1101: Merge "Use Default Browser App for IntentResolution when needed" into mnc-dev
* commit '
46fc110104f3017f23abb397ca817db2be39f1a2':
Use Default Browser App for IntentResolution when needed
Christopher Tate [Wed, 29 Apr 2015 01:44:56 +0000 (01:44 +0000)]
am
d6db7eac: Merge "Don\'t ostensibly back off fstrim but then do it anyway" into mnc-dev
* commit '
d6db7eacc983e22eb88fc7b465f290670127569a':
Don't ostensibly back off fstrim but then do it anyway
Amith Yamasani [Wed, 29 Apr 2015 01:44:50 +0000 (01:44 +0000)]
am
7c97a3dd: Merge "Permissions control via profile/device owner admin" into mnc-dev
* commit '
7c97a3ddea62a3bd8a95ca51e7b172b209388815':
Permissions control via profile/device owner admin
Simranjit Singh Kohli [Wed, 29 Apr 2015 01:44:45 +0000 (01:44 +0000)]
am
1f1b88b2: Merge "AccountsDb Logging]: Introducing logging in accountsDb." into mnc-dev
* commit '
1f1b88b22bf2d22a1074785132a976bb83a4a1d8':
AccountsDb Logging]: Introducing logging in accountsDb.
Mathieu Chartier [Wed, 29 Apr 2015 01:44:41 +0000 (01:44 +0000)]
am
325a5721: Merge "Properly describe exception" into mnc-dev
* commit '
325a57218e9f13cf696215006c230cac34b3c8a1':
Properly describe exception
Alan Viverette [Wed, 29 Apr 2015 01:44:36 +0000 (01:44 +0000)]
am
e861c8eb: Merge "Fix DatePicker max date, disabled day color, and arrow visibility" into mnc-dev
* commit '
e861c8eb636bea97c1646cc3bfee1cd32670fe61':
Fix DatePicker max date, disabled day color, and arrow visibility
Wale Ogunwale [Wed, 29 Apr 2015 01:44:32 +0000 (01:44 +0000)]
am
b1c9539d: Merge "@hide resizeableActivity attribute and remove from public api" into mnc-dev
* commit '
b1c9539d3fa11cf7573ed9faaade4872e1a952f0':
@hide resizeableActivity attribute and remove from public api
Jorim Jaggi [Wed, 29 Apr 2015 01:44:20 +0000 (01:44 +0000)]
am
b3a020a6: Merge "Fix build." into mnc-dev
* commit '
b3a020a6de45bbcb1329d8f820e569cfd0de9325':
Fix build.
Selim Cinek [Wed, 29 Apr 2015 01:44:14 +0000 (01:44 +0000)]
am
61a75423: Merge "Follow up CL for heads up notification refactoring" into mnc-dev
* commit '
61a75423648a0070406e9b7aeda1a55e173bd467':
Follow up CL for heads up notification refactoring
Yorke Lee [Wed, 29 Apr 2015 01:44:08 +0000 (01:44 +0000)]
am
f7143ce6: Merge "Make BIND_INCALL_SERVICE and BIND_CONNECTION_SERVICE public" into mnc-dev
* commit '
f7143ce657aa735e92bcbb1287dea4d8a1c82e93':
Make BIND_INCALL_SERVICE and BIND_CONNECTION_SERVICE public
Christopher Tate [Wed, 29 Apr 2015 01:44:00 +0000 (01:44 +0000)]
am
de8c7526: Merge "Give scheduled jobs a more substantial timeslice" into mnc-dev
* commit '
de8c75263b02cceb2ed223d5099750d83a0b31e9':
Give scheduled jobs a more substantial timeslice
Jorim Jaggi [Wed, 29 Apr 2015 01:43:56 +0000 (01:43 +0000)]
am
420f2688: Merge "Only listen for fingerprint if needed." into mnc-dev
* commit '
420f2688f0ecfafff6b07755e47f0bd0d34b2fc8':
Only listen for fingerprint if needed.
Jorim Jaggi [Wed, 29 Apr 2015 01:43:51 +0000 (01:43 +0000)]
am
9a1df486: Merge "Add animation for fingerprint error state" into mnc-dev
* commit '
9a1df48620d07d743f2da5bec2cc9c8a68591c97':
Add animation for fingerprint error state
Adam Powell [Wed, 29 Apr 2015 01:43:47 +0000 (01:43 +0000)]
am
4e678ff8: Merge "Fix a bug when constructing a ChooserTargetAdapter without custom targets" into mnc-dev
* commit '
4e678ff89d17bc0dbd18517a7187ea385e5e1d53':
Fix a bug when constructing a ChooserTargetAdapter without custom targets
Adrian Roos [Wed, 29 Apr 2015 01:43:35 +0000 (01:43 +0000)]
am
ca067e97: Merge "Rename windowLightStatusBar" into mnc-dev
* commit '
ca067e9703ab9fcee430d13aac28d04bdc46af2a':
Rename windowLightStatusBar
dcashman [Wed, 29 Apr 2015 01:43:24 +0000 (01:43 +0000)]
am
fd4e5664: Merge "Fix PackageManagerSettingsTests and add KeySet info." into mnc-dev
* commit '
fd4e5664528f61b7ac2164ec8ec2206da9deebff':
Fix PackageManagerSettingsTests and add KeySet info.
Adrian Roos [Wed, 29 Apr 2015 01:43:07 +0000 (01:43 +0000)]
am
59a1e117: Merge changes from topic \'roosa-lpu\' into mnc-dev
* commit '
59a1e117ac00b71756abce44afe96002d4de3fa4':
Remove LockPatternUtils.getCurrentUser()
Require explicit userId in LockPatternUtils
Chris Craik [Wed, 29 Apr 2015 01:43:02 +0000 (01:43 +0000)]
am
2f1d09c3: Merge "Use default constructor to get anti-aliasing" into mnc-dev
* commit '
2f1d09c3c5e80e875f588d77bc1e47d317491fa8':
Use default constructor to get anti-aliasing
Chris Craik [Wed, 29 Apr 2015 01:42:43 +0000 (01:42 +0000)]
am
ff623a5a: Merge "Remove unused flags and dirty rects" into mnc-dev
* commit '
ff623a5ab3b26cd98790e355e316a65d76197cbd':
Remove unused flags and dirty rects
Tony Mantler [Wed, 29 Apr 2015 01:42:35 +0000 (01:42 +0000)]
am
aadac158: Merge "Make sure Transition constructor is accessible before invoking" into mnc-dev
* commit '
aadac158bfd533e00b92374afee066bcba22b988':
Make sure Transition constructor is accessible before invoking
Luan Nguyen [Wed, 29 Apr 2015 01:42:24 +0000 (01:42 +0000)]
am
50ea9422: am
4e7500e1: am
c1609dc0: docs: Update information on delivering message to clarify that MessageAPI is not reliable.
* commit '
50ea942255e139d3ace81cdd3f90be75625edd69':
docs: Update information on delivering message to clarify that MessageAPI is not reliable.
Joshua Schwarz [Wed, 29 Apr 2015 01:42:17 +0000 (01:42 +0000)]
am
6bb65f0d: am
a4edc82e: am
4547dac0: Fix one-off error in reporting.
* commit '
6bb65f0d837ea9e49238415f907db5ae6da26eca':
Fix one-off error in reporting.
Craig Mautner [Wed, 29 Apr 2015 01:41:56 +0000 (01:41 +0000)]
am
6b3e0587: Merge "Notify client of all window movements." into mnc-dev
* commit '
6b3e0587a052121fd572fd609abcbc75a89d53d6':
Notify client of all window movements.
Eino-Ville Talvala [Wed, 29 Apr 2015 01:41:36 +0000 (01:41 +0000)]
am
fa1c1f97: Merge "Camera2: Fix auto-gen documentation crossreferences." into mnc-dev
* commit '
fa1c1f97df601df50b3998f7ae98a2d3bfb03466':
Camera2: Fix auto-gen documentation crossreferences.
Alan Viverette [Wed, 29 Apr 2015 01:41:28 +0000 (01:41 +0000)]
am
4703273e: Merge "Layout layers without intrinsic dimensions using FILL gravity" into mnc-dev
* commit '
4703273e400981e9ec1bca7e9fbf949b20e91d57':
Layout layers without intrinsic dimensions using FILL gravity
Mike Lockwood [Wed, 29 Apr 2015 01:41:21 +0000 (01:41 +0000)]
am
986da92b: Merge "MidiFramer: Add support for SysEx messages" into mnc-dev
* commit '
986da92bdf0d621956d42adc1398c094a034793e':
MidiFramer: Add support for SysEx messages
Yorke Lee [Wed, 29 Apr 2015 01:41:02 +0000 (01:41 +0000)]
am
b7018ba6: Merge "Simplify DefaultDialerManager" into mnc-dev
* commit '
b7018ba66046097d81c8d3b48e58e6d8aeab893a':
Simplify DefaultDialerManager
Paul McLean [Wed, 29 Apr 2015 01:40:52 +0000 (01:40 +0000)]
am
c8240411: Merge "AudioRecord device select continued" into mnc-dev
* commit '
c8240411c38b78ac8095f6e8067f7bcc7046f502':
AudioRecord device select continued