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
4957a053ec
am acb0d3d9: am da9fd706: Merge "Non-voice-capable device default stream is now NOTIFICATION." into lmp-dev
...
* commit 'acb0d3d98a116585de4fb460daf11c2bd6f95913':
Non-voice-capable device default stream is now NOTIFICATION.
2014-07-20 18:04:18 +00:00
Adam Powell
9120dff7ec
am bc7340e0: am b08dc693: Merge "Remove obsolete (and large) overscroll drawables" into lmp-dev
...
* commit 'bc7340e006da8eac639e4fae7dca9c3006ee607d':
Remove obsolete (and large) overscroll drawables
2014-07-20 18:04:12 +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
Wonsik Kim
ab6b3695fa
am a7279448: am 71e398b4: Merge "TIF: Reorder TvInputInfo types from old to new." into lmp-dev
...
* commit 'a7279448befb62f36534d7a788b0c87db7af2e5e':
TIF: Reorder TvInputInfo types from old to new.
2014-07-20 18:03:54 +00:00
Wonsik Kim
8f199a44fd
am 1042ee6b: am b872b220: Merge "TIF: misc fix for TvInputHal" into lmp-dev
...
* commit '1042ee6be6294ad07ccda31571641996abc88bde':
TIF: misc fix for TvInputHal
2014-07-20 18:03:49 +00:00
Lajos Molnar
a6275d295a
am cebc7989: am 1717dea8: Extend MediaCodecInfo to describe usable codec limits and features
...
* commit 'cebc7989d7a4fa16396ed4b3be6d1922cefaea24':
Extend MediaCodecInfo to describe usable codec limits and features
2014-07-20 18:03:40 +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
Dongwon Kang
a2dc1378c6
am c90b613c: am c292f54f: Merge "TIF: introduce TvInputPassthroughWrapperService class to support 2-way pairing use-case." into lmp-dev
...
* commit 'c90b613ca3cbe21c871c0b98ed3ceabe2a7a3a09':
TIF: introduce TvInputPassthroughWrapperService class to support 2-way pairing use-case.
2014-07-20 18:03:30 +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
Jae Seo
aa75604f2c
am c936967b: am 0c2b6c52: Merge "TIF: Add a way to notify whether the current program content is allowed" into lmp-dev
...
* commit 'c936967b84ef7ba70f948bcd99b8355fbdd3c9a4':
TIF: Add a way to notify whether the current program content is allowed
2014-07-20 18:03:09 +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
Jean-Michel Trivi
6736f716fe
am 895de04e: am fa198473: Merge "Add AudioAttributes to stream type conversion" into lmp-dev
...
* commit '895de04e7ca22494e46f20064e2133fc1f915d56':
Add AudioAttributes to stream type conversion
2014-07-20 18:01:58 +00:00
Jean-Michel Trivi
c0911d54e9
am bece8116: am 01e81000: Merge "Unhide AudioTrack constructor with AudioAttributes, AudioFormat" into lmp-dev
...
* commit 'bece8116fa302b1ea770d7580941c0ce6a500833':
Unhide AudioTrack constructor with AudioAttributes, AudioFormat
2014-07-20 18:01:51 +00:00
Quddus Chong
92748b8661
am 92f7993e: am a7112918: am 9fc983f5: am f0804df1: am 349e5760: docs: Fixed bugs in Game Controller training doc. bug: 16375247, 14671463
...
* commit '92f7993e56759dc06c9149654f40bcbffd9b281b':
docs: Fixed bugs in Game Controller training doc. bug: 16375247, 14671463
2014-07-20 18:01:38 +00:00
Deepanshu Gupta
0f374837d0
am 2895133f: am 6b1ceb42: am 296459ff: am f4989910: am d32dd294: am b86675f1: am f2c5a9ee: (-s ours) am b9efa1e5: am 14a4e69c: am c7351974: (-s ours) am a3966c66: am 62743940: am 8c71ff29: am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for st
...
* commit '2895133f602caff7a8f610c001a546c19c60c67b':
Fix style resolution for styles with '.' [DO NOT MERGE]
2014-07-20 18:01:34 +00:00
Deepanshu Gupta
35748d4c8d
am 4ed3d208: am 59987f2d: am 5d6322a5: (-s ours) am ad3ccc74: am 3f51ab0d: am 3c92b932: am 62b81acb: (-s ours) am 2df48bed: am 1bdfeadb: am 610341b3: (-s ours) am 95bbeb96: am b8e4e8e1: am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" int
...
* commit '4ed3d2089f3f2f45da9c4103a0ebbcb6595b060c':
Fix style resolution for styles with '.' [DO NOT MERGE]
2014-07-20 18:01:29 +00:00
Deepanshu Gupta
36397210ba
am 05900237: am 78bbb2a1: am 90824671: (-s ours) am 98b24366: am c35afdfd: am cee55fc1: am 99286edc: (-s ours) am aa0c1c75: am e83fa180: am 696eb4da: (-s ours) am c39916f7: am 37f54f4c: am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE]
...
* commit '059002370db91392218ad3250a112438cf7a5038':
Fix default level flags for bidi. [DO NOT MERGE]
2014-07-20 18:01:25 +00:00
Deepanshu Gupta
51e2786b7c
am 583b6898: am fe48ca3e: am 4ff3c7f0: (-s ours) am 08840806: am 7f98066d: am 4c312f20: am a3d2c7e7: (-s ours) am 85c7b209: am 5efee91e: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr2-dev
...
* commit '583b68980fd0e1ffac3afe2caf62d7b62dbc3890':
Fix style resolution for styles with '.' [DO NOT MERGE]
2014-07-20 18:01:21 +00:00
Deepanshu Gupta
76fbe3863e
am 13ebecfe: am d0eed243: am 276ae4ee: (-s ours) am 8613f826: am efd29681: am 964591a6: am c3a7763b: (-s ours) am 918ca12f: am 10395cbb: Fix default level flags for bidi. [DO NOT MERGE]
...
* commit '13ebecfe89e35724736303e677256a7eeee4b3b4':
Fix default level flags for bidi. [DO NOT MERGE]
2014-07-20 18:01:16 +00:00
Deepanshu Gupta
c06345918c
am d2966fce: am 2e11bba3: am 0804e0ad: (-s ours) am a9e488a6: am d8d3e87c: am 4627c98d: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into klp-dev
...
* commit 'd2966fce19e04ffc23eb7ecfb65a305c6a22c044':
Fix style resolution for styles with '.' [DO NOT MERGE]
2014-07-20 18:01:12 +00:00
Deepanshu Gupta
37455c624c
am 03b8f56a: am 1ab77f96: am d7f2bf06: (-s ours) am f75489f2: am c425c438: am 710a55b4: Fix default level flags for bidi. [DO NOT MERGE]
...
* commit '03b8f56a781a231ec11906ea479d8d5490108f24':
Fix default level flags for bidi. [DO NOT MERGE]
2014-07-20 18:01:08 +00:00
Guang Zhu
06953e2bc8
am 1931c1c3: am 5a0f7e41: am f59ce468: am b477fc6c: Merge "add command to enable bt snoop log" into klp-modular-dev
...
* commit '1931c1c324908620dc1a875934afea68db0b6d1d':
add command to enable bt snoop log
2014-07-20 18:00:51 +00:00
Jean-Michel Trivi
2c3386c8a5
am abc7f117: am 981fcf46: Merge "Hide AudioManager.startBluetoothScoVirtualCall()" into lmp-dev
...
* commit 'abc7f117bf1f8717bc9c62c4762f9c38e15b0fc6':
Hide AudioManager.startBluetoothScoVirtualCall()
2014-07-20 18:00:37 +00:00
Santos Cordon
472969a6a5
am 52cfd31e: am db2f81b0: Fixing ADD_CALL (1/3)
...
* commit '52cfd31ed48fdacc0ed11d1f2db7eea7f3a17fef':
Fixing ADD_CALL (1/3)
2014-07-20 18:00:22 +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
Yorke Lee
c375a4aa58
am c5989521: am c5a8e2f1: Rename voicemail permissions
...
* commit 'c59895217922428d3a34ae9635aba7fc4b4f7fc4':
Rename voicemail permissions
2014-07-20 18:00:00 +00:00
Shishir Agrawal
6256dfc9bc
am b8addfa0: am 47bbd460: Merge "Adding the ability for carrier app to override SPN and carrier name." into lmp-dev
...
* commit 'b8addfa04c98c7c49862150ab6702728fb98a953':
Adding the ability for carrier app to override SPN and carrier name.
2014-07-20 17:59:51 +00:00
Christopher Tate
a1fd6bc661
am 32523262: am 12e9b896: Fix which index goes where
...
* commit '32523262b62c4598ffd50873d290c1c601b9f842':
Fix which index goes where
2014-07-20 17:59:46 +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
Evan Charlton
0eb04823bf
am 1bb914ea: Rename PhoneAccount to PhoneAccountHandle
...
* commit '1bb914eab351bf5d119639d270991b45406134c7':
Rename PhoneAccount to PhoneAccountHandle
2014-07-20 17:46:50 +00:00
Evan Charlton
6eb262c351
Rename PhoneAccount to PhoneAccountHandle
...
Change-Id: I2e97b348e6316a8b3ccc39fd81013e7f514a2889
2014-07-20 10:34:59 -07:00
John Spurlock
8439d335b2
am 8179618c: Merge "Volume: haptic feedback entering vibrate using touch." into lmp-dev
...
* commit '8179618c79189c5f7abecbd07298805b2275f754':
Volume: haptic feedback entering vibrate using touch.
2014-07-20 17:16:11 +00:00
John Spurlock
ba80961a31
am 5f6ea4bf: Merge "Volume: Design followup." into lmp-dev
...
* commit '5f6ea4bf5f9ad72442ddfa05f0c40c581370692d':
Volume: Design followup.
2014-07-20 16:10:23 +00:00
David Friedman
f6f34214b1
am 380677d6: am 119716f4: am 0d5af3f6: am 5d59d371: Merge "Minor typos, consistency things, one grammatical error." into klp-modular-docs
...
* commit '380677d6af0ca7782bc74902ef27eac3d064b88d':
Minor typos, consistency things, one grammatical error.
2014-07-20 12:57:20 +00:00
David Friedman
00510833be
am 119716f4: am 0d5af3f6: am 5d59d371: Merge "Minor typos, consistency things, one grammatical error." into klp-modular-docs
...
* commit '119716f40466018e789d86b3005b6c839de85b8c':
Minor typos, consistency things, one grammatical error.
2014-07-20 12:49:57 +00:00
David Friedman
119716f404
am 0d5af3f6: am 5d59d371: Merge "Minor typos, consistency things, one grammatical error." into klp-modular-docs
...
* commit '0d5af3f67bdd3734304a19dad45d995e93b6e957':
Minor typos, consistency things, one grammatical error.
2014-07-20 12:43:19 +00:00
Wonsik Kim
4928bb6066
am 9b44c8b6: Merge "TIF: revise API names" into lmp-dev
...
* commit '9b44c8b61d7e0df34e333e3a1f46e7963d75317f':
TIF: revise API names
2014-07-20 11:56:04 +00:00
John Spurlock
196af1887b
am e4b360e7: Volume: new coat of paint.
...
* commit 'e4b360e78b856694ea0d10f05a5564f275dd3b47':
Volume: new coat of paint.
2014-07-20 11:55:58 +00:00
David Friedman
0d5af3f67b
am 5d59d371: Merge "Minor typos, consistency things, one grammatical error." into klp-modular-docs
...
* commit '5d59d371f27008214f29febb0595b602edddcc67':
Minor typos, consistency things, one grammatical error.
2014-07-20 07:59:05 +00:00
John Spurlock
eb2727bb2f
Volume: new coat of paint.
...
- Two sections (lighter header, darker detail) like QS.
- Fewer text variants.
- Remove backgrounds for segmented buttons.
- Remove alarm warning background.
- Fix slider-only style.
- Ensure all touch-targets are 48dp.
Bug:16419191
Change-Id: I220f3a736eba3dd7a1b9ff58a8fe4bf3d21db61a
2014-07-20 02:50:34 -04:00
Derek Sollenberger
637c588cf1
Merge "Separate Canvas JNI code from the implementation." into lmp-dev
2014-07-20 04:41:30 +00:00
Derek Sollenberger
8872b38ef4
Separate Canvas JNI code from the implementation.
...
This introduces Canvas.h which is a pure virtual interface that
is intended to be used by both Skia and HWUI implementation. To help
stage this transition this CL only introduces the interface and Skia
implementation. The interface is not intended to be final and will
undoubtedly go through iterations in both style and location as we
look to introduce the HWUI implementation.
BUG:15672762
Change-Id: Ibaccdddb87d3b9358f4f0c1d317ead5282d4ee16
2014-07-21 12:08:57 -04:00
Jesse Hall
19eb5cb80e
Merge "Add FEATURE_OPENGLES_EXTENSION_PACK_ES31A" into lmp-dev
2014-07-20 04:41:30 +00:00
John Spurlock
8d9c5ad809
Merge "Volume: Design followup." into lmp-dev
2014-07-20 04:41:30 +00:00