Svet Ganov
b1acf7d83c
am a938239f: am 6a67cd45: am ca030f8e: Merge "Add read cell broadcast app op - framework" into mnc-dev
...
* commit 'a938239f33f2fc615cb8e1813eb6a9773ff16c96':
Add read cell broadcast app op - framework
2015-05-03 01:12:31 +00:00
Svetoslav
53bd98313a
am 4e713199: am 0f74977b: am e9fc4cda: Merge "Add camera app op - framework" into mnc-dev
...
* commit '4e713199526b1ddc8c8a1a518eff0d19e44a145d':
Add camera app op - framework
2015-05-03 01:12:25 +00:00
Svet Ganov
a938239f33
am 6a67cd45: am ca030f8e: Merge "Add read cell broadcast app op - framework" into mnc-dev
...
* commit '6a67cd450460ffece60713a0e9456d7637469e15':
Add read cell broadcast app op - framework
2015-05-03 01:00:23 +00:00
Svetoslav
4e71319952
am 0f74977b: am e9fc4cda: Merge "Add camera app op - framework" into mnc-dev
...
* commit '0f74977b5c7c5df6a2331e32176f6d130e51b68d':
Add camera app op - framework
2015-05-03 01:00:18 +00:00
Svet Ganov
ca030f8ed5
Merge "Add read cell broadcast app op - framework" into mnc-dev
2015-05-03 00:44:14 +00:00
Svet Ganov
ede431678e
Add read cell broadcast app op - framework
...
Change-Id: Icecc9d918db55493ada7a0faa6bfcc41d4114bbd
2015-05-02 17:42:44 -07:00
Svetoslav
e9fc4cda50
Merge "Add camera app op - framework" into mnc-dev
2015-05-03 00:41:50 +00:00
Svetoslav
fbf0ecabac
Add camera app op - framework
...
Change-Id: I17736a8abe2c6775e990b88fb3eab963f47167d0
2015-05-02 16:23:19 -07:00
Mike Lockwood
5a9cbb0316
am 37ba5713: am 32624f29: am 5ba44aff: Merge "BluetoothMidiService: Add support for sending SysEx messages that span multiple Bluetooth packets" into mnc-dev
...
* commit '37ba57134777a82227e3e12a958111d7f37beb48':
BluetoothMidiService: Add support for sending SysEx messages that span multiple Bluetooth packets
2015-05-02 16:44:14 +00:00
Mike Lockwood
37ba571347
am 32624f29: am 5ba44aff: Merge "BluetoothMidiService: Add support for sending SysEx messages that span multiple Bluetooth packets" into mnc-dev
...
* commit '32624f29f9006da16e83d9a23745453f5f2416dd':
BluetoothMidiService: Add support for sending SysEx messages that span multiple Bluetooth packets
2015-05-02 16:31:36 +00:00
Mike Lockwood
5ba44affe6
Merge "BluetoothMidiService: Add support for sending SysEx messages that span multiple Bluetooth packets" into mnc-dev
2015-05-02 16:09:47 +00:00
Raph Levien
647476a27b
am 86de59aa: am 741d6120: am 5c268763: Merge "Expose StaticLayout.Builder publicly" into mnc-dev
...
* commit '86de59aa33e109f237e9fc25a2bcf779dc753f0c':
Expose StaticLayout.Builder publicly
2015-05-02 01:18:00 +00:00
Raph Levien
e0911854b1
am 151ccb9f: am 96a9c9b5: am 4bf4e4c8: Merge "Make Paint a required field of StaticLayout Builder" into mnc-dev
...
* commit '151ccb9f580e0082c571e50e4817ccd1cdd4379d':
Make Paint a required field of StaticLayout Builder
2015-05-02 01:17:54 +00:00
Yohei Yukawa
6b5554a7b5
am f436e6e8: am 14a60950: am b6bec1a4: Remove unused methods/variables/fields from Editor.java.
...
* commit 'f436e6e8483145d25608b775c1088da4bcdea066':
Remove unused methods/variables/fields from Editor.java.
2015-05-02 01:17:48 +00:00
Raph Levien
86de59aa33
am 741d6120: am 5c268763: Merge "Expose StaticLayout.Builder publicly" into mnc-dev
...
* commit '741d6120be20200e5ff6484c8b7293dfc4880dba':
Expose StaticLayout.Builder publicly
2015-05-02 01:08:00 +00:00
Raph Levien
151ccb9f58
am 96a9c9b5: am 4bf4e4c8: Merge "Make Paint a required field of StaticLayout Builder" into mnc-dev
...
* commit '96a9c9b5896aa6a8a956cc5fffca3f98b8c155c0':
Make Paint a required field of StaticLayout Builder
2015-05-02 01:07:55 +00:00
Yohei Yukawa
f436e6e848
am 14a60950: am b6bec1a4: Remove unused methods/variables/fields from Editor.java.
...
* commit '14a60950b24e0ae40f5fa611eb28f0453c3d583c':
Remove unused methods/variables/fields from Editor.java.
2015-05-02 01:07:50 +00:00
Raph Levien
5c26876304
Merge "Expose StaticLayout.Builder publicly" into mnc-dev
2015-05-02 00:42:18 +00:00
Raph Levien
4bf4e4c801
Merge "Make Paint a required field of StaticLayout Builder" into mnc-dev
2015-05-02 00:41:51 +00:00
Svet Ganov
1d294f49bd
am 107cd552: am 17daa3d0: am 574f5379: Merge "Add body sensors app op - framework base" into mnc-dev
...
* commit '107cd552f1d88ae22fde0284f4a64f78eaadfbc1':
Add body sensors app op - framework base
2015-05-01 23:45:22 +00:00
Svet Ganov
107cd552f1
am 17daa3d0: am 574f5379: Merge "Add body sensors app op - framework base" into mnc-dev
...
* commit '17daa3d02c6427b086710ca6d386202cde47c6ae':
Add body sensors app op - framework base
2015-05-01 23:34:54 +00:00
Yohei Yukawa
b6bec1a403
Remove unused methods/variables/fields from Editor.java.
...
This CL does nothing but remove unused code.
Change-Id: Ibe7c7aa1b9bdfd4117e27cb198082e307f4d68a4
2015-05-01 23:30:35 +00:00
Mike Lockwood
8c26d843a7
BluetoothMidiService: Add support for sending SysEx messages that span multiple Bluetooth packets
...
Change-Id: Id56f7c82ec97b6a46258111bbfd46ab1dc14dfe9
2015-05-01 16:16:42 -07:00
Svet Ganov
574f53793d
Merge "Add body sensors app op - framework base" into mnc-dev
2015-05-01 23:09:52 +00:00
Chris Craik
2eff3571b6
am 6e51a707: am 378510c3: am 106f88c8: Merge "Revert "Revert "Merge getDisplayList and updateDisplayListIfDirty""" into mnc-dev
...
* commit '6e51a707ea986102fb507bfdf00d2a4dddee70f7':
Revert "Revert "Merge getDisplayList and updateDisplayListIfDirty""
2015-05-01 22:17:17 +00:00
Raph Levien
531c30c62b
Expose StaticLayout.Builder publicly
...
Expose the new Builder pattern for creating StaticLayout. This allows
access to a number of features that have been available to TextView
through a hidden constructor. Some of these features have existed
for a while (mostly maxLines), while others are new (breakStrategy,
indents).
The builder is cleaner and has a better upgrade path than the old
pattern of lots of constructors with varying numbers of arguments.
Bug: 20190561
Change-Id: Ia3cd124825ab0cb469d22d1fc576ad26454545b8
2015-05-01 15:15:48 -07:00
Chris Craik
6e51a707ea
am 378510c3: am 106f88c8: Merge "Revert "Revert "Merge getDisplayList and updateDisplayListIfDirty""" into mnc-dev
...
* commit '378510c3aecf958871e4d9b35b9bb5e80f5e9ea2':
Revert "Revert "Merge getDisplayList and updateDisplayListIfDirty""
2015-05-01 22:05:57 +00:00
Chris Craik
85dd91ac88
am 9eeb725d: am 3deb109a: am 5c705c59: Merge "Fix build." into mnc-dev
...
* commit '9eeb725d91beeaec6631ec73e5856795dcdada73':
Fix build.
2015-05-01 21:38:20 +00:00
Chris Craik
31a2d063df
Revert "Revert "Merge getDisplayList and updateDisplayListIfDirty""
...
Fixes breakage from HwAccelerationTest
This reverts commit b2847afde2 .
Change-Id: I762b3c9020fc1d06bac61ffa8b956049147515b1
2015-05-01 14:30:15 -07:00
Chris Craik
9eeb725d91
am 3deb109a: am 5c705c59: Merge "Fix build." into mnc-dev
...
* commit '3deb109a7423eddf51b6242378123f09cd56c69e':
Fix build.
2015-05-01 21:25:36 +00:00
Chris Craik
255951e204
am e920b145: am 2551857f: am f4ff8f70: Merge "Merge getDisplayList and updateDisplayListIfDirty" into mnc-dev
...
* commit 'e920b1459a0ecd4240df78a616b56c0230446c5c':
Merge getDisplayList and updateDisplayListIfDirty
2015-05-01 21:14:55 +00:00
Chris Craik
07c801d712
am ed862369: am 3059dbb6: am 04c0f415: Merge "Update alpha documentation" into mnc-dev
...
* commit 'ed8623690b710ccb601373a622b09d96d7d15904':
Update alpha documentation
2015-05-01 21:14:49 +00:00
Jorim Jaggi
7a3e77fbee
am 83fb90f6: am 3f5f1cb6: am 0629a5d5: Merge "Rename supportsAssistGesture to supportsAssist" into mnc-dev
...
* commit '83fb90f61fa24ba7cc2b69ce91ad03b95d9d6024':
Rename supportsAssistGesture to supportsAssist
2015-05-01 21:14:44 +00:00
Chris Craik
e920b1459a
am 2551857f: am f4ff8f70: Merge "Merge getDisplayList and updateDisplayListIfDirty" into mnc-dev
...
* commit '2551857feed723c30759a40ae9429110c453d2d3':
Merge getDisplayList and updateDisplayListIfDirty
2015-05-01 21:03:49 +00:00
Chris Craik
ed8623690b
am 3059dbb6: am 04c0f415: Merge "Update alpha documentation" into mnc-dev
...
* commit '3059dbb65ac77e663fb4e89317fcafa3d2f6d9e2':
Update alpha documentation
2015-05-01 21:03:44 +00:00
Jorim Jaggi
83fb90f61f
am 3f5f1cb6: am 0629a5d5: Merge "Rename supportsAssistGesture to supportsAssist" into mnc-dev
...
* commit '3f5f1cb66441e9dd42a6d295c33e08b1f956fff6':
Rename supportsAssistGesture to supportsAssist
2015-05-01 21:03:39 +00:00
Chris Craik
5c705c595d
Merge "Fix build." into mnc-dev
2015-05-01 21:01:14 +00:00
Chris Craik
b2847afde2
Fix build.
...
Revert "Merge getDisplayList and updateDisplayListIfDirty"
This reverts commit f85d064b53 .
Change-Id: I8b1566aba67c385d72759ea2aea16edcd8477813
2015-05-01 21:01:01 +00:00
Svet Ganov
b9d71a6f89
Add body sensors app op - framework base
...
Change-Id: Idd5cd573fab3405e5b2a6e51d2d9d115650826e9
2015-05-01 13:56:04 -07:00
Chris Craik
f4ff8f701f
Merge "Merge getDisplayList and updateDisplayListIfDirty" into mnc-dev
2015-05-01 20:36:22 +00:00
Chris Craik
04c0f415b5
Merge "Update alpha documentation" into mnc-dev
2015-05-01 20:36:03 +00:00
Jorim Jaggi
0629a5d524
Merge "Rename supportsAssistGesture to supportsAssist" into mnc-dev
2015-05-01 20:34:22 +00:00
Jorim Jaggi
5f560d0562
Rename supportsAssistGesture to supportsAssist
...
Bug: 20642759
Change-Id: Idddc786980244cc94570d04fd414540bbad60448
2015-05-01 13:33:38 -07:00
Chris Wren
8baf7c8bbb
am c04a5df9: am f114e3d9: am b1ad8e9e: Merge changes from topic \'tron\' into mnc-dev
...
* commit 'c04a5df9c52fe026f1d0188eb092f12d0ad62505':
remove unused edge border dimension.
log clear all button
2015-05-01 19:24:20 +00:00
Chris Wren
c04a5df9c5
am f114e3d9: am b1ad8e9e: Merge changes from topic \'tron\' into mnc-dev
...
* commit 'f114e3d92df4fa8035f7e2722d5e653e9a27624f':
remove unused edge border dimension.
log clear all button
2015-05-01 19:13:26 +00:00
Alan Viverette
7014529b7d
am f71c93ff: am aeedef55: am da0d6a6b: Merge "Correctly handle intercepted touch events in FastScroller" into mnc-dev
...
* commit 'f71c93ff9aefade3bb0f9a056f88a38f6cf737c3':
Correctly handle intercepted touch events in FastScroller
2015-05-01 19:02:35 +00:00
Ruben Brunk
f2ad9c4a64
am 128a2fa0: am 626cd0fb: am 0f2be13d: camera: Update Camera2 API for arbitration.
...
* commit '128a2fa0021d2ef0bc1d1932cbbd877c69465c74':
camera: Update Camera2 API for arbitration.
2015-05-01 19:02:29 +00:00
Fabrice Di Meglio
90638ac747
am 62064926: am 359b96e5: am 83bb765b: Merge "Add IntentFilter auto verification - part 7" into mnc-dev
...
* commit '620649263fc9e8e3d782dba49bd46d5ae199c636':
Add IntentFilter auto verification - part 7
2015-05-01 19:02:24 +00:00
Yohei Yukawa
64c88a9c8b
am 784480b6: am 71cbadf3: am 097d5f10: Merge "Suggestions popup must be dismissed before device rotation." into mnc-dev
...
* commit '784480b62cbcbd86c48da8191af66755211d3f4f':
Suggestions popup must be dismissed before device rotation.
2015-05-01 19:02:13 +00:00
Amith Yamasani
ecdf49adcf
am bd898e70: am 17d5e266: am 92d42057: Merge "Exclude bound app widgets from idle app list" into mnc-dev
...
* commit 'bd898e707b724a6f2e339a6231aa531670bdf5e6':
Exclude bound app widgets from idle app list
2015-05-01 19:02:08 +00:00