OSDN Git Service
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
Jeff Brown [Wed, 29 Apr 2015 01:17:56 +0000 (01:17 +0000)]
Merge changes from topic 'brightness' into mnc-dev
* changes:
Add code to collect data about auto-brightness adjustments.
Add float support to binary event log.
Jeff Brown [Fri, 24 Apr 2015 02:58:06 +0000 (19:58 -0700)]
Add code to collect data about auto-brightness adjustments.
Write samples of the old and new state to the binary event log whenever
the user modifies the auto-brightness adjustment. We wait a few seconds
before logging to ensure that the user is satisfied with the adjustment.
Bug:
19786916
Change-Id: I41402decd1034d0839aa0f47495bc00907ab9c08
Jeff Brown [Tue, 28 Apr 2015 20:26:48 +0000 (13:26 -0700)]
Add float support to binary event log.
Bug:
20664753
Change-Id: I90456400b878f943e39cbddec45649662176e2aa
Fabrice Di Meglio [Wed, 29 Apr 2015 00:42:43 +0000 (00:42 +0000)]
Merge "Use Default Browser App for IntentResolution when needed" into mnc-dev
Fabrice Di Meglio [Sat, 11 Apr 2015 03:40:16 +0000 (20:40 -0700)]
Use Default Browser App for IntentResolution when needed
- add MATCH_ALL as a new flag for telling that all results need to
be returned (even if there is some sort of filtering done).
- take into account the default Browser App for Intent resolution
- also, dont do any domain verification priming for non system app
See bug #
20144393
Change-Id: Iddd1f2029e3bbf3b99ebc5f416dc7f17e5bad10c
Christopher Tate [Wed, 29 Apr 2015 00:22:29 +0000 (00:22 +0000)]
Merge "Don't ostensibly back off fstrim but then do it anyway" into mnc-dev
Amith Yamasani [Wed, 29 Apr 2015 00:16:59 +0000 (00:16 +0000)]
Merge "Permissions control via profile/device owner admin" into mnc-dev
Christopher Tate [Tue, 28 Apr 2015 23:32:55 +0000 (16:32 -0700)]
Don't ostensibly back off fstrim but then do it anyway
When the mount service isn't up yet, we schedule a retry in the near
future, but then mistakenly go ahead and try (unsuccessfully) to do the
fstrim immediately anyway. Don't do that. Furthermore, when in this
situation make sure to preserve knowledge of any completion callback
that may be expecting to hear back about the [eventual] fstrim operation.
Change-Id: Ic7cba37b4f850540f6e448168be0c42418039b01
Simranjit Singh Kohli [Wed, 29 Apr 2015 00:12:28 +0000 (00:12 +0000)]
Merge "AccountsDb Logging]: Introducing logging in accountsDb." into mnc-dev
Mathieu Chartier [Tue, 28 Apr 2015 23:47:25 +0000 (23:47 +0000)]
Merge "Properly describe exception" into mnc-dev
Mathieu Chartier [Tue, 28 Apr 2015 23:30:30 +0000 (16:30 -0700)]
Properly describe exception
Previously we used DetachCurrentThread which raised a SIGABRT from
within ART. The new approach is to use ExceptionDescribe and exit.
Bug:
20640601
(cherry picked from commit
d12065f581defd9e8199593e85aa2036a0713684)
Change-Id: I00126b678ff296e0076247554af8328fe2767038
Alan Viverette [Tue, 28 Apr 2015 23:39:05 +0000 (23:39 +0000)]
Merge "Fix DatePicker max date, disabled day color, and arrow visibility" into mnc-dev
Wale Ogunwale [Tue, 28 Apr 2015 23:38:55 +0000 (23:38 +0000)]
Merge "@hide resizeableActivity attribute and remove from public api" into mnc-dev
Wale Ogunwale [Tue, 28 Apr 2015 22:57:06 +0000 (15:57 -0700)]
@hide resizeableActivity attribute and remove from public api
The world is not ready for it ;)
Bug:
20643000
Change-Id: Ia1fbf0450ded8afbd7d876ef2e5ec4eaccb8e6ac
Jorim Jaggi [Tue, 28 Apr 2015 23:29:36 +0000 (23:29 +0000)]
Merge "Fix build." into mnc-dev
Jorim Jaggi [Tue, 28 Apr 2015 23:28:26 +0000 (16:28 -0700)]
Fix build.
Change-Id: Ieebcab9eb6588afc560179103d78ad4011fe152c
Selim Cinek [Tue, 28 Apr 2015 23:27:56 +0000 (23:27 +0000)]
Merge "Follow up CL for heads up notification refactoring" into mnc-dev
Selim Cinek [Wed, 15 Apr 2015 23:18:39 +0000 (16:18 -0700)]
Follow up CL for heads up notification refactoring
Change-Id: Iaf286dfd30a86d3d7d6dd947d3c10ac9eb8c2b1e
Yorke Lee [Tue, 28 Apr 2015 23:22:31 +0000 (23:22 +0000)]
Merge "Make BIND_INCALL_SERVICE and BIND_CONNECTION_SERVICE public" into mnc-dev
Simranjit Singh Kohli [Thu, 9 Apr 2015 20:58:44 +0000 (13:58 -0700)]
AccountsDb Logging]: Introducing logging in accountsDb.
This CL introduces logging for various functions like add/remove accounts,
clear/set tokens. It is made sure not to log any PII in the new table.
Bug:
18168971
Change-Id: Iacc3e7e80a640fcb113886443172809e8f7bee21
Yorke Lee [Tue, 28 Apr 2015 23:08:25 +0000 (16:08 -0700)]
Make BIND_INCALL_SERVICE and BIND_CONNECTION_SERVICE public
These system|signature only permissions must be required by
an InCallService and ConnectionService respectively.
Bug:
20304458
Change-Id: I26156afb610a7f549c0a1a7c01c2096928ef33a7
Christopher Tate [Tue, 28 Apr 2015 23:10:37 +0000 (23:10 +0000)]
Merge "Give scheduled jobs a more substantial timeslice" into mnc-dev
Jorim Jaggi [Tue, 28 Apr 2015 23:01:41 +0000 (23:01 +0000)]
Merge "Only listen for fingerprint if needed." into mnc-dev
Jorim Jaggi [Tue, 28 Apr 2015 23:01:13 +0000 (23:01 +0000)]
Merge "Add animation for fingerprint error state" into mnc-dev
Adam Powell [Tue, 28 Apr 2015 22:59:57 +0000 (22:59 +0000)]
Merge "Fix a bug when constructing a ChooserTargetAdapter without custom targets" into mnc-dev
Adrian Roos [Tue, 28 Apr 2015 22:44:57 +0000 (22:44 +0000)]
Merge "Rename windowLightStatusBar" into mnc-dev
Christopher Tate [Tue, 28 Apr 2015 22:43:44 +0000 (15:43 -0700)]
Give scheduled jobs a more substantial timeslice
One minute turns out to be quite limiting in practice, and we still
shut them down summarily when their run constraints become unsatisfied,
so widen the window to 10 minutes.
Bug
20143368
Change-Id: I2aba521f65b94e9fb8d519b0492625d35aaba267
Adam Powell [Tue, 28 Apr 2015 22:41:46 +0000 (15:41 -0700)]
Fix a bug when constructing a ChooserTargetAdapter without custom
targets
Bug
20667333
Change-Id: Ia35021d12c00f64f5424588f776d79e18e8d518e
dcashman [Tue, 28 Apr 2015 22:25:47 +0000 (22:25 +0000)]
Merge "Fix PackageManagerSettingsTests and add KeySet info." into mnc-dev
Adrian Roos [Tue, 28 Apr 2015 22:09:35 +0000 (22:09 +0000)]
Merge changes from topic 'roosa-lpu' into mnc-dev
* changes:
Remove LockPatternUtils.getCurrentUser()
Require explicit userId in LockPatternUtils
dcashman [Mon, 27 Apr 2015 21:02:49 +0000 (14:02 -0700)]
Fix PackageManagerSettingsTests and add KeySet info.
Add unit tests for the keyset portion of packages.xml. Also fix previously
broken test by adding UserManagerService reference.
Bug:
19530911
Bug:
19530120
Change-Id: I251fc3e9dc983f1d63f9e84905d3ed0e64843def
Chris Craik [Tue, 28 Apr 2015 22:06:16 +0000 (22:06 +0000)]
Merge "Use default constructor to get anti-aliasing" into mnc-dev
Chris Craik [Tue, 28 Apr 2015 21:39:48 +0000 (21:39 +0000)]
Merge "Remove unused flags and dirty rects" into mnc-dev
Amith Yamasani [Tue, 28 Apr 2015 21:00:26 +0000 (14:00 -0700)]
Permissions control via profile/device owner admin
Profile owners and Device owners can set policies for runtime
permissions. Blanket grant/deny policy can be set for a user.
They can also explicitly grant/revoke permissions for specific apps
which cannot be overridden by the user and will not be prompted.
[More implementation required in PackageManagerService and
PackageInstaller]
Bug:
20666663
Change-Id: I2c25c18c2a195db9023a17716d5896970848bb45
Tony Mantler [Tue, 28 Apr 2015 21:26:31 +0000 (21:26 +0000)]
Merge "Make sure Transition constructor is accessible before invoking" into mnc-dev
Tony Mantler [Tue, 28 Apr 2015 21:17:06 +0000 (14:17 -0700)]
Make sure Transition constructor is accessible before invoking
b/
20666031
Change-Id: Ief519ac00aed8ce84cbc852025f91cc03da90c55
Luan Nguyen [Tue, 28 Apr 2015 21:09:22 +0000 (21:09 +0000)]
am
4e7500e1: am
c1609dc0: docs: Update information on delivering message to clarify that MessageAPI is not reliable.
* commit '
4e7500e10cf10eb697bb3e916bf705b9db470c8f':
docs: Update information on delivering message to clarify that MessageAPI is not reliable.
Joshua Schwarz [Tue, 28 Apr 2015 21:09:13 +0000 (21:09 +0000)]
am
a4edc82e: am
4547dac0: Fix one-off error in reporting.
* commit '
a4edc82e9b50189b187996e8c4f4e851bdf83893':
Fix one-off error in reporting.
Alan Viverette [Tue, 28 Apr 2015 21:07:36 +0000 (14:07 -0700)]
Fix DatePicker max date, disabled day color, and arrow visibility
Day validation moved from the PagerAdapter to the DayPickerView,
which is widget that actually handles the touch interaction and
disabled state for individual days.
Fixed disabled states for primary and secondary activated text
colors. Replaced old light/dark color state lists with themed
versions.
Removed conflicting view visibility changes for managing next and
previous arrows in DayPickerView.
Bug:
20630417
Bug:
20641013
Bug:
20641879
Change-Id: Icdaf02a3b57ec162169c31b8a27ebea908552321
Jorim Jaggi [Tue, 28 Apr 2015 20:45:11 +0000 (13:45 -0700)]
Only listen for fingerprint if needed.
Clean up fingerprint listening lifecycle. Only listen for fingerprint
if both screen is turned on and Keyguard is actually showing
(not occluded).
Change-Id: I169ce9df308b96487ed9dc5c8ad8f1c301f2ef93
Adrian Roos [Tue, 28 Apr 2015 20:44:43 +0000 (13:44 -0700)]
Rename windowLightStatusBar
Bug:
20642760
Change-Id: If961c758bb034ff9643d7b06a2baafe7307f4051
Luan Nguyen [Tue, 28 Apr 2015 20:39:14 +0000 (20:39 +0000)]
am
c1609dc0: docs: Update information on delivering message to clarify that MessageAPI is not reliable.
* commit '
c1609dc0b25c3143ae8d74bc44fb36873b7d289c':
docs: Update information on delivering message to clarify that MessageAPI is not reliable.
Craig Mautner [Tue, 28 Apr 2015 20:33:46 +0000 (20:33 +0000)]
Merge "Notify client of all window movements." into mnc-dev
Jorim Jaggi [Tue, 28 Apr 2015 20:27:12 +0000 (13:27 -0700)]
Add animation for fingerprint error state
- Put lock icon logic in a separate class.
- Add animation when switching between fingerprint scanning and
fingerprint error.
Change-Id: I87c3f101d645a990d5397b82a797c9ee40a63da2
Eino-Ville Talvala [Tue, 28 Apr 2015 20:01:50 +0000 (20:01 +0000)]
Merge "Camera2: Fix auto-gen documentation crossreferences." into mnc-dev
Alan Viverette [Tue, 28 Apr 2015 19:51:43 +0000 (19:51 +0000)]
Merge "Layout layers without intrinsic dimensions using FILL gravity" into mnc-dev
Eino-Ville Talvala [Thu, 16 Apr 2015 23:39:45 +0000 (16:39 -0700)]
Camera2: Fix auto-gen documentation crossreferences.
Also update a few outdated notes.
Bug:
20085848
Change-Id: I1aace2152ee937c6c6a4701af999722fdc2e3da7
Mike Lockwood [Tue, 28 Apr 2015 19:36:27 +0000 (19:36 +0000)]
Merge "MidiFramer: Add support for SysEx messages" into mnc-dev
Mike Lockwood [Tue, 28 Apr 2015 18:03:38 +0000 (11:03 -0700)]
MidiFramer: Add support for SysEx messages
Change-Id: I15a605029a0e89fa75c57f180a5a951ada88461c
Yorke Lee [Tue, 28 Apr 2015 18:57:45 +0000 (18:57 +0000)]
Merge "Simplify DefaultDialerManager" into mnc-dev
Chris Craik [Tue, 28 Apr 2015 18:49:27 +0000 (11:49 -0700)]
Use default constructor to get anti-aliasing
Change-Id: I3e078a3bc91a2fd703984ba18b5e7e98069b32f1
Adrian Roos [Fri, 17 Apr 2015 02:31:29 +0000 (19:31 -0700)]
Remove LockPatternUtils.getCurrentUser()
Bug:
18931518
Change-Id: I177eefe466c12217cf64c85b872f71bc23c7bf05
Adrian Roos [Fri, 17 Apr 2015 00:11:20 +0000 (17:11 -0700)]
Require explicit userId in LockPatternUtils
Bug:
18931518
Change-Id: Ib03f37df9135f0324a998c62d165d8eea46328c8
Luan Nguyen [Tue, 28 Apr 2015 18:36:42 +0000 (11:36 -0700)]
docs: Update information on delivering message to clarify that
MessageAPI is not reliable.
bug:
20088602
Change-Id: I2244598e5a155bc6e477d367287b8683ebdf019f
Yorke Lee [Tue, 28 Apr 2015 16:39:20 +0000 (09:39 -0700)]
Simplify DefaultDialerManager
The previous code worked with ComponentNames because it was
based off existing code for the default SMS application.
We only really need the package name however, so simplify the
code by storing and retrieving the package name directly.
Bug:
20304458
Change-Id: Icabd3a9f0f8166c105360494b601160d13767fad
Joshua Schwarz [Tue, 28 Apr 2015 18:28:18 +0000 (18:28 +0000)]
am
4547dac0: Fix one-off error in reporting.
* commit '
4547dac01f3136393cc708bb49ff546413a45d6c':
Fix one-off error in reporting.
Paul McLean [Tue, 28 Apr 2015 18:26:10 +0000 (18:26 +0000)]
Merge "AudioRecord device select continued" into mnc-dev
Yin-Chia Yeh [Tue, 28 Apr 2015 18:12:10 +0000 (18:12 +0000)]
am
5af4cc39: Merge "Camera: document supported templates" into mnc-dev
* commit '
5af4cc3922e8e1b6e1c89ee438c40c89980583ac':
Camera: document supported templates
Amit Mahajan [Tue, 28 Apr 2015 18:12:05 +0000 (18:12 +0000)]
am
e3e60ebc: Merge "Revert "Adding logging to debug SignalStrength callback missing issue."" into mnc-dev
* commit '
e3e60ebc36b1dcbb085ebe33e04cb6b83c610832':
Revert "Adding logging to debug SignalStrength callback missing issue."
Alan Viverette [Tue, 28 Apr 2015 18:00:19 +0000 (18:00 +0000)]
am
f8fdf87c: Merge "Fix handling of android:onClick for ContextWrapper" into mnc-dev
* commit '
f8fdf87c060fa77a1910d8b6f4b6d26c83963033':
Fix handling of android:onClick for ContextWrapper
Amith Yamasani [Tue, 28 Apr 2015 18:00:14 +0000 (18:00 +0000)]
am
c1ce0bbd: Merge "Mark actually seen notifications as seen" into mnc-dev
* commit '
c1ce0bbd149600fff3c7bada1c13bb00ccdbea1d':
Mark actually seen notifications as seen
Zhijun He [Tue, 28 Apr 2015 18:00:08 +0000 (18:00 +0000)]
am
513f7c33: Camera2: add max capture stall for reprocess
* commit '
513f7c33eae0084ecd70062d660f2b873032d895':
Camera2: add max capture stall for reprocess
Yin-Chia Yeh [Tue, 28 Apr 2015 17:55:13 +0000 (17:55 +0000)]
Merge "Camera: document supported templates" into mnc-dev
Yin-Chia Yeh [Sat, 25 Apr 2015 00:48:04 +0000 (17:48 -0700)]
Camera: document supported templates
Bug:
20264663
Change-Id: I6fee34a337bccb61aa563903032f9e2c13bf65e0
Amit Mahajan [Tue, 28 Apr 2015 17:53:14 +0000 (17:53 +0000)]
Merge "Revert "Adding logging to debug SignalStrength callback missing issue."" into mnc-dev
Amit Mahajan [Mon, 27 Apr 2015 22:58:29 +0000 (22:58 +0000)]
Revert "Adding logging to debug SignalStrength callback missing issue."
This reverts commit
6ba726f825162481644df89cf0754f4e20f2793e.
Bug:
20444738
Change-Id: Idf118b259cfd3854feac851b9532d4fff1d74985
Alan Viverette [Tue, 28 Apr 2015 17:49:19 +0000 (17:49 +0000)]
Merge "Fix handling of android:onClick for ContextWrapper" into mnc-dev
Amith Yamasani [Tue, 28 Apr 2015 17:48:15 +0000 (17:48 +0000)]
Merge "Mark actually seen notifications as seen" into mnc-dev
Alan Viverette [Tue, 28 Apr 2015 17:44:50 +0000 (10:44 -0700)]
Layout layers without intrinsic dimensions using FILL gravity
Addresses a regression in Calendar where a custom drawable that doesn't
implement intrinsic bounds is laid out incorrectly. Also fixes an issue
where ColorDrawable would be laid out incorrectly.
Bug:
20643614
Change-Id: I796f0d3e189e482cf6fa169a5dd13f654d72653c
Zhijun He [Sat, 25 Apr 2015 01:23:54 +0000 (18:23 -0700)]
Camera2: add max capture stall for reprocess
Bug:
19988710
Change-Id: I05bf3f72fdd54127d9aaa1583e9b0903be94c310
Wale Ogunwale [Tue, 28 Apr 2015 17:29:46 +0000 (17:29 +0000)]
am
354b70f7: Merge "Set non-starting visible resumed activity as resumed activity for the stack" into mnc-dev
* commit '
354b70f7d209e79e4442d4b70fb1d849163eae3d':
Set non-starting visible resumed activity as resumed activity for the stack