Adam Powell
61caef4cb0
am 2a1f9164: Merge "Un-hide ViewGroup#onViewAdded/onViewRemoved" into mnc-dev
...
* commit '2a1f91641895c3193204655bea2f67eb0fe6c439':
Un-hide ViewGroup#onViewAdded/onViewRemoved
2015-06-18 17:28:55 +00:00
Adam Powell
2a1f916418
Merge "Un-hide ViewGroup#onViewAdded/onViewRemoved" into mnc-dev
2015-06-18 17:20:44 +00:00
Adam Powell
6690d018b9
Un-hide ViewGroup#onViewAdded/onViewRemoved
...
These methods are generally useful for writing custom views, and by
exposing them we make it easier for custom view authors to still allow
app developers to use an OnHierarchyChangedListener since it will not
be occupied by a custom view's implementation.
Also move the actual dispatch to package-scoped dispatch methods so
that a developer forgetting to call super won't stop a listener from
functioning.
Bug 21866523
Change-Id: Ie2bb5e241d7c5a02a5033f33ecdaeb40aceb20b5
2015-06-18 10:19:18 -07:00
Mady Mellor
1ec24429a1
am 9a08fe2a: Merge "Update button press in AbsListView to use new MotionEvent APIs" into mnc-dev
...
* commit '9a08fe2aca44f190162b198a726bc406ed19c1c7':
Update button press in AbsListView to use new MotionEvent APIs
2015-06-18 16:27:36 +00:00
Craig Lafayette
1d492b7cd8
am b4c46909: Merge "Remove FRP wipe support for device initializers" into mnc-dev
...
* commit 'b4c469095f12972ef04558961ddbdbdfe8305ccb':
Remove FRP wipe support for device initializers
2015-06-18 16:27:30 +00:00
Mady Mellor
9a08fe2aca
Merge "Update button press in AbsListView to use new MotionEvent APIs" into mnc-dev
2015-06-18 15:46:27 +00:00
Craig Lafayette
b4c469095f
Merge "Remove FRP wipe support for device initializers" into mnc-dev
2015-06-18 15:44:49 +00:00
Hyunyoung Song
59b40f09bd
am 0ff78e7c: Merge "AppWidgetServiceImpl should use ParceledListSlice as return object b/19904873" into mnc-dev
...
* commit '0ff78e7cc8f846517d8fd3cefa0c9b88cd94908d':
AppWidgetServiceImpl should use ParceledListSlice as return object b/19904873
2015-06-18 06:09:11 +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
af2bc2c05b
am fe67c1ec: Merge "Fix: Drag handle jumps between bidi boundaries." into mnc-dev
...
* commit 'fe67c1ec6d0f08542fad2fc1a3fb858d99d40341':
Fix: Drag handle jumps between bidi boundaries.
2015-06-18 03:56:59 +00:00
Keisuke Kuroyanagi
fe67c1ec6d
Merge "Fix: Drag handle jumps between bidi boundaries." into mnc-dev
2015-06-18 03:43:44 +00:00
Tomasz Mikolajewski
cfbad359e1
am 9ce9ffec: Merge "Allow to customize title of the dialog." into mnc-dev
...
* commit '9ce9ffec9e307e29c3d575854d4e357ecf06d2d8':
Allow to customize title of the dialog.
2015-06-18 00:07:05 +00:00
Xiaohui Chen
753b0ab1a6
am 802ece61: Merge "system_server: add two child chains to firewall" into mnc-dev
...
* commit '802ece61399e94bbe98cafaa277c71bee73c03ba':
system_server: add two child chains to firewall
2015-06-18 00:07:00 +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
8710f4d42e
am 45bb0ca4: Merge "ImageView updates cached drawable dimensions when drawable updates" into mnc-dev
...
* commit '45bb0ca49a052cd6da3e4ced7709372972abdf55':
ImageView updates cached drawable dimensions when drawable updates
2015-06-17 23:16:49 +00:00
Raph Levien
a38abb3a47
am 8872ca4d: Merge "Remove indents from TextView" into mnc-dev
...
* commit '8872ca4d558a8546c9c934f32fd37d261a6f32d1':
Remove indents from TextView
2015-06-17 23:16:44 +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
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
Adam Powell
ed77f25d98
am 40359f73: Merge "Request application of WindowInsets when setting a content view" into mnc-dev
...
* commit '40359f73b189fc8547dd91e6b75a4243b23553ef':
Request application of WindowInsets when setting a content view
2015-06-17 22:51:09 +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
Dianne Hackborn
610828bd01
am 22433a33: Merge "Fix issue #21814207 and issue #21814212 (alarm manager)" into mnc-dev
...
* commit '22433a337a712aafbf23df965fa0457ccee3399b':
Fix issue #21814207 and issue #21814212 (alarm manager)
2015-06-17 22:33:36 +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
Alan Viverette
a1e8476a21
am e1c94726: Merge "Work around inconsistent views in RelativeLayout.onMeasure()" into mnc-dev
...
* commit 'e1c947263f1b72510f244458d9cef76883691801':
Work around inconsistent views in RelativeLayout.onMeasure()
2015-06-17 22:23:05 +00: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
0cd86a76e9
am e222a444: Merge "Revert "remove setLatestEventInfo"" into mnc-dev
...
* commit 'e222a44429c3c1b662783afee67dc86edf38d546':
Revert "remove setLatestEventInfo"
2015-06-17 21:18:11 +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
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
896fec7e99
am 074c3404: Merge "Add matching xml attributes for existing Toolbar properties" into mnc-dev
...
* commit '074c340420105e04791bfd083aa36249a4f9362a':
Add matching xml attributes for existing Toolbar properties
2015-06-17 20:37:33 +00: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
Adam Powell
074c340420
Merge "Add matching xml attributes for existing Toolbar properties" into mnc-dev
2015-06-17 20:22:37 +00:00
Chris Wren
2611a90790
am c20c1eec: Merge "remove setLatestEventInfo" into mnc-dev
...
* commit 'c20c1eec9e222870b08c079898dbc334858994cc':
remove setLatestEventInfo
2015-06-17 20:17:21 +00:00
Chris Wren
c20c1eec9e
Merge "remove setLatestEventInfo" into mnc-dev
2015-06-17 20:05:11 +00:00
Dianne Hackborn
f3f24792d6
am d1419ed2: Merge "Bring back screenshot API." into mnc-dev
...
* commit 'd1419ed29a694dffc98e9f352f952b805c6e0583':
Bring back screenshot API.
2015-06-17 19:58:37 +00:00
Dianne Hackborn
d1419ed29a
Merge "Bring back screenshot API." into mnc-dev
2015-06-17 19:47:11 +00:00
Eino-Ville Talvala
526f227ff3
am b7bbd629: Merge "Camera2: Do not throw unexpected runtime exception to app" into mnc-dev
...
* commit 'b7bbd629eb0370f36ce27cbc9ecfc7e5c9d8953f':
Camera2: Do not throw unexpected runtime exception to app
2015-06-17 18:44:40 +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
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
e6c3c17b29
am 563d60e0: Merge "Camera2: Handle getting input surface failures" into mnc-dev
...
* commit '563d60e03f8d5961e5578fca66092bd6b8d5496e':
Camera2: Handle getting input surface failures
2015-06-17 18:09:24 +00:00
Zhijun He
d103c0bdce
am 0f70c415: Merge "Camera2: fix high speed request builder creation issue" into mnc-dev
...
* commit '0f70c415519f0a89f8ba765f9046802a2223f790':
Camera2: fix high speed request builder creation issue
2015-06-17 18:09:19 +00:00
Alex Klyubin
411b8a3a2a
am 4250c8d6: Merge "Expose AES GCM backed by Android Keystore." into mnc-dev
...
* commit '4250c8d6435cca2c14839f7adec0a43773d01e3b':
Expose AES GCM backed by Android Keystore.
2015-06-17 18:09:14 +00:00
Yigit Boyar
202bb20378
am 5ddaa72b: Merge "Handle negative view types properly in getScrapView" into mnc-dev
...
* commit '5ddaa72b9a60dda43c9e199f85990c01b0bf702c':
Handle negative view types properly in getScrapView
2015-06-17 18:09:09 +00:00
Chien-Yu Chen
563d60e03f
Merge "Camera2: Handle getting input surface failures" into mnc-dev
2015-06-17 18:02:31 +00:00