Tim Murray
b2387e650b
am 6c271b89: am f3acc630: am 01356906: Merge "Ensure SurfaceView requests WM relayout when size changes." into mnc-dr-dev
...
* commit '6c271b898c080303c24e524022dd6e4552bda5f5':
Ensure SurfaceView requests WM relayout when size changes.
2015-10-07 23:39:16 +00:00
Tim Murray
6c271b898c
am f3acc630: am 01356906: Merge "Ensure SurfaceView requests WM relayout when size changes." into mnc-dr-dev
...
* commit 'f3acc63015cb3093c3bdc11f6dbd1db2f375eeca':
Ensure SurfaceView requests WM relayout when size changes.
2015-10-07 23:32:28 +00:00
Tim Murray
f3acc63015
am 01356906: Merge "Ensure SurfaceView requests WM relayout when size changes." into mnc-dr-dev
...
* commit '0135690688c8285e022a2a8191c8582f2e6ea759':
Ensure SurfaceView requests WM relayout when size changes.
2015-10-07 23:28:13 +00:00
Chien-Yu Chen
c1a1343933
am d07d0071: am 02e4400c: am ab781275: Merge "MediaActionSound: Fix video stop sound" into mnc-dr-dev
...
* commit 'd07d007161e2f64e88eba9f78778ab63b3dd6ab9':
MediaActionSound: Fix video stop sound
2015-10-07 23:22:24 +00:00
Tim Murray
0135690688
Merge "Ensure SurfaceView requests WM relayout when size changes." into mnc-dr-dev
2015-10-07 23:21:14 +00:00
Chien-Yu Chen
d07d007161
am 02e4400c: am ab781275: Merge "MediaActionSound: Fix video stop sound" into mnc-dr-dev
...
* commit '02e4400cc734079bcc275d14a9ae4d16609403c8':
MediaActionSound: Fix video stop sound
2015-10-07 23:17:39 +00:00
Chien-Yu Chen
02e4400cc7
am ab781275: Merge "MediaActionSound: Fix video stop sound" into mnc-dr-dev
...
* commit 'ab7812750bca947abc9e8b1ce73a3041dbc2f2a9':
MediaActionSound: Fix video stop sound
2015-10-07 23:11:20 +00:00
Chien-Yu Chen
ab7812750b
Merge "MediaActionSound: Fix video stop sound" into mnc-dr-dev
2015-10-07 23:03:52 +00:00
Chien-Yu Chen
d890f4f400
MediaActionSound: Fix video stop sound
...
Bug: 24745252
Change-Id: I803679d52750e09c7fc7b881523becf9259b558b
2015-10-07 15:17:19 -07:00
Yin-Chia Yeh
cbb3dc67cf
am 527da81f: am a71bb6b9: am 9d688336: am a636be6c: Camera: fix wrong FULL feature string
...
* commit '527da81f13fa65b924859ae87f6ccce8d3614140':
Camera: fix wrong FULL feature string
2015-10-07 21:54:41 +00:00
Yin-Chia Yeh
527da81f13
am a71bb6b9: am 9d688336: am a636be6c: Camera: fix wrong FULL feature string
...
* commit 'a71bb6b986156b8bd32e387afc74b1ff066fd2a7':
Camera: fix wrong FULL feature string
2015-10-07 21:50:17 +00:00
Yin-Chia Yeh
a71bb6b986
am 9d688336: am a636be6c: Camera: fix wrong FULL feature string
...
* commit '9d68833686e04ff5ff910a9d90fe99bc1347aaca':
Camera: fix wrong FULL feature string
2015-10-07 21:41:38 +00:00
Yin-Chia Yeh
9d68833686
am a636be6c: Camera: fix wrong FULL feature string
...
* commit 'a636be6c9a8a9192f72a111c2b3084a226d37b7e':
Camera: fix wrong FULL feature string
2015-10-07 21:36:35 +00:00
Deepanshu Gupta
d7b7e93a47
am 9969f858: LayoutLib: Fix ring rendering.
...
* commit '9969f858c34ba7e35a977c819f2d1e24de586990':
LayoutLib: Fix ring rendering.
2015-10-07 21:23:43 +00:00
Robert Carr
57caeb5703
Ensure SurfaceView requests WM relayout when size changes.
...
In the case of scaled SurfaceViews with a fixed size.
It is possible for the surface layout size to change
without a change to the surface size or position. In this
case we need to inform the window manager so it can update
frames and scaling. This has presented in Camera and required
workarounds such as changing the fixed surface size to trigger
an update (leading to visual artifacts).
Bug:23974105
Change-Id: I195aa0832907c32874b294101b56e198e853dce5
(cherry picked from commit a8fe43f09c0ed2119e55139a482f7f12fbe7d725)
2015-10-07 20:39:11 +00:00
Deepanshu Gupta
9969f858c3
LayoutLib: Fix ring rendering.
...
Bug: http://b.android.com/65503
Change-Id: I6ed901703cffee345f3083ea3ddeb52a28f4ac64
2015-10-07 12:46:15 -07:00
Deepanshu Gupta
24ca6320b8
am 8db8bc63: Merge "Skip drawing empty shapes to keep Apple JRE happy." into mnc-ub-dev
...
* commit '8db8bc63624bbd1d803e02571fa865f1f7fa584c':
Skip drawing empty shapes to keep Apple JRE happy.
2015-10-07 17:17:02 +00:00
Deepanshu Gupta
8db8bc6362
Merge "Skip drawing empty shapes to keep Apple JRE happy." into mnc-ub-dev
2015-10-07 17:08:30 +00:00
Alan Viverette
b46886f41d
am f518ad0a: Merge "IndexOutOfBoundsException on addPreference in PreferenceGroup"
...
* commit 'f518ad0a4941236b72b5d090320d4ab70ebbf26b':
IndexOutOfBoundsException on addPreference in PreferenceGroup
2015-10-07 16:54:26 +00:00
Alan Viverette
2235ecd5ec
am f8ac5c34: Merge "Reset the setOnKeyListener callback when view is destroyed"
...
* commit 'f8ac5c3469e53a7934731cfb854efb2975251ab4':
Reset the setOnKeyListener callback when view is destroyed
2015-10-07 16:54:17 +00:00
Alan Viverette
f5b97d9c0e
am e229f5dd: Merge "Text size for empty view shall be styled according to theme"
...
* commit 'e229f5ddde98f7c78ddc15a64587a684b5cf90a5':
Text size for empty view shall be styled according to theme
2015-10-07 16:41:30 +00:00
Alan Viverette
61d9d6be54
am 43f0fdc5: Merge "Remove hard-coded DrawSelectorOnTop on ListFragment\'s default ListView."
...
* commit '43f0fdc5cd7ec4c4c03c7dbea8c045d2186f942c':
Remove hard-coded DrawSelectorOnTop on ListFragment's default ListView.
2015-10-07 16:41:18 +00:00
Alan Viverette
f518ad0a49
Merge "IndexOutOfBoundsException on addPreference in PreferenceGroup"
2015-10-07 16:38:02 +00:00
Alan Viverette
f8ac5c3469
Merge "Reset the setOnKeyListener callback when view is destroyed"
2015-10-07 16:36:58 +00:00
Alan Viverette
8a0c8e78a7
am 6a06f12c: Merge "Frameworks/base: Fix AdapterViewAnimator.createOrReuseLayoutParams"
...
* commit '6a06f12c3fa6a84306dc17f60eb16cdc25bc34b5':
Frameworks/base: Fix AdapterViewAnimator.createOrReuseLayoutParams
2015-10-07 16:34:35 +00:00
Alan Viverette
4524278bcb
am 7de6ae15: Merge "To call TypedArray.recycle() when we are done with the array."
...
* commit '7de6ae159e0652cabe57ea8814ce8633049644a2':
To call TypedArray.recycle() when we are done with the array.
2015-10-07 16:34:26 +00:00
Alan Viverette
e229f5ddde
Merge "Text size for empty view shall be styled according to theme"
2015-10-07 16:30:36 +00:00
Deepanshu Gupta
4064e118e2
Skip drawing empty shapes to keep Apple JRE happy.
...
Bug: http://b.android.com/178278
Change-Id: I693912678ed79e9c6690560b618a605da5a807c6
2015-10-07 09:28:31 -07:00
Alan Viverette
43f0fdc5cd
Merge "Remove hard-coded DrawSelectorOnTop on ListFragment's default ListView."
2015-10-07 16:27:26 +00:00
Alan Viverette
6a06f12c3f
Merge "Frameworks/base: Fix AdapterViewAnimator.createOrReuseLayoutParams"
2015-10-07 16:23:36 +00:00
Alan Viverette
7de6ae159e
Merge "To call TypedArray.recycle() when we are done with the array."
2015-10-07 16:22:36 +00:00
Diego Perez
4a36d98259
am 081cebf5: Implement Path.approximate and add PathMeasure support
...
* commit '081cebf52b19e848c07fb781b35fa1f96695c311':
Implement Path.approximate and add PathMeasure support
2015-10-07 16:09:49 +00:00
Diego Perez
081cebf52b
Implement Path.approximate and add PathMeasure support
...
PathMeasure is needed to use the trimPath* properties in drawables.
These properties are used in the vector drawable for indeterminate
progress bars in Material so this is needed to be able to render them
correctly in the preview.
PathMeasure makes use of Path.approximate to calculate which segments to
paint.
Change-Id: Ic513f0a30a6aac0317f7c13cd75e9154c37405c8
2015-10-07 17:04:26 +01:00
Eric Laurent
bbf804ca0d
am c6865806: am f5d3f960: am 2a6f1d4a: Merge "ZenModeHelper: fix cross deadlock with AudioService" into mnc-dr-dev
...
* commit 'c6865806a4f76c44bc3cc55cff87cc85f0a48061':
ZenModeHelper: fix cross deadlock with AudioService
2015-10-07 13:56:41 +00:00
Eric Laurent
c6865806a4
am f5d3f960: am 2a6f1d4a: Merge "ZenModeHelper: fix cross deadlock with AudioService" into mnc-dr-dev
...
* commit 'f5d3f96001b42ff902022ebf4d97f9ab5e1f26f8':
ZenModeHelper: fix cross deadlock with AudioService
2015-10-07 13:50:02 +00:00
Eric Laurent
f5d3f96001
am 2a6f1d4a: Merge "ZenModeHelper: fix cross deadlock with AudioService" into mnc-dr-dev
...
* commit '2a6f1d4af39a72abecf16cc0a95feda7431afc07':
ZenModeHelper: fix cross deadlock with AudioService
2015-10-07 13:46:48 +00:00
Eric Laurent
2a6f1d4af3
Merge "ZenModeHelper: fix cross deadlock with AudioService" into mnc-dr-dev
2015-10-07 13:39:51 +00:00
Yin-Chia Yeh
a636be6c9a
Camera: fix wrong FULL feature string
...
Bug: 24678065
Change-Id: I2ca49565b919c87005d941863e22e3852a01a6c6
2015-10-06 13:45:20 -07:00
Selim Cinek
05f8818746
am ab8616cf: am 235a6911: am 714a61cd: Merge "Ambient display now comes up immediately when a notification comes in" into mnc-dr-dev
...
* commit 'ab8616cf183cd408039be394fee709f4e0ee1303':
Ambient display now comes up immediately when a notification comes in
2015-10-06 02:17:58 +00:00
Selim Cinek
ab8616cf18
am 235a6911: am 714a61cd: Merge "Ambient display now comes up immediately when a notification comes in" into mnc-dr-dev
...
* commit '235a6911b0939adc598e4135e1f1c6fcda9ff169':
Ambient display now comes up immediately when a notification comes in
2015-10-06 02:11:51 +00:00
Selim Cinek
235a6911b0
am 714a61cd: Merge "Ambient display now comes up immediately when a notification comes in" into mnc-dr-dev
...
* commit '714a61cd586c789b18acfd0567cfea2b4ea170dd':
Ambient display now comes up immediately when a notification comes in
2015-10-06 02:06:20 +00:00
Selim Cinek
714a61cd58
Merge "Ambient display now comes up immediately when a notification comes in" into mnc-dr-dev
2015-10-06 01:59:50 +00:00
Adam Lesinski
ce8fc7b919
am 42efe5b3: am c87996e5: am 8461f2fa: am 46684d2c: Merge "Add anydpi to the providing-resources docs" into mnc-dev
...
* commit '42efe5b333c1f28127da57a44b39bd72cfbe81b2':
Add anydpi to the providing-resources docs
2015-10-06 01:11:20 +00:00
Adam Lesinski
42efe5b333
am c87996e5: am 8461f2fa: am 46684d2c: Merge "Add anydpi to the providing-resources docs" into mnc-dev
...
* commit 'c87996e5382a5e9bc4ae400e1879d7c655d8b46a':
Add anydpi to the providing-resources docs
2015-10-06 01:03:49 +00:00
Adam Lesinski
c87996e538
am 8461f2fa: am 46684d2c: Merge "Add anydpi to the providing-resources docs" into mnc-dev
...
* commit '8461f2fa02c4c2ca2eef5bae391f1d1ff2c28593':
Add anydpi to the providing-resources docs
2015-10-06 00:57:43 +00:00
Adam Lesinski
8461f2fa02
am 46684d2c: Merge "Add anydpi to the providing-resources docs" into mnc-dev
...
* commit '46684d2caeef93f43be260d996e925ea6e4147ea':
Add anydpi to the providing-resources docs
2015-10-06 00:51:13 +00:00
Jean-Michel Trivi
ec09010730
am 7f33f6e9: am 38b987ab: am 0155856a: Fix AudioService rotation helper thread
...
* commit '7f33f6e92fa22f47af2f8d61883197013fae4c66':
Fix AudioService rotation helper thread
2015-10-06 00:27:18 +00:00
Jean-Michel Trivi
7f33f6e92f
am 38b987ab: am 0155856a: Fix AudioService rotation helper thread
...
* commit '38b987ab794f7e249a239db26dcf98ca8d2ff72b':
Fix AudioService rotation helper thread
2015-10-06 00:20:09 +00:00
Jean-Michel Trivi
38b987ab79
am 0155856a: Fix AudioService rotation helper thread
...
* commit '0155856a1d1cb272d83b6175953dd7151fe65daa':
Fix AudioService rotation helper thread
2015-10-06 00:14:01 +00:00
Pirama Arumuga Nainar
6314f0bf9b
am 456a4516: am a186456f: Safely handle interrupts during Thread.join()
...
* commit '456a451668728a18198927fe93f19896929535d3':
Safely handle interrupts during Thread.join()
2015-10-05 23:47:42 +00:00