Hyunyoung Song
02cf3fc008
am d90fadcc: am 0ff78e7c: Merge "AppWidgetServiceImpl should use ParceledListSlice as return object b/19904873" into mnc-dev
...
* commit 'd90fadcc0bbbe729b03b913ee96c6e43c1d9c662':
AppWidgetServiceImpl should use ParceledListSlice as return object b/19904873
2015-06-18 06:19:15 +00:00
Hyunyoung Song
0ff78e7cc8
Merge "AppWidgetServiceImpl should use ParceledListSlice as return object b/19904873" into mnc-dev
2015-06-18 05:58:36 +00:00
Keisuke Kuroyanagi
4e0ff9c124
am 3e43afed: am fe67c1ec: Merge "Fix: Drag handle jumps between bidi boundaries." into mnc-dev
...
* commit '3e43afed48ea49e2ec1f0e65d0600d26da720877':
Fix: Drag handle jumps between bidi boundaries.
2015-06-18 04:08:37 +00:00
Keisuke Kuroyanagi
fe67c1ec6d
Merge "Fix: Drag handle jumps between bidi boundaries." into mnc-dev
2015-06-18 03:43:44 +00:00
Abodunrinwa Toki
e4c897189a
am da0b2bda: am e8378476: Merge "Allow content rect to overshoot the bottom view bounds by 20dp." into mnc-dev
...
* commit 'da0b2bda80d16e9cf3c7705377f7fba6284cb765':
Allow content rect to overshoot the bottom view bounds by 20dp.
2015-06-18 01:29:04 +00:00
Abodunrinwa Toki
e8378476b5
Merge "Allow content rect to overshoot the bottom view bounds by 20dp." into mnc-dev
2015-06-18 01:05:07 +00:00
Tomasz Mikolajewski
87a4538034
am 456778ff: am 9ce9ffec: Merge "Allow to customize title of the dialog." into mnc-dev
...
* commit '456778ffaf6e360a7e4fa372500685ca8b202232':
Allow to customize title of the dialog.
2015-06-18 00:20:27 +00:00
Xiaohui Chen
16834d7607
am 82422c31: am 802ece61: Merge "system_server: add two child chains to firewall" into mnc-dev
...
* commit '82422c313e5efc80c917afdcf532d6616fbc2313':
system_server: add two child chains to firewall
2015-06-18 00:20:22 +00:00
Tomasz Mikolajewski
9ce9ffec9e
Merge "Allow to customize title of the dialog." into mnc-dev
2015-06-17 23:51:07 +00:00
Xiaohui Chen
802ece6139
Merge "system_server: add two child chains to firewall" into mnc-dev
2015-06-17 23:50:28 +00:00
Chet Haase
7751e2dc96
am 2139e92c: am 45bb0ca4: Merge "ImageView updates cached drawable dimensions when drawable updates" into mnc-dev
...
* commit '2139e92c6e89fbffb36d26ebd69837019ab38fa8':
ImageView updates cached drawable dimensions when drawable updates
2015-06-17 23:25:55 +00:00
Raph Levien
fc40d93981
am efe1f4bb: am 8872ca4d: Merge "Remove indents from TextView" into mnc-dev
...
* commit 'efe1f4bb4be408c43f63b672b3db3cec26f222ef':
Remove indents from TextView
2015-06-17 23:25:51 +00:00
Tomasz Mikolajewski
0e591f95bd
Allow to customize title of the dialog.
...
TEST=adb shell am start -a android.intent.action.OPEN_DOCUMENT -e
android.intent.extra.TITLE 'Upload!' -t "text/plain"
BUG=19150996
Change-Id: Ibded6cfaa2de3698c5eada154efbee2b323464d4
2015-06-17 16:12:14 -07:00
Chet Haase
45bb0ca49a
Merge "ImageView updates cached drawable dimensions when drawable updates" into mnc-dev
2015-06-17 23:07:17 +00:00
Adam Powell
3977bad2b0
am 352e6d77: am 40359f73: Merge "Request application of WindowInsets when setting a content view" into mnc-dev
...
* commit '352e6d77ef73d846ee840d26e6ccacb54e485eed':
Request application of WindowInsets when setting a content view
2015-06-17 23:06:48 +00:00
Raph Levien
8872ca4d55
Merge "Remove indents from TextView" into mnc-dev
2015-06-17 23:06:17 +00:00
Xiaohui Chen
b41c9f7f39
system_server: add two child chains to firewall
...
This is an attempt to speed up getting out of device idle. It groups
uid firewall rules in these child chains so we can attach/detach a whole
chain instead of individual uid rules.
BUG:21446713
Change-Id: Ie8f392da2deabe7cc86a9ecf4ed080163861d41e
2015-06-17 15:55:37 -07:00
Raph Levien
8edac58e55
Remove indents from TextView
...
On more careful reflection, the "indents" feature was not ready for
inclusion in the public API. It is still available at a lower level
in StaticLayout.
Also fix a minor typo in the doc for breakStrategy.
Bug: 20641996
Change-Id: I5cd976a536c48615980860396b1564b51b19e14a
2015-06-17 15:53:33 -07:00
Dianne Hackborn
2133afc77a
am d21b695f: am 22433a33: Merge "Fix issue #21814207 and issue #21814212 (alarm manager)" into mnc-dev
...
* commit 'd21b695f8b344b12e623694db86856a89642d934':
Fix issue #21814207 and issue #21814212 (alarm manager)
2015-06-17 22:43:51 +00:00
Adam Powell
40359f73b1
Merge "Request application of WindowInsets when setting a content view" into mnc-dev
2015-06-17 22:42:17 +00:00
Alan Viverette
d496d3bd06
am 5e034226: am e1c94726: Merge "Work around inconsistent views in RelativeLayout.onMeasure()" into mnc-dev
...
* commit '5e034226283270479cd7017cd7493baa46fbd66d':
Work around inconsistent views in RelativeLayout.onMeasure()
2015-06-17 22:31:09 +00:00
Chet Haase
8473f5a768
ImageView updates cached drawable dimensions when drawable updates
...
Changes to drawable dimensions were not propagated to cached dimension
values in ImageView. Now this is done when the drawable is invalidated.
Issue #18798152 ImageView caches wrong value of mDrawableWidth and mDrawableHeight
Change-Id: I8da7d82b0543fa02d8ef3d896595bd0e5ea2a61e
2015-06-17 15:28:25 -07:00
Hyunyoung Song
ccf6c68147
AppWidgetServiceImpl should use ParceledListSlice as return object
...
b/19904873
> Reason: to prevent TransactionTooLargeException from occuring when
binder transaction size goes over the limit.
Change-Id: I054cb161d235234f3ccdaadd70314163e690b0db
2015-06-17 15:23:31 -07:00
Dianne Hackborn
22433a337a
Merge "Fix issue #21814207 and issue #21814212 (alarm manager)" into mnc-dev
2015-06-17 22:18:37 +00:00
Alan Viverette
e1c947263f
Merge "Work around inconsistent views in RelativeLayout.onMeasure()" into mnc-dev
2015-06-17 22:10:11 +00:00
Chris Wren
93b046d64f
am 65d94514: am e222a444: Merge "Revert "remove setLatestEventInfo"" into mnc-dev
...
* commit '65d94514c90566ce4b8298b091357616a5bcb69c':
Revert "remove setLatestEventInfo"
2015-06-17 21:27:08 +00:00
Chris Wren
e222a44429
Merge "Revert "remove setLatestEventInfo"" into mnc-dev
2015-06-17 21:03:24 +00:00
Chris Wren
dfdb52abe6
Revert "remove setLatestEventInfo"
...
This reverts commit 965097321d .
Change-Id: I658bb2611fe8f983309e962d6772d1bd80ed586e
2015-06-17 21:03:11 +00:00
Adam Powell
c0611fd77e
am fb1fdca9: am 074c3404: Merge "Add matching xml attributes for existing Toolbar properties" into mnc-dev
...
* commit 'fb1fdca90f6c5c794104f6e14bc86f41db6fa48b':
Add matching xml attributes for existing Toolbar properties
2015-06-17 20:47:41 +00:00
Alan Viverette
3e2e064a1f
Work around inconsistent views in RelativeLayout.onMeasure()
...
Previously, RelativeLayout's measure pass could crash if the view's
children were modified without calling requestLayout() prior to the
next measure pass. This avoids the issue by only looking at the most
recent set of sorted views and preserves the previous behavior where
onMeasure() could return incorrect data.
Bug: 21123292
Change-Id: If471d071d1d2e2729cf13854d95b1f517c1fe73a
2015-06-17 13:42:32 -07:00
Adam Powell
41607d5a2b
Request application of WindowInsets when setting a content view
...
For both PhoneWindow and VoiceInteractionSession, call
requestApplyInsets when the content view(s) change. This is generally
what the developer expects if the new view tree responds to insets in
any way.
Bug 21620924
Change-Id: I60a88af55bf85217c3587aa37f03fdc3fdce686d
2015-06-17 13:37:06 -07:00
Chris Wren
824bd9e0f2
am 59489bb3: am c20c1eec: Merge "remove setLatestEventInfo" into mnc-dev
...
* commit '59489bb3b5b7c89dcaa66f53edb9fc1da4655333':
remove setLatestEventInfo
2015-06-17 20:30:17 +00:00
Adam Powell
074c340420
Merge "Add matching xml attributes for existing Toolbar properties" into mnc-dev
2015-06-17 20:22:37 +00:00
Dianne Hackborn
5416c2ecf8
am 181f99e3: am d1419ed2: Merge "Bring back screenshot API." into mnc-dev
...
* commit '181f99e3b01f9c4e035730b40eea5f9be3431b2b':
Bring back screenshot API.
2015-06-17 20:10:15 +00:00
Chris Wren
c20c1eec9e
Merge "remove setLatestEventInfo" into mnc-dev
2015-06-17 20:05:11 +00:00
Dianne Hackborn
d1419ed29a
Merge "Bring back screenshot API." into mnc-dev
2015-06-17 19:47:11 +00:00
Eino-Ville Talvala
2027483455
am f902ec5c: am b7bbd629: Merge "Camera2: Do not throw unexpected runtime exception to app" into mnc-dev
...
* commit 'f902ec5cb78e18207601a6fefa1ef10aa9851fdf':
Camera2: Do not throw unexpected runtime exception to app
2015-06-17 18:57:46 +00:00
Dianne Hackborn
a750a63d63
Fix issue #21814207 and issue #21814212 (alarm manager)
...
Issue #21814207 : AlarmManager.setAndAllowWhileIdle should also allow wake locks.
Introduce a whole new infrastructure for providing options when
sending broadcasts, much like ActivityOptions. There is a single
option right now, asking the activity manager to apply a tempory
whitelist to each receiver of the broadcast.
Issue #21814212 : Need to allow configuration of alarm manager parameters
The various alarm manager timing configurations are not modifiable
through settings, much like DeviceIdleController. Also did a few
tweaks in the existing DeviceIdleController impl.
Change-Id: Ifd01013185acc4de668617b1e46e78e30ebed041
2015-06-17 11:41:45 -07:00
Eino-Ville Talvala
b7bbd629eb
Merge "Camera2: Do not throw unexpected runtime exception to app" into mnc-dev
2015-06-17 18:31:45 +00:00
Chien-Yu Chen
e63eeedab0
am 760d9082: am 563d60e0: Merge "Camera2: Handle getting input surface failures" into mnc-dev
...
* commit '760d90822adee611bc0e7e5b9d53cb32412de600':
Camera2: Handle getting input surface failures
2015-06-17 18:21:02 +00:00
Zhijun He
09a6192707
am 46c2a195: am 0f70c415: Merge "Camera2: fix high speed request builder creation issue" into mnc-dev
...
* commit '46c2a195598aabcdaaad2e98f1df7b38e8dc8f3a':
Camera2: fix high speed request builder creation issue
2015-06-17 18:20:57 +00:00
Alex Klyubin
32689e364f
am 26f7b5d9: am 4250c8d6: Merge "Expose AES GCM backed by Android Keystore." into mnc-dev
...
* commit '26f7b5d96eceb147b3d995218c8daa9a4bed0d40':
Expose AES GCM backed by Android Keystore.
2015-06-17 18:20:52 +00:00
Yigit Boyar
f8acc3af12
am b2b53fb9: am 5ddaa72b: Merge "Handle negative view types properly in getScrapView" into mnc-dev
...
* commit 'b2b53fb941b269019cf82289eb63b44336bc47b8':
Handle negative view types properly in getScrapView
2015-06-17 18:20:48 +00:00
Eino-Ville Talvala
d3e39d16cb
Camera2: Do not throw unexpected runtime exception to app
...
Use a generic CameraAccessException DEVICE_ERROR exception instead
Bug: 21869917
Change-Id: I73581b817cbdcbb4b876c234f050f725a459a29b
2015-06-17 11:18:43 -07:00
Chien-Yu Chen
563d60e03f
Merge "Camera2: Handle getting input surface failures" into mnc-dev
2015-06-17 18:02:31 +00:00
Mady Mellor
4a39288618
am 31fa5ad3: am 5279d11f: Merge "Drag to select text: add some slop for moving between lines" into mnc-dev
...
* commit '31fa5ad31e6eb83b373e548647dd5bbe602afb43':
Drag to select text: add some slop for moving between lines
2015-06-17 18:01:51 +00:00
Zhijun He
0f70c41551
Merge "Camera2: fix high speed request builder creation issue" into mnc-dev
2015-06-17 18:00:17 +00:00
Alex Klyubin
4250c8d643
Merge "Expose AES GCM backed by Android Keystore." into mnc-dev
2015-06-17 17:58:35 +00:00
Yigit Boyar
5ddaa72b9a
Merge "Handle negative view types properly in getScrapView" into mnc-dev
2015-06-17 17:58:27 +00:00
Mady Mellor
5279d11f25
Merge "Drag to select text: add some slop for moving between lines" into mnc-dev
2015-06-17 17:36:31 +00:00