Commit Graph

199884 Commits

Author SHA1 Message Date
Jason Monk
e2ca38a2b8 am 94227750: am cdca13c6: Merge "Fix intent tile to unlock on launching activities" into mnc-dev
* commit '942277508f4cf7081ffe62ef0448a194928bb590':
  Fix intent tile to unlock on launching activities
2015-06-19 18:41:39 +00:00
Abodunrinwa Toki
1767b1fed4 am e497455f: am 6983752a: Merge "Better FloatingToolbar positioning." into mnc-dev
* commit 'e497455f637540507a923954cec5bbfad1213a8e':
  Better FloatingToolbar positioning.
2015-06-19 18:41:34 +00:00
David Srbecky
bf226f4f25 am ef3a5b1e: am f32f7a3f: Merge "Replace --include-cfi with --generate-debug-info." into mnc-dev
* commit 'ef3a5b1eba01aa6ff14c4780c7529d9539e0812f':
  Replace --include-cfi with --generate-debug-info.
2015-06-19 18:41:30 +00:00
Oleksiy Vyalov
150042522d am 85538671: am 71f9ec27: Merge "Resolve canonical package path before writing it to packages.list." into mnc-dev
* commit '855386712e30f0caa513fe4afeb34f9ff2a9c3ba':
  Resolve canonical package path before writing it to packages.list.
2015-06-19 18:41:25 +00:00
Alan Viverette
9e08cf8f8f am 4e537151: am 7c669f45: Merge "Revert "Work around inconsistent views in RelativeLayout.onMeasure()"" into mnc-dev
* commit '4e537151351e14cd2bc9c30934bac8e8a3010432':
  Revert "Work around inconsistent views in RelativeLayout.onMeasure()"
2015-06-19 18:41:21 +00:00
Christopher Tate
fdcb8ebb00 am 51f9a543: am 7ad40c50: Merge "Debug logging for a certain class of binder transaction failures" into mnc-dev
* commit '51f9a5433df5663af4ba32061ae0cbf426e07f23':
  Debug logging for a certain class of binder transaction failures
2015-06-19 18:41:16 +00:00
Jason Monk
942277508f am cdca13c6: Merge "Fix intent tile to unlock on launching activities" into mnc-dev
* commit 'cdca13c613d3a8c9c8d7f4c9c29f4cb47d1bdb8d':
  Fix intent tile to unlock on launching activities
2015-06-19 18:35:51 +00:00
Abodunrinwa Toki
e497455f63 am 6983752a: Merge "Better FloatingToolbar positioning." into mnc-dev
* commit '6983752a10a4dc097bc49882f8ea2ba874d554da':
  Better FloatingToolbar positioning.
2015-06-19 18:35:47 +00:00
David Srbecky
ef3a5b1eba am f32f7a3f: Merge "Replace --include-cfi with --generate-debug-info." into mnc-dev
* commit 'f32f7a3ffdbb80fb8d635c1aacaf0c7d2c2dde9f':
  Replace --include-cfi with --generate-debug-info.
2015-06-19 18:35:42 +00:00
Jason Monk
cdca13c613 Merge "Fix intent tile to unlock on launching activities" into mnc-dev 2015-06-19 18:29:00 +00:00
Abodunrinwa Toki
6983752a10 Merge "Better FloatingToolbar positioning." into mnc-dev 2015-06-19 18:28:20 +00:00
Oleksiy Vyalov
855386712e am 71f9ec27: Merge "Resolve canonical package path before writing it to packages.list." into mnc-dev
* commit '71f9ec2708aa5af69ee35e26215a7a13c31e6cfa':
  Resolve canonical package path before writing it to packages.list.
2015-06-19 18:27:58 +00:00
Alan Viverette
4e53715135 am 7c669f45: Merge "Revert "Work around inconsistent views in RelativeLayout.onMeasure()"" into mnc-dev
* commit '7c669f4547d459d64ac403647e177b9953dfe60a':
  Revert "Work around inconsistent views in RelativeLayout.onMeasure()"
2015-06-19 18:27:53 +00:00
Christopher Tate
51f9a5433d am 7ad40c50: Merge "Debug logging for a certain class of binder transaction failures" into mnc-dev
* commit '7ad40c503281a797e2ca30e5e06a6e0c562471a7':
  Debug logging for a certain class of binder transaction failures
2015-06-19 18:27:49 +00:00
David Srbecky
f32f7a3ffd Merge "Replace --include-cfi with --generate-debug-info." into mnc-dev 2015-06-19 18:26:42 +00:00
Jason Monk
ee43cdfa43 Fix intent tile to unlock on launching activities
Change-Id: Ibde6a21d5a36d4697101e2201d1d77e26d684753
2015-06-19 14:26:25 -04:00
Oleksiy Vyalov
71f9ec2708 Merge "Resolve canonical package path before writing it to packages.list." into mnc-dev 2015-06-19 18:25:12 +00:00
Alan Viverette
7c669f4547 Merge "Revert "Work around inconsistent views in RelativeLayout.onMeasure()"" into mnc-dev 2015-06-19 18:20:21 +00:00
Alan Viverette
9355533bf6 Revert "Work around inconsistent views in RelativeLayout.onMeasure()"
This reverts commit 3e2e064a1f.

Change-Id: Ib3712076585cba507ef1666e3fb6abb2bedb016f
2015-06-19 18:19:56 +00:00
Christopher Tate
7ad40c5032 Merge "Debug logging for a certain class of binder transaction failures" into mnc-dev 2015-06-19 18:19:15 +00:00
Christopher Tate
8a2ce3c751 Debug logging for a certain class of binder transaction failures
Bug 21801759

Change-Id: I9973d4ffb9450e510a4e1c64e2eae1489ce93054
2015-06-19 11:17:24 -07:00
Abodunrinwa Toki
9ae95dff1d Better FloatingToolbar positioning.
-The toolbar is now rendered over the IME.
-The toolbar respects the presence of the IME and tries as much as
 possible not to obstruct it.
-The toolbar may obstruct the IME if there is limited space and we
 can't find a position that won't obstruct the IME.

*A side effect of the toolbar over the IME is that TextView handles
 will also always be rendered over the IME where necessary. This was
 the previous behavior before the regression.

Bug: 17510971
Change-Id: I26a49565bf025d7c007ba6bb80468c4988fcc051
2015-06-19 19:15:50 +01:00
Tony Mak
8ffdc048f8 am 2cb9edf5: am 92dfab8d: Merge "Clear granted permission when app is uninstalled by one of the multiple users" into mnc-dev
* commit '2cb9edf550c19c8c6d12a5ff8dd98412802695e5':
  Clear granted permission when app is uninstalled by one of the multiple users
2015-06-19 17:23:17 +00:00
Tony Mak
2cb9edf550 am 92dfab8d: Merge "Clear granted permission when app is uninstalled by one of the multiple users" into mnc-dev
* commit '92dfab8d96dc854b8ccc48e1b2805069997879d5':
  Clear granted permission when app is uninstalled by one of the multiple users
2015-06-19 17:11:12 +00:00
Eric Laurent
ac5ac9ea12 am 6c79de76: am 1f98e79a: Merge "audio effect JNI: fix global ref leak." into mnc-dev
* commit '6c79de76a16ed1580613931dffad15ea9a454abc':
  audio effect JNI: fix global ref leak.
2015-06-19 17:10:42 +00:00
Wale Ogunwale
dd5cb9a86f am a52a95f4: am 8f4ccd6c: Merge "Reduce log noise." into mnc-dev
* commit 'a52a95f405d7df90bd83798c39c8ca1969400e4e':
  Reduce log noise.
2015-06-19 16:59:17 +00:00
Wale Ogunwale
91c0fbd126 am 0b3be03c: am 4186c977: Merge "Don\'t write IntentFilter autoVerify field to xml if false." into mnc-dev
* commit '0b3be03c29ee46838af6ee7e436f3bc935dc7288':
  Don't write IntentFilter autoVerify field to xml if false.
2015-06-19 16:59:11 +00:00
Tony Mak
92dfab8d96 Merge "Clear granted permission when app is uninstalled by one of the multiple users" into mnc-dev 2015-06-19 16:57:41 +00:00
Eric Laurent
6c79de76a1 am 1f98e79a: Merge "audio effect JNI: fix global ref leak." into mnc-dev
* commit '1f98e79abd97e295d1e1f309102691c7e1c422c5':
  audio effect JNI: fix global ref leak.
2015-06-19 16:57:03 +00:00
Tony Mak
8e33f63040 Clear granted permission when app is uninstalled by one of the multiple users
Bug: 21838358

Change-Id: Iccd46382c9468d0503da0bb49a49040ae712e2cc
2015-06-19 17:52:49 +01:00
Eric Laurent
1f98e79abd Merge "audio effect JNI: fix global ref leak." into mnc-dev 2015-06-19 16:46:30 +00:00
Wale Ogunwale
a52a95f405 am 8f4ccd6c: Merge "Reduce log noise." into mnc-dev
* commit '8f4ccd6c968b9488bbf74431fb20e9de144772af':
  Reduce log noise.
2015-06-19 16:45:00 +00:00
Wale Ogunwale
0b3be03c29 am 4186c977: Merge "Don\'t write IntentFilter autoVerify field to xml if false." into mnc-dev
* commit '4186c977eba743bd8718e03326db5c025fd0ccc2':
  Don't write IntentFilter autoVerify field to xml if false.
2015-06-19 16:44:54 +00:00
Zhijun He
effc89ce51 am 22cf22ab: am 33e07bd7: Merge "Camera2: add FACE_PRIORITY_LOW_LIGHT" into mnc-dev
* commit '22cf22abef853e80d1c90302e6f0f3d646091e42':
  Camera2: add FACE_PRIORITY_LOW_LIGHT
2015-06-19 16:44:32 +00:00
Wale Ogunwale
8f4ccd6c96 Merge "Reduce log noise." into mnc-dev 2015-06-19 16:36:23 +00:00
Wale Ogunwale
4186c977eb Merge "Don't write IntentFilter autoVerify field to xml if false." into mnc-dev 2015-06-19 16:36:00 +00:00
Zhijun He
22cf22abef am 33e07bd7: Merge "Camera2: add FACE_PRIORITY_LOW_LIGHT" into mnc-dev
* commit '33e07bd730f552ab0d176b2c3e3c51eabf16bdb8':
  Camera2: add FACE_PRIORITY_LOW_LIGHT
2015-06-19 16:31:25 +00:00
Jeff Tinker
f5a0e22743 am 129d5782: am 969a0647: Merge "Improve robustness of MediaDrm after mediaserver crash" into mnc-dev
* commit '129d5782b0e13b41b51a69e683c1e588324bdd00':
  Improve robustness of MediaDrm after mediaserver crash
2015-06-19 16:31:18 +00:00
Zhijun He
33e07bd730 Merge "Camera2: add FACE_PRIORITY_LOW_LIGHT" into mnc-dev 2015-06-19 16:23:42 +00:00
Jeff Tinker
129d5782b0 am 969a0647: Merge "Improve robustness of MediaDrm after mediaserver crash" into mnc-dev
* commit '969a06475c18a34fcd1cf181c290d3ef3d0673f7':
  Improve robustness of MediaDrm after mediaserver crash
2015-06-19 16:17:46 +00:00
Jason Monk
5d95fb814d am 31fa5086: am 1247e48e: Merge "Fix security whole in lock task" into mnc-dev
* commit '31fa508614e34fedb77d8186a57fc94616b1868b':
  Fix security whole in lock task
2015-06-19 16:15:43 +00:00
Chris Wren
6514204f3b am de3d8db7: am 7e786954: Merge "drop corrupt notifications in the Listener" into mnc-dev
* commit 'de3d8db77c7895a51190b116fcba174d5462b434':
  drop corrupt notifications in the Listener
2015-06-19 16:15:35 +00:00
Shawn Willden
fbf4d9a594 am 8b4a02ce: am df0b80e4: Merge "Add new error codes for rate-limit and max-use failures." into mnc-dev
* commit '8b4a02cef4d7fa346e68d580807b58bf273c3ced':
  Add new error codes for rate-limit and max-use failures.
2015-06-19 16:15:31 +00:00
Kenny Guy
916a7ef5c5 am f5beb48f: am 43cf8d1e: Merge "Use closer to standard toast for work profile toast." into mnc-dev
* commit 'f5beb48f214066441ed6a27934ad9eda50f9388f':
  Use closer to standard toast for work profile toast.
2015-06-19 16:15:23 +00:00
Jason Monk
b97d340b25 am 3766a8a9: am 660130b9: Merge "Try to keep connection state more up to date" into mnc-dev
* commit '3766a8a9c2012694ecde551e90acb68ade67a893':
  Try to keep connection state more up to date
2015-06-19 16:15:18 +00:00
Abodunrinwa Toki
54103b7968 am 2508c6df: am 07e440b2: Merge "Fix FloatingToolbar flickers." into mnc-dev
* commit '2508c6dfafaa71c190b4d0a7346f6a579985bde7':
  Fix FloatingToolbar flickers.
2015-06-19 16:14:54 +00:00
Gustav Sennton
309c5978c7 am 05996c10: am 1b48a643: Merge "Revert "Load WebView from one out of a list of packages."" into mnc-dev
* commit '05996c10ccf30fafdf88926b46b7f2e329d0b243':
  Revert "Load WebView from one out of a list of packages."
2015-06-19 16:14:47 +00:00
Andrei Stingaceanu
2bf8d56122 am b91c7a76: am 50057943: Merge "Cannot select text after rotation in extract mode" into mnc-dev
* commit 'b91c7a76d525cec54df86fc3558a1c88532ee7a4':
  Cannot select text after rotation in extract mode
2015-06-19 16:14:38 +00:00
Sudheer Shanka
eaa2577953 am a0fa30dc: am a408061c: Merge "Use the intent filter icon in ResolveInfo for managed profile." into mnc-dev
* commit 'a0fa30dc24cfc838deb8919cf6ff7bdea5736b57':
  Use the intent filter icon in ResolveInfo for managed profile.
2015-06-19 16:14:33 +00:00
Jonathan Basseri
aec8de6ed4 am 915d0a64: am cb8bb390: Merge "Add VVM carrier config to public API." into mnc-dev
* commit '915d0a64b62d67ff963236a4ba306c8330f3ac44':
  Add VVM carrier config to public API.
2015-06-19 16:14:21 +00:00