George Mount
99c2760ed0
Merge "Ensure entering and exiting views don't match in Fragment Transitions."
2015-09-14 18:16:54 +00:00
George Mount
dd46ac3ae2
Merge "Ensure feature flags are set prior to checking Activity Transition."
2015-09-14 18:16:18 +00:00
Chris Manton
85f7f790df
am e8c98b77: am f40365f1: am ae0b7ca9: am c9180528: Merge "Add capability to ignore carrier entitlement checks" into mnc-dr-dev
...
* commit 'e8c98b77854d39606960b0b6f5b5332c61e9a3d9':
Add capability to ignore carrier entitlement checks
2015-09-14 17:54:26 +00:00
Chris Manton
e8c98b7785
am f40365f1: am ae0b7ca9: am c9180528: Merge "Add capability to ignore carrier entitlement checks" into mnc-dr-dev
...
* commit 'f40365f17a2f01612139e909039a09308001fdde':
Add capability to ignore carrier entitlement checks
2015-09-14 17:46:23 +00:00
Chris Manton
f40365f17a
am ae0b7ca9: am c9180528: Merge "Add capability to ignore carrier entitlement checks" into mnc-dr-dev
...
* commit 'ae0b7ca9ad2e21853af06a68c02da068f748f8bd':
Add capability to ignore carrier entitlement checks
2015-09-14 17:39:31 +00:00
Chris Manton
ae0b7ca9ad
am c9180528: Merge "Add capability to ignore carrier entitlement checks" into mnc-dr-dev
...
* commit 'c9180528452d67359618eda4aa2edd39112c83ca':
Add capability to ignore carrier entitlement checks
2015-09-14 17:29:09 +00:00
Chris Manton
c918052845
Merge "Add capability to ignore carrier entitlement checks" into mnc-dr-dev
2015-09-14 17:23:42 +00:00
Vadim Tryshev
cd3c01b254
Merge "Showing hover menu."
2015-09-14 17:18:22 +00:00
Alan Viverette
6fe1ea778c
Merge "Revert "Use floating-point value for Drawable level""
2015-09-14 17:04:09 +00:00
Toni Barzic
4bd2301eb7
Merge "Implement EventStreamTrasformations for autoclick on mouse stop"
2015-09-14 17:03:53 +00:00
Alan Viverette
0b6cfe22fd
Revert "Use floating-point value for Drawable level"
...
This reverts commit 3da32b768899e7dabe3a16333edf5eca2b9ebe93.
Change-Id: Ie75ce0c285e0f59a7a086f64c0cfe088edb5df04
2015-09-14 16:59:49 +00:00
Xiaohui Chen
6b56ae59f8
Merge "Cleanup USER_OWNER in backup service"
2015-09-14 16:31:48 +00:00
Christopher Wiley
c972c4cebf
am 84ba0725: am 3a86b41f: Add a textual hint as to where aidl has gone
...
* commit '84ba072538612accd775da2902afa33a3fbb7d09':
Add a textual hint as to where aidl has gone
2015-09-14 16:14:26 +00:00
Christopher Wiley
84ba072538
am 3a86b41f: Add a textual hint as to where aidl has gone
...
* commit '3a86b41f8414193e05c27284d434b07992e164ce':
Add a textual hint as to where aidl has gone
2015-09-14 16:06:52 +00:00
Christopher Wiley
5cfa89f7a1
am 026cbbfb: am 27a0be36: resolved conflicts for ddf53180 to stage-aosp-master
...
* commit '026cbbfbda2d3db388bcaf7d8c3897f7856af1f8':
Remove the aidl tool
2015-09-14 15:55:57 +00:00
Christopher Wiley
3a86b41f84
Add a textual hint as to where aidl has gone
...
Bug: 23691099
Change-Id: I3fb917b4c0e66a83c6299add02869a7088010adc
2015-09-14 08:54:23 -07:00
Christopher Wiley
026cbbfbda
am 27a0be36: resolved conflicts for ddf53180 to stage-aosp-master
...
* commit '27a0be36eeee9d1d03076727977dfb1e725fcd77':
Remove the aidl tool
2015-09-14 15:47:38 +00:00
Julia Reynolds
96ef062b04
Merge "Sync current volume on device change."
2015-09-14 15:36:53 +00:00
Julia Reynolds
8ae994f841
Sync current volume on device change.
...
Bug: 22720663
Change-Id: I24fced623522f5ea417b71bca502e519a6718185
2015-09-14 11:19:27 -04:00
Alan Viverette
92539d5c75
Avoid OOBE when AbsListView layout is out of sync with adapter
...
Views are not synchronized with adapter state until a layout pass
occurs, which may cause an OOBE if a list item is removed and an
accessibility node is obtained before the next layout pass.
This CL caches the item's enabled state on the bound view's layout
params, which allows us to avoid relying on the adapter to populate
accessibility nodes. It also aborts actions if the target position
is no longer valid.
Updates the documentation on AdapterView to reflect that the result
of getPositionForView() may not be synchronized with the adapter.
Bug: 23943664
Change-Id: Ic79eaa2e26bec9cd8d90fdab434271bc4f3d8a68
2015-09-14 10:49:25 -04:00
Christopher Wiley
27a0be36ee
resolved conflicts for ddf53180 to stage-aosp-master
...
Change-Id: I265ab876ef29dc731e6abb6f964c10f2e71324be
2015-09-14 07:34:50 -07:00
Christopher Wiley
ddf53180e4
Merge "Remove the aidl tool"
2015-09-14 14:11:19 +00:00
Nicolas Prévot
a5bf0dea33
Merge "Don't consider non-enabled users for cross-profile intents."
2015-09-14 11:03:41 +00:00
Yohei Yukawa
686e03454b
Merge "Mechanical merge of nested if statements."
2015-09-14 03:50:22 +00:00
Yohei Yukawa
f849e35f81
Merge "Remove redundant casts."
2015-09-14 03:42:37 +00:00
Wale Ogunwale
a3e1958e7d
Merge "Fixed bug with activity behind non-fullscreen activity not displaying"
2015-09-13 17:22:07 +00:00
Chong Zhang
173b6c2d1a
Fix build break with startMovingTask API
...
Change-Id: I4dc44ca04c75a9dfed079338e4906d317f50a1e3
2015-09-12 15:22:24 -07:00
Wale Ogunwale
c219c0bb86
Fixed bug with activity behind non-fullscreen activity not displaying
...
Regression introduced in I5bf77063252a5abae4e327f6fc42e607091749f9
where some policy for visiblity of tasks in freeform stacks was
added which ended up applying to other types of stacks. We now limit
the policy to just freeform tasks.
Bug: 23957523
Change-Id: Ib6fad5a89e22d64adf0e52b9e8ed5f2239488245
2015-09-12 16:26:36 +00:00
Wale Ogunwale
b8d7948102
Merge "Don't relayout app contents when just changing app position"
2015-09-12 16:00:53 +00:00
Dongwon Kang
52848fcc30
Merge "TIF: Unbind the service only when it is bound"
2015-09-12 05:40:59 +00:00
Jorim Jaggi
35d648f3f2
am 0e950707: am 12e273fe: am f66e4979: am 84dc08a2: Dump Keyguard state in SystemUI and PhoneWindowManager
...
* commit '0e95070766dc499f66706c12253dda11d31ab014':
Dump Keyguard state in SystemUI and PhoneWindowManager
2015-09-12 05:08:13 +00:00
Selim Cinek
0abb479d0f
am ced9ab11: am 19694a0e: am 4140a21e: Merge "Fix scrolling of QS panel when no notification is present."
...
* commit 'ced9ab11a1ffbaf066859122603e9d22a4bdc344':
Fix scrolling of QS panel when no notification is present.
2015-09-12 05:08:03 +00:00
Alan Viverette
199867c076
am f9a75e1a: (-s ours) am 7914680e: am 58c483fc: am 62b94c35: Merge "Avoid OOBE when AbsListView layout is out of sync with adapter" into mnc-dr-dev
...
* commit 'f9a75e1a8402ce628eaa0471b35367f6055cbaa8':
Avoid OOBE when AbsListView layout is out of sync with adapter
2015-09-12 02:57:02 +00:00
Jorim Jaggi
0e95070766
am 12e273fe: am f66e4979: am 84dc08a2: Dump Keyguard state in SystemUI and PhoneWindowManager
...
* commit '12e273fe76f1f0e6b5cffb687da7411d73dfe7c6':
Dump Keyguard state in SystemUI and PhoneWindowManager
2015-09-12 01:53:16 +00:00
Jorim Jaggi
12e273fe76
am f66e4979: am 84dc08a2: Dump Keyguard state in SystemUI and PhoneWindowManager
...
* commit 'f66e4979c579bde5031c8e6f29e5163246fc54ee':
Dump Keyguard state in SystemUI and PhoneWindowManager
2015-09-12 01:45:43 +00:00
Dongwon Kang
81e3c3e68d
TIF: Unbind the service only when it is bound
...
Bug: 23718447
Change-Id: I3189dbea193b3d8247e29168564f894323fb4886
2015-09-12 01:45:11 +00:00
Jorim Jaggi
f66e4979c5
am 84dc08a2: Dump Keyguard state in SystemUI and PhoneWindowManager
...
* commit '84dc08a208eea7a4ddf043cadbb28987cf90ae22':
Dump Keyguard state in SystemUI and PhoneWindowManager
2015-09-12 01:34:26 +00:00
Yohei Yukawa
24182f3dac
Remove redundant casts.
...
This Cl is just a mechanical removal of redundant casts.
Nothing is changed logically.
Bug: 22285167
Change-Id: I460b781753553c002b6cd232ae5918b7acd616d9
2015-09-11 18:33:33 -07:00
Selim Cinek
ced9ab11a1
am 19694a0e: am 4140a21e: Merge "Fix scrolling of QS panel when no notification is present."
...
* commit '19694a0eeffd224189615ed761a5f8e4f912b343':
Fix scrolling of QS panel when no notification is present.
2015-09-12 01:30:14 +00:00
Jorim Jaggi
84dc08a208
Dump Keyguard state in SystemUI and PhoneWindowManager
...
Bug: 23970549
Change-Id: Iec1e8ac507268086e0e2935847eda606ea1fb700
2015-09-12 01:26:17 +00:00
Selim Cinek
19694a0eef
am 4140a21e: Merge "Fix scrolling of QS panel when no notification is present."
...
* commit '4140a21e2ec69089de916e240fd606a3daf09896':
Fix scrolling of QS panel when no notification is present.
2015-09-12 01:21:49 +00:00
Yohei Yukawa
ac8bdd203c
Mechanical merge of nested if statements.
...
This is just a mechanical merge of nested if statements with a dead code
removal. Nothing is changed logically.
Bug: 22285167
Change-Id: I28c1de84635b68108b25ec32ec58de2128758512
2015-09-11 18:17:11 -07:00
Selim Cinek
4140a21e2e
Merge "Fix scrolling of QS panel when no notification is present."
2015-09-12 01:10:10 +00:00
Ben Kwa
5e65d1a991
Merge "Clean up unit tests."
2015-09-12 00:19:44 +00:00
Chong Zhang
8e89b31a62
Move window moving and resizing handling to WindowManager
...
- add a startMoving API to initiate a window move from app, once
the move starts WindowManager will take over the event handling.
- detect touch events along window's outside border and start
a resize if necessary
Change-Id: Ic7e8baba34e0aa27a43173e044ffb46e93e219e0
2015-09-11 17:15:19 -07:00
Stefan Kuhne
59876c3ed5
Merge "Adding user resizability by dragging shadow outsets"
2015-09-11 23:49:42 +00:00
Alan Viverette
f9a75e1a84
am 7914680e: am 58c483fc: am 62b94c35: Merge "Avoid OOBE when AbsListView layout is out of sync with adapter" into mnc-dr-dev
...
* commit '7914680e1ec319f50cb99b6c761aace56fc6e3ed':
Avoid OOBE when AbsListView layout is out of sync with adapter
2015-09-11 23:30:34 +00:00
Alan Viverette
7914680e1e
am 58c483fc: am 62b94c35: Merge "Avoid OOBE when AbsListView layout is out of sync with adapter" into mnc-dr-dev
...
* commit '58c483fcff4608ead41f8af9b2b1e2d5ae92561c':
Avoid OOBE when AbsListView layout is out of sync with adapter
2015-09-11 23:22:07 +00:00
Shawn Willden
99a9c5b0d5
am 4eaef9a7: am b9b5d86b: resolved conflicts for b15e1ff5 to stage-aosp-master
...
* commit '4eaef9a79173336047cc662a51729437ac4a130d':
Update KeymasterDefs
2015-09-11 22:43:41 +00:00
Shawn Willden
4eaef9a791
am b9b5d86b: resolved conflicts for b15e1ff5 to stage-aosp-master
...
* commit 'b9b5d86b0e2a7e32259f2606024745439ebb43e1':
Update KeymasterDefs
2015-09-11 22:36:21 +00:00