Adam Powell
facd9fa786
am cc19d68a: am bf5ecd02: Merge "Don\'t apply the ActionBar style to a Toolbar as a result of setActionBar" into lmp-dev
...
* commit 'cc19d68a90486ace893ad381911e9f675f1cf3d0':
Don't apply the ActionBar style to a Toolbar as a result of setActionBar
2014-07-20 18:07:54 +00:00
John Spurlock
a7aaa227ef
am 1fab88a4: am 16f6e259: Merge "Add audioAttributes to Notification." into lmp-dev
...
* commit '1fab88a4d5e79b516a382474d777a212c5989f68':
Add audioAttributes to Notification.
2014-07-20 18:07:23 +00:00
Adam Powell
c29868765c
am ca355c16: am 69ebf2cf: Merge "Measure Toolbar titles last" into lmp-dev
...
* commit 'ca355c16f188d847b55cd0efa25c86db44dcc36c':
Measure Toolbar titles last
2014-07-20 18:04:38 +00:00
Adam Powell
79412ffe60
am 71ff46d2: am 0505a3fe: Fix Toolbar title layout in RTL mode
...
* commit '71ff46d2f67fb90d6b959adb0f162b889a57be17':
Fix Toolbar title layout in RTL mode
2014-07-20 18:04:30 +00:00
Adam Powell
c12148d084
am 00061ce1: am 7a5bca44: Merge "Adapt ActionBar.LayoutParams to Toolbar.LayoutParams on demand" into lmp-dev
...
* commit '00061ce1363d6ffa8e94f15048db5a61bb5088cf':
Adapt ActionBar.LayoutParams to Toolbar.LayoutParams on demand
2014-07-20 18:04:23 +00:00
John Spurlock
eaeac08489
am 3897183d: am c297b9b3: Zen mode filtering should use new usage constants.
...
* commit '3897183d7bd884c4a01b22dccce75df48e93ab4a':
Zen mode filtering should use new usage constants.
2014-07-20 18:04:06 +00:00
Yohei Yukawa
6437d7559a
am eb5eb5c8: am f5827ba0: Merge "Add FLAG_CURSOR_ANCHOR_INFO_IMMEDIATE support in TextView" into lmp-dev
...
* commit 'eb5eb5c81d25e20cfdbf77494913576dcb974e13':
Add FLAG_CURSOR_ANCHOR_INFO_IMMEDIATE support in TextView
2014-07-20 18:03:59 +00:00
Jeff Brown
3ab509a29b
am 958361e9: am 25892fe6: Merge "Allow dreams to wake up gently." into lmp-dev
...
* commit '958361e92371fd7d3b40fbbd91077ec4d7abe374':
Allow dreams to wake up gently.
2014-07-20 18:03:35 +00:00
Jeff Brown
253aa5d458
am 610014e6: am 03fb5270: Add new Display.STATE_DOZE_SUSPEND power state.
...
* commit '610014e6501d3543f33aedcc7f302288afcc4df4':
Add new Display.STATE_DOZE_SUSPEND power state.
2014-07-20 18:03:26 +00:00
John Reck
4369443e44
am 761e298b: am b09a6670: Return Animator instead of ValueAnimator
...
* commit '761e298b11b31233067daf215ab788bb7042dc33':
Return Animator instead of ValueAnimator
2014-07-20 18:02:59 +00:00
Fabrice Di Meglio
da81175c3f
am 6b64ac48: am 3a4701fa: Revert "Fix LocalePicker background"
...
* commit '6b64ac48e0479b84859138907a0ebae88393130b':
Revert "Fix LocalePicker background"
2014-07-20 18:02:54 +00:00
Wei Wang
a1f99aec44
am 6e065374: am 5cb5ae18: More API modification of BLE APIs (1/2).
...
* commit '6e065374f53801f4c90c73cadd33157a7c22f900':
More API modification of BLE APIs (1/2).
2014-07-20 18:02:30 +00:00
Chris Craik
4ba7901626
am 7339d993: am e25d7792: Merge "Tweaks to outline API" into lmp-dev
...
* commit '7339d99353deaabfe67b421d3b1d7591c3c74d98':
Tweaks to outline API
2014-07-20 18:00:13 +00:00
Adam Powell
1ac577b9f9
am 186802ac: am d0cb5fd8: Merge "Add EXTRA_REPLACEMENT_EXTRAS for ACTION_CHOOSER" into lmp-dev
...
* commit '186802acd1c36b4194804857d9e52e24b74b31cc':
Add EXTRA_REPLACEMENT_EXTRAS for ACTION_CHOOSER
2014-07-20 18:00:09 +00:00
Sreeram Ramachandran
d9c973c8c1
am 5e23de19: am 4000b01f: Merge "Allow VPN interfaces to be put into blocking mode." into lmp-dev
...
* commit '5e23de196c3ac98e5a0da88515bad5d985d348d9':
Allow VPN interfaces to be put into blocking mode.
2014-07-20 17:59:41 +00:00
Winson Chung
d9e90a624b
am c655f3a4: am 51b044a2: Merge "Add setting to guard the lock-to-app recents icon" into lmp-dev
...
* commit 'c655f3a4487d5f810b392460227f0bad91c2768c':
Add setting to guard the lock-to-app recents icon
2014-07-20 02:19:27 +00:00
Amith Yamasani
2577701434
am 3d160098: am 65d3279b: Merge "Add a hidden API to expose cross profile caller id check" into lmp-dev
...
* commit '3d1600980675bdd5ba40c9b9633e772031c70108':
Add a hidden API to expose cross profile caller id check
2014-07-20 02:18:46 +00:00
Yin-Chia Yeh
bacae5e014
am 372461a1: am 861dd642: Merge "Camera2: add highSpeedVideoConfig wrapper and APIs" into lmp-dev
...
* commit '372461a12e3787d829ae2f300e0592ab11972c80':
Camera2: add highSpeedVideoConfig wrapper and APIs
2014-07-20 02:18:36 +00:00
Dake Gu
7c7ca375e7
am f31b6a29: am bd497879: ActivityTransition: fix wrong width/height applied to sharedelement.
...
* commit 'f31b6a29ce3fe6cb37668463aaf63e27fa2741de':
ActivityTransition: fix wrong width/height applied to sharedelement.
2014-07-20 02:18:26 +00:00
Andre Eisenbach
1a0ce0bef0
am 1f961f2c: am decb3109: Merge "Reduce GATT logging output" into lmp-dev
...
* commit '1f961f2c95140780e8f63b081a7493508c76a240':
Reduce GATT logging output
2014-07-20 02:18:13 +00:00
Niels Egberts
27845a1fc7
am 860e2f9f: am 40268fc5: Merge "Add money as a new TtsSpan type." into lmp-dev
...
* commit '860e2f9f485ebc81dfad269cca183fee3d03e583':
Add money as a new TtsSpan type.
2014-07-20 02:17:59 +00:00
Adam Lesinski
c2332a4d00
am b11e7d48: am e0b92a6b: First iteration of a public UsageStats API
...
* commit 'b11e7d48398c8e6e57578dabcf71eeef6a4e8bfd':
First iteration of a public UsageStats API
2014-07-20 02:17:49 +00:00
John Reck
aed135f2cd
am 0572b33d: am 3406fe19: Add RT-enabled reveal animator
...
* commit '0572b33d35d4c6f88d6a720f9b71e0b963c95f1e':
Add RT-enabled reveal animator
2014-07-20 02:17:41 +00:00
Zhijun He
84e7b64844
am b6236012: am 3ea4b9d0: Camera2: send the partial result with onCaptureProgressed
...
* commit 'b62360123f2d4dbf191319ba671bc3781c1a3bf5':
Camera2: send the partial result with onCaptureProgressed
2014-07-20 02:17:31 +00:00
Jim Miller
abd5eabeca
am 656d09ed: am 0f6db1e8: Merge "Add DevicePolicyManager flag for fingerprint." into lmp-dev
...
* commit '656d09edfddcc748fa56acd455f579cc08057848':
Add DevicePolicyManager flag for fingerprint.
2014-07-20 02:17:13 +00:00
Adam Powell
c80f952285
Fix Toolbar title layout in RTL mode
...
Welp, that one was embarrassing.
Bug 16192193
Change-Id: I4e94e71ef34b4b08b5dd4c7b7f0dfb22e834ca19
2014-07-19 13:05:26 -07:00
John Spurlock
7b41467704
Zen mode filtering should use new usage constants.
...
Refactor stream-based calls to usage-based calls.
Bug:15279516
Change-Id: I3f7757d8123c14670e2ad5f8e6aa4e9803efe7ec
2014-07-19 11:57:51 -04:00
Jeff Brown
5dc219142a
Add new Display.STATE_DOZE_SUSPEND power state.
...
Change-Id: Ia62f4f0d25234281dc600d0b7f08b3c6a312db7a
2014-07-18 21:28:18 -07:00
John Reck
c01bd1167a
Return Animator instead of ValueAnimator
...
Change-Id: I29a7cfdc7ffbb3a4d33f9e64f9d7ca791f5c947c
2014-07-19 02:00:15 +00:00
Fabrice Di Meglio
6eed108eeb
Revert "Fix LocalePicker background"
...
This reverts commit 6bbea8cf4252839d0c6f2a3152f506a7b2b2d753.
Change-Id: I430c725c8e5987fb643528594ef3a9a83827e7be
2014-07-19 01:58:09 +00:00
Wei Wang
685c175890
More API modification of BLE APIs (1/2).
...
Changed include:
1) Add serviceDataUuid to filter so it matches sanRecord and
AdvertiseData.
2) Add raw bytes to ScanRecord and make ScanResult take a ScanRecord
instead of raw bytes.
3) Change from setServiceUuid(List) to addServiceUuid(ParcelUuid).
4) Added include device name
5) Removed service not registered and added ADVERTISE_DATA_TOO_LARGE.
6) Fixed a few comments.
Change-Id: Ibbe07183b1293835c4a84728d1cd2d61e5d627d3
2014-07-18 18:31:00 -07:00
Dake Gu
7bf379c8af
ActivityTransition: fix wrong width/height applied to sharedelement.
...
transform screen position/size to position/size in parent of sharedelement.
fixed bug of transformMatirxToLocal() and transformMatrixToGlobal() that gets
Change-Id: I4c7b12f1ada7004ab7594961df4079be4ca4c909
2014-07-18 22:49:57 +00:00
Adam Lesinski
0debc9aff4
First iteration of a public UsageStats API
...
UsageStats API that allows apps to get a list of packages that have been
recently used, along with basic stats like how long they have been in
the foreground and the most recent time they were running.
Bug: 15165667
Change-Id: I2a2d1ff69bd0b5703ac3d9de1780df42ad90d439
2014-07-18 15:24:20 -07:00
John Reck
d3de42cae8
Add RT-enabled reveal animator
...
Bug: 16161431
Also re-writes RevealAnimator to avoid using any listeners internally,
removing the logic around shadowing the update listeners.
Change-Id: I6ed8126398eed971a87f20bccb7584c9acafbb6c
2014-07-18 22:10:22 +00:00
Zhijun He
fac77c46fe
Camera2: send the partial result with onCaptureProgressed
...
When partial results are receieved, call onCaptureProgressed instead of
onCapturePartial.
Change-Id: If97233d7b980f490821bca0a722d527f19034cd9
2014-07-18 22:01:48 +00:00
Andre Eisenbach
49ddceef7e
am 92adbade: am 99e79902: LE: Add connection parameter update request API (4/4)
...
* commit '92adbade49f741888b69691981e9367aef357b45':
LE: Add connection parameter update request API (4/4)
2014-07-18 19:38:28 +00:00
Christopher Tate
4e6d105b0e
am 0f5b9306: am 74ec3d59: Merge "Tear down agents properly at EOD in full restore" into lmp-dev
...
* commit '0f5b9306328af0c476bb71eed78e63a65e0898ac':
Tear down agents properly at EOD in full restore
2014-07-18 19:23:09 +00:00
Andre Eisenbach
6ce4db0acf
LE: Add connection parameter update request API (4/4)
...
Change-Id: Ifb531a1b7ab05888817b96fcc89f85e17df7ffe2
2014-07-18 12:13:46 -07:00
Dan Sandler
cfa9259a62
am f9845011: am 7aabcfa3: Merge "Deprecate and stop generating tickerViews." into lmp-dev
...
* commit 'f984501170f7449a38c6785675dd9f460f5bffa4':
Deprecate and stop generating tickerViews.
2014-07-18 18:59:38 +00:00
Dan Sandler
e9381b5e9b
am e7dc5140: am 9b557a25: Merge "Actually show secret notifications sometimes." into lmp-dev
...
* commit 'e7dc51401bb6a0341c34ccc4b5b04902f0ba997d':
Actually show secret notifications sometimes.
2014-07-18 18:59:31 +00:00
Brian Attwell
a683b2a29c
am a08e00c7: am fa15c729: Merge "Mark social APIs stream APIs as deprecated" into lmp-dev
...
* commit 'a08e00c7026c6b093fc927a03c168d2ed3b11986':
Mark social APIs stream APIs as deprecated
2014-07-18 18:59:27 +00:00
Adam Powell
2aa09a94dd
Don't apply the ActionBar style to a Toolbar as a result of setActionBar
...
While this is a convenient idea, it effectively means that any styling
directly applied to a Toolbar in a layout gets stomped by the
theme-global ActionBar style. Obey the more local, specific styling
from the Toolbar instead.
Change-Id: Ief6a7cb90052bdced87f1dc0925c1dfbc0df4792
2014-07-19 16:01:12 -07:00
Adam Powell
b606a3a312
Measure Toolbar titles last
...
Give the maximum amount of room to "real" content views before taking
up space for the title and subtitle of a toolbar.
Bug 16039951
Change-Id: I10da9cdc39e84e6fb3975ee40958c57031002dd5
2014-07-19 13:26:16 -07:00
Adam Powell
eb97f473fc
Adapt ActionBar.LayoutParams to Toolbar.LayoutParams on demand
...
When Toolbar is acting in the role of an action bar it needs to handle
the case where app code calls setLayoutParams on a custom view with an
ActionBar.LayoutParams instance. Run the newly set LayoutParams
through the check/generate routine normally performed when adding a
child view whenever LayoutParams are set on an existing child to
correct for it.
This might not be a bad thing to generalize someday but it would make
for very confusing compatibility behavior when running code that
was written to expect it on older platform versions.
Bug 16219488
Change-Id: I568a335fe8ebbbaa666690d1f0e95f313abd2f1e
2014-07-19 11:57:21 -07:00
Yin-Chia Yeh
8f8141e24f
Merge "Camera2: add highSpeedVideoConfig wrapper and APIs" into lmp-dev
2014-07-18 18:24:25 +00:00
Yin-Chia Yeh
12da140082
Camera2: add highSpeedVideoConfig wrapper and APIs
...
- Add wrapper class for highSpeedVideoConfiguration.
- Add APIs to query high speed video recording configurations in
StreamConfigurationMap
- Fix ColorSpaceTransform unit test in CameraMetadataTest
- Fix a bug in HashCodeHelper
Change-Id: I192e57f6ab5dfbba6d958571352f067a9eaec7b2
2014-07-18 16:00:53 -07:00
Andre Eisenbach
b3db5eb4f0
Merge "Reduce GATT logging output" into lmp-dev
2014-07-18 18:24:25 +00:00
Andre Eisenbach
55d19e495e
Reduce GATT logging output
...
Change-Id: Iefdf101ac849e45bf50c55ce5999364f5fbd24a4
2014-07-18 14:38:36 -07:00
Narayan Kamath
d373c004b0
am 3b29a424: am 8ebfdcbc: Merge "Fix broken locale related assumptions in TextServicesManager." into lmp-dev
...
* commit '3b29a42453c798bbaa8a37ce415cd72ca7b1a2c6':
Fix broken locale related assumptions in TextServicesManager.
2014-07-18 16:38:01 +00:00
Niels Egberts
d66f900acb
am 9a35945f: am 8fe5ff89: Merge "New TtsSpan builders for types measure, time, date, digits and verbatim." into lmp-dev
...
* commit '9a35945f774b94abfadff485e6f90de49938c402':
New TtsSpan builders for types measure, time, date, digits and verbatim.
2014-07-18 15:58:42 +00:00