Alan Viverette
1c121e124a
Merge "Update ripple spec, fix ripple mask, rotate progress drawable" into lmp-preview-dev
2014-06-04 23:13:55 +00:00
Raph Levien
c499e97667
Turn off elegantTextHeight in quantum theme
...
Setting elegantTextHeight to true was a great experiment, but it led to
too much difficulty getting text to fit in space-constrained spaces
(action bar, list items). A long term solution is optical bounds, but
for the time being, just turn it off.
This patch fixes bug 14227056: "Language name displaying under Personal
dictionary are truncated in landscape mode"
Change-Id: I2b0e1ca2e7a06cd0fd9a4d84c1c07fdea2ddbf03
2014-06-04 16:09:11 -07:00
Adam Powell
2a7b35e80b
Merge "Fix list navigation callbacks for ActionBarView" into lmp-preview-dev
2014-06-04 23:04:56 +00:00
Igor Murashkin
21547d66a9
camera2: Change CaptureListener callbacks to include the session (api)
...
* Also makes CameraDevice an abstract class (API)
Bug: 15428219
Bug: 14964443
Change-Id: I0e8c8309186aad59570aac7e0f998bb615405f0a
2014-06-04 16:03:32 -07:00
Ruben Brunk
fcab516cd4
am 37532379: Merge "DNG: Hide unimplemented methods." into lmp-preview-dev
...
* commit '37532379e7c770555b140332112a34fe716fed22':
DNG: Hide unimplemented methods.
2014-06-04 22:58:48 +00:00
Amith Yamasani
e1b74ec318
Change preference category text color for quantum
...
Use the colorAccent theme attribute.
Bug: 15384941
Change-Id: I9f98868313caf30a9658eadede23687f2eca5c9c
2014-06-04 15:51:41 -07:00
Adam Powell
c9102d743f
Fix list navigation callbacks for ActionBarView
...
Fix a regression from a previous refactoring where the call ordering
between setNavigationMode and setListNavigationCallbacks could result
in the item selection listener being ignored.
Bug 15395053
Change-Id: I5330f2c684a21448c64c6b62eec10b96405758f7
2014-06-04 15:49:04 -07:00
Matthew Williams
64939ae385
DO NOT MERGE Redact SyncService stuff from master
...
Cherry-pick over from master.
This changes the API surface area, deleting things we aren't releasing.
I'll do the internal clean-up at the same time I do the SyncManager
refactor to sit on top of the TaskManager.
Bug: 14997851
Change-Id: Ieebbbcd3324827098e88b36e45e6e82315a51e65
2014-06-04 22:46:25 +00:00
Matthew Williams
4b8bb98d63
Merge "Redact SyncService stuff from master"
2014-06-04 22:45:24 +00:00
Ruben Brunk
35677d1762
Merge "DNG: Hide unimplemented methods." into lmp-preview-dev
2014-06-04 22:25:18 +00:00
Deepanshu Gupta
c442d5d9db
am 9580af6d: Merge "Distinguish between menus in ActionBar and popup." into lmp-preview-dev
...
* commit '9580af6dbcb59427ca03efb8f5744101dd6efa32':
Distinguish between menus in ActionBar and popup.
2014-06-04 22:20:04 +00:00
Raph Levien
8608bbb207
am 626b82f6: Merge "Query style from asset-created font (Minikin)" into lmp-preview-dev
...
* commit '626b82f63e4d7ea97187bec313b5cb687bb501b7':
Query style from asset-created font (Minikin)
2014-06-04 22:19:56 +00:00
Deepanshu Gupta
e43dcc1d64
Merge "Distinguish between menus in ActionBar and popup." into lmp-preview-dev
2014-06-04 22:11:37 +00:00
Zhijun He
dcb65c3125
am b4f18bf1: Merge "Camera2: Update availableStreamConfigurations for JPEG sizes" into lmp-preview-dev
...
* commit 'b4f18bf11d7f0ca574ed9477486fd50e7c923023':
Camera2: Update availableStreamConfigurations for JPEG sizes
2014-06-04 22:11:31 +00:00
Selim Cinek
2a3606ba4a
am 2b81c8ef: Merge "Simplified maxPanelHeight logic." into lmp-preview-dev
...
* commit '2b81c8ef66cb046d96a950c5cf93cfb9015f4e40':
Simplified maxPanelHeight logic.
2014-06-04 22:11:30 +00:00
Evan Charlton
6dea4aceba
Expose post-dial APIs
...
Add APIs to expose post-dial DTMF functionality.
Bug: 13734588
Change-Id: I5cc06268590c3c424ea6daf216cb205b9c470dac
2014-06-04 15:10:57 -07:00
Elliott Hughes
a2d1454133
am ef3aeeca: am 38a5a257: am 759a8978: Merge "Minor javadoc improvements for PackageManager."
...
* commit 'ef3aeecacd4c47f6baeb96d06d69aad1ca4bcb1a':
Minor javadoc improvements for PackageManager.
2014-06-04 22:06:28 +00:00
Raph Levien
8224ad4f70
Merge "Query style from asset-created font (Minikin)" into lmp-preview-dev
2014-06-04 22:05:41 +00:00
Craig Mautner
a0c808bb75
am d842513c: Merge "Launch document sharing into unique activities" into lmp-preview-dev
...
* commit 'd842513c3df5fd3e46a70ab6798b4d3d20c4ef0b':
Launch document sharing into unique activities
2014-06-04 22:03:12 +00:00
Elliott Hughes
ef3aeecacd
am 38a5a257: am 759a8978: Merge "Minor javadoc improvements for PackageManager."
...
* commit '38a5a257a9aaf85606eb7117d943a877dc7d3c93':
Minor javadoc improvements for PackageManager.
2014-06-04 22:02:34 +00:00
Zhijun He
d618169619
Merge "Camera2: Update availableStreamConfigurations for JPEG sizes" into lmp-preview-dev
2014-06-04 21:56:27 +00:00
Matthew Williams
5a9decd589
Redact SyncService stuff from master
...
This changes the API surface area, deleting things we aren't releasing.
I'll do the internal clean-up at the same time I do the SyncManager
refactor to sit on top of the TaskManager.
Bug: 14997851
Change-Id: Ibefbb246f0e98d3159399151744279902468a23c
2014-06-04 14:55:53 -07:00
Elliott Hughes
3407c25499
am fc01a668: am c1973c28: am c0f4ac1b: Merge "Delete duplicate SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION flag"
...
* commit 'fc01a6687ba6e51a40bf448cf33367d1f1216544':
Delete duplicate SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION flag
2014-06-04 21:53:17 +00:00
Selim Cinek
45474056ea
Merge "Simplified maxPanelHeight logic." into lmp-preview-dev
2014-06-04 21:49:04 +00:00
Elliott Hughes
fc01a6687b
am c1973c28: am c0f4ac1b: Merge "Delete duplicate SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION flag"
...
* commit 'c1973c2888bde77f2dd5dbdba6225afb8829ed46':
Delete duplicate SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION flag
2014-06-04 21:48:08 +00:00
Elliott Hughes
38a5a257a9
am 759a8978: Merge "Minor javadoc improvements for PackageManager."
...
* commit '759a89782d38ddf6ab7f4a2c22c8911ea206b275':
Minor javadoc improvements for PackageManager.
2014-06-04 21:46:12 +00:00
Alan Viverette
b996d809bf
Update ripple spec, fix ripple mask, rotate progress drawable
...
Change-Id: I4fc155bf2f12d9f324c354dee81479f9cddafac4
2014-06-04 14:35:42 -07:00
Adam Powell
27f78dc7f2
am 45366a20: Merge "Fix EdgeEffect clipping and AbsListView\'s use of it" into lmp-preview-dev
...
* commit '45366a2036483d5beca5b9cffdb5acdae72d787a':
Fix EdgeEffect clipping and AbsListView's use of it
2014-06-04 21:32:57 +00:00
Selim Cinek
ba9547c0af
am 62f877c7: Merge "Fixed an animation bug" into lmp-preview-dev
...
* commit '62f877c7226450edcc5548fbd89be67665b65947':
Fixed an animation bug
2014-06-04 21:32:51 +00:00
Robert Greenwalt
e72da405fb
am d060ac14: (-s ours) Merge "DO NOT MERGE Report new network scores back to factories." into lmp-preview-dev
...
* commit 'd060ac1433cec943e915b026cb5c76bd6615538e':
DO NOT MERGE Report new network scores back to factories.
2014-06-04 21:32:34 +00:00
Eric Laurent
9e80b82d96
am b1873bdd: Merge "AudioSystem JNI: fix audio gain channel count" into lmp-preview-dev
...
* commit 'b1873bdd565509097b6fe711773dc023589f9a11':
AudioSystem JNI: fix audio gain channel count
2014-06-04 21:32:13 +00:00
Raph Levien
f8423bae17
am 8fad12dc: Merge "Fix incorrect getStringBounds (Minikin)" into lmp-preview-dev
...
* commit '8fad12dc66f47af2fd394f44858802d10cf110f1':
Fix incorrect getStringBounds (Minikin)
2014-06-04 21:32:07 +00:00
Fabrice Di Meglio
838c580a10
am 60a6c7f5: Merge "Update permissions assets for Quantum Theme" into lmp-preview-dev
...
* commit '60a6c7f59b3ae3c014211753162b2370e61e70d4':
Update permissions assets for Quantum Theme
2014-06-04 21:32:00 +00:00
Eric Laurent
aaa688972a
am 25d7a394: Merge "add permission for AudioManager routing APIs." into lmp-preview-dev
...
* commit '25d7a394c0cf91d9e9711d3f36913f4ed8aa91d8':
add permission for AudioManager routing APIs.
2014-06-04 21:31:49 +00:00
Adrian Roos
7cbd327d0c
am 32a69218: (-s ours) Merge "Hide TrustAgentService in lmp-preview - DO NOT MERGE" into lmp-preview-dev
...
* commit '32a6921865b0cb9999a3d8b22597ee0680577fd5':
Hide TrustAgentService in lmp-preview - DO NOT MERGE
2014-06-04 21:31:45 +00:00
Elliott Hughes
c1973c2888
am c0f4ac1b: Merge "Delete duplicate SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION flag"
...
* commit 'c0f4ac1bb8668702fa0f053d0ca219bab7dde67c':
Delete duplicate SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION flag
2014-06-04 21:29:08 +00:00
Elliott Hughes
759a89782d
Merge "Minor javadoc improvements for PackageManager."
2014-06-04 21:26:49 +00:00
Elliott Hughes
c0f4ac1bb8
Merge "Delete duplicate SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION flag"
2014-06-04 21:13:57 +00:00
Robin Lee
7f2d5162fd
am c774caff: am 4891a9f9: am e46e6004: Merge "Assign AID_EVERYONE gid to newly-created processes"
...
* commit 'c774caff86d2e5dc5ca3a0008007cb0fd384568b':
Assign AID_EVERYONE gid to newly-created processes
2014-06-04 21:13:24 +00:00
Craig Mautner
4c6debb767
Merge "Launch document sharing into unique activities" into lmp-preview-dev
2014-06-04 21:13:06 +00:00
Robin Lee
c774caff86
am 4891a9f9: am e46e6004: Merge "Assign AID_EVERYONE gid to newly-created processes"
...
* commit '4891a9f9cfee569c0d362f1781f44493f5e320c0':
Assign AID_EVERYONE gid to newly-created processes
2014-06-04 21:09:52 +00:00
Deepanshu Gupta
9288548527
am e478c562: am 905e113f: am 03df93bc: am 5cde33a6: am dcfba78f: am ed5ab0f0: am 022d8a9f: am bad112f2: am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev
...
* commit 'e478c5624d5eeca5adc088d9328582bd5b487963':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
2014-06-04 20:56:26 +00:00
Zhijun He
df9b74781a
Camera2: Update availableStreamConfigurations for JPEG sizes
...
Also Fix some doc issue in availableCapabilities
Bug: 12035686
Change-Id: Ie517a587f4a9e6cd9731fcca042e24adf832d9e3
2014-06-04 20:56:20 +00:00
Adam Powell
f5188cf6d5
Merge "Fix EdgeEffect clipping and AbsListView's use of it" into lmp-preview-dev
2014-06-04 20:55:57 +00:00
Robin Lee
4891a9f9cf
am e46e6004: Merge "Assign AID_EVERYONE gid to newly-created processes"
...
* commit 'e46e60041215249a285384cd2282de9f4d956a04':
Assign AID_EVERYONE gid to newly-created processes
2014-06-04 20:55:02 +00:00
Jorim Jaggi
095e3d300e
am 51309c7a: Merge "Fix not being able to dismiss notifications with tap." into lmp-preview-dev
...
* commit '51309c7ad93b2cbbe8fec828a49542d1207c4aa5':
Fix not being able to dismiss notifications with tap.
2014-06-04 20:53:01 +00:00
Selim Cinek
f3397e04a5
am 75bf1fe9: Merge "Fixed panel top padding animation regression" into lmp-preview-dev
...
* commit '75bf1fe9132cb97c073e53b034d10807e602da4e':
Fixed panel top padding animation regression
2014-06-04 20:52:55 +00:00
Robert Greenwalt
51e0be16b4
am 02006632: Merge "Call a network restricted only if all capabilities are restricted" into lmp-preview-dev
...
* commit '02006632ef34d70e196a47a3b11ff344005acbb1':
Call a network restricted only if all capabilities are restricted
2014-06-04 20:52:50 +00:00
Selim Cinek
b2007f3ac6
am e7a2ece7: Merge "Fixed flickering in panel overscroll" into lmp-preview-dev
...
* commit 'e7a2ece7852933a9c857e0615601f70abf469f05':
Fixed flickering in panel overscroll
2014-06-04 20:52:45 +00:00
Jorim Jaggi
8abb0a8398
am 6dc68cab: Merge "Fix Keyguard crash when in landscape." into lmp-preview-dev
...
* commit '6dc68cab1858bc899fb3209c61dc86a813e7b8ff':
Fix Keyguard crash when in landscape.
2014-06-04 20:52:38 +00:00