OSDN Git Service
Jungshik Jang [Tue, 3 Jun 2014 07:22:30 +0000 (16:22 +0900)]
Refactor HdmiCecLocalDevice and logical address allocation logic.
1. Factor out logical allocation logic to HdmiControlService.
2. Contains a reference to HdmiControlService rather than
HdmiCecController so that it enables to access service's logic
directly.
3. Move launch device discovery logic to HdmiCecLocalDeviceTv.
Change-Id: Ic97b4d51311a3c18f6d586c2245cac410cbd370e
Amith Yamasani [Thu, 5 Jun 2014 00:22:46 +0000 (00:22 +0000)]
Merge "Fix messed up current.txt"
Amith Yamasani [Thu, 5 Jun 2014 00:19:24 +0000 (17:19 -0700)]
Fix messed up current.txt
Change-Id: Id472fda6112593c1ba933100249bbd5c6ecb0ccb
Deepanshu Gupta [Thu, 5 Jun 2014 00:02:55 +0000 (00:02 +0000)]
am
4c0d33f2: Merge "Add basic support for simulating older versions." into lmp-preview-dev
* commit '
4c0d33f29f295e5ae27ba057fc8cb2270295865a':
Add basic support for simulating older versions.
Dave Holmes [Wed, 4 Jun 2014 23:50:38 +0000 (23:50 +0000)]
am
b3b6f148: am
b766edce: am
4e99af34: am
aabfcb78: Merge "Adding links to the Gradle docs. Both of these files ask you to change the contents of your gradle file, but neither links to reference information on gradle. Because this is still pretty new information, I\'d
* commit '
b3b6f1481e710a4f528dba962a8d860cc9d391a4':
Adding links to the Gradle docs. Both of these files ask you to change the contents of your gradle file, but neither links to reference information on gradle. Because this is still pretty new information, I'd like to include a link to the Building with Gradle documentation.
Dave Holmes [Wed, 4 Jun 2014 23:45:42 +0000 (23:45 +0000)]
am
b766edce: am
4e99af34: am
aabfcb78: Merge "Adding links to the Gradle docs. Both of these files ask you to change the contents of your gradle file, but neither links to reference information on gradle. Because this is still pretty new information, I\'d like to incl
* commit '
b766edcea3dfdc6513218649b9ad2030bc195c23':
Adding links to the Gradle docs. Both of these files ask you to change the contents of your gradle file, but neither links to reference information on gradle. Because this is still pretty new information, I'd like to include a link to the Building with Gradle documentation.
Amith Yamasani [Wed, 4 Jun 2014 23:44:29 +0000 (23:44 +0000)]
Merge "Change preference category text color for quantum"
Igor Murashkin [Wed, 4 Jun 2014 23:42:58 +0000 (23:42 +0000)]
am
97b2bc9a: Merge "camera2: Change CaptureListener callbacks to include the session (api)" into lmp-preview-dev
* commit '
97b2bc9a05a56dad609360f8fec1e5a51059e656':
camera2: Change CaptureListener callbacks to include the session (api)
Raph Levien [Wed, 4 Jun 2014 23:42:57 +0000 (23:42 +0000)]
am
424f369a: Merge "Turn off elegantTextHeight in quantum theme" into lmp-preview-dev
* commit '
424f369a38371294fdf3fc8d769ae9ca1e790807':
Turn off elegantTextHeight in quantum theme
Dave Holmes [Wed, 4 Jun 2014 23:41:49 +0000 (23:41 +0000)]
am
4e99af34: am
aabfcb78: Merge "Adding links to the Gradle docs. Both of these files ask you to change the contents of your gradle file, but neither links to reference information on gradle. Because this is still pretty new information, I\'d like to include a link to
* commit '
4e99af342b340bebcd635137966d21c59c294532':
Adding links to the Gradle docs. Both of these files ask you to change the contents of your gradle file, but neither links to reference information on gradle. Because this is still pretty new information, I'd like to include a link to the Building with Gradle documentation.
Dave Holmes [Wed, 4 Jun 2014 23:38:34 +0000 (23:38 +0000)]
am
aabfcb78: Merge "Adding links to the Gradle docs. Both of these files ask you to change the contents of your gradle file, but neither links to reference information on gradle. Because this is still pretty new information, I\'d like to include a link to the Building
* commit '
aabfcb78cf29e3d670831c770b9d757eb79487e4':
Adding links to the Gradle docs. Both of these files ask you to change the contents of your gradle file, but neither links to reference information on gradle. Because this is still pretty new information, I'd like to include a link to the Building with Gradle documentation.
Deepanshu Gupta [Wed, 4 Jun 2014 23:37:36 +0000 (23:37 +0000)]
Merge "Add basic support for simulating older versions." into lmp-preview-dev
Dave Holmes [Wed, 4 Jun 2014 23:35:50 +0000 (23:35 +0000)]
Merge "Adding links to the Gradle docs. Both of these files ask you to change the contents of your gradle file, but neither links to reference information on gradle. Because this is still pretty new information, I'd like to include a link to the Building with Gradle documentation." into klp-docs
Igor Murashkin [Wed, 4 Jun 2014 23:31:53 +0000 (23:31 +0000)]
Merge "camera2: Change CaptureListener callbacks to include the session (api)" into lmp-preview-dev
Raph Levien [Wed, 4 Jun 2014 23:28:47 +0000 (23:28 +0000)]
Merge "Turn off elegantTextHeight in quantum theme" into lmp-preview-dev
Alan Viverette [Wed, 4 Jun 2014 23:26:57 +0000 (23:26 +0000)]
am
c1462be8: Merge "Update ripple spec, fix ripple mask, rotate progress drawable" into lmp-preview-dev
* commit '
c1462be80a2581ddd522bf24d91ba183f166de80':
Update ripple spec, fix ripple mask, rotate progress drawable
Adam Powell [Wed, 4 Jun 2014 23:26:56 +0000 (23:26 +0000)]
am
f0e4ca1b: Merge "Fix list navigation callbacks for ActionBarView" into lmp-preview-dev
* commit '
f0e4ca1b0398a9709d1516434e6d926f477acd70':
Fix list navigation callbacks for ActionBarView
Matthew Williams [Wed, 4 Jun 2014 23:14:44 +0000 (23:14 +0000)]
am
7e36b718: (-s ours) DO NOT MERGE Redact SyncService stuff from master
* commit '
7e36b7183afc47c81581efad648e7930771e5f9a':
DO NOT MERGE Redact SyncService stuff from master
Alan Viverette [Wed, 4 Jun 2014 23:13:55 +0000 (23:13 +0000)]
Merge "Update ripple spec, fix ripple mask, rotate progress drawable" into lmp-preview-dev
Raph Levien [Wed, 4 Jun 2014 23:09:11 +0000 (16:09 -0700)]
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
Adam Powell [Wed, 4 Jun 2014 23:04:56 +0000 (23:04 +0000)]
Merge "Fix list navigation callbacks for ActionBarView" into lmp-preview-dev
Igor Murashkin [Wed, 4 Jun 2014 22:21:42 +0000 (15:21 -0700)]
camera2: Change CaptureListener callbacks to include the session (api)
* Also makes CameraDevice an abstract class (API)
Bug:
15428219
Bug:
14964443
Change-Id: I0e8c8309186aad59570aac7e0f998bb615405f0a
Ruben Brunk [Wed, 4 Jun 2014 22:58:48 +0000 (22:58 +0000)]
am
37532379: Merge "DNG: Hide unimplemented methods." into lmp-preview-dev
* commit '
37532379e7c770555b140332112a34fe716fed22':
DNG: Hide unimplemented methods.
Amith Yamasani [Wed, 4 Jun 2014 22:51:41 +0000 (15:51 -0700)]
Change preference category text color for quantum
Use the colorAccent theme attribute.
Bug:
15384941
Change-Id: I9f98868313caf30a9658eadede23687f2eca5c9c
Adam Powell [Wed, 4 Jun 2014 22:49:04 +0000 (15:49 -0700)]
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
Matthew Williams [Wed, 4 Jun 2014 16:25:11 +0000 (09:25 -0700)]
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
Matthew Williams [Wed, 4 Jun 2014 22:45:23 +0000 (22:45 +0000)]
Merge "Redact SyncService stuff from master"
Ruben Brunk [Wed, 4 Jun 2014 22:25:17 +0000 (22:25 +0000)]
Merge "DNG: Hide unimplemented methods." into lmp-preview-dev
Deepanshu Gupta [Wed, 4 Jun 2014 22:20:04 +0000 (22:20 +0000)]
am
9580af6d: Merge "Distinguish between menus in ActionBar and popup." into lmp-preview-dev
* commit '
9580af6dbcb59427ca03efb8f5744101dd6efa32':
Distinguish between menus in ActionBar and popup.
Raph Levien [Wed, 4 Jun 2014 22:19:56 +0000 (22:19 +0000)]
am
626b82f6: Merge "Query style from asset-created font (Minikin)" into lmp-preview-dev
* commit '
626b82f63e4d7ea97187bec313b5cb687bb501b7':
Query style from asset-created font (Minikin)
Deepanshu Gupta [Wed, 4 Jun 2014 22:11:36 +0000 (22:11 +0000)]
Merge "Distinguish between menus in ActionBar and popup." into lmp-preview-dev
Zhijun He [Wed, 4 Jun 2014 22:11:31 +0000 (22:11 +0000)]
am
b4f18bf1: Merge "Camera2: Update availableStreamConfigurations for JPEG sizes" into lmp-preview-dev
* commit '
b4f18bf11d7f0ca574ed9477486fd50e7c923023':
Camera2: Update availableStreamConfigurations for JPEG sizes
Selim Cinek [Wed, 4 Jun 2014 22:11:30 +0000 (22:11 +0000)]
am
2b81c8ef: Merge "Simplified maxPanelHeight logic." into lmp-preview-dev
* commit '
2b81c8ef66cb046d96a950c5cf93cfb9015f4e40':
Simplified maxPanelHeight logic.
Elliott Hughes [Wed, 4 Jun 2014 22:06:28 +0000 (22:06 +0000)]
am
ef3aeeca: am
38a5a257: am
759a8978: Merge "Minor javadoc improvements for PackageManager."
* commit '
ef3aeecacd4c47f6baeb96d06d69aad1ca4bcb1a':
Minor javadoc improvements for PackageManager.
Raph Levien [Wed, 4 Jun 2014 22:05:41 +0000 (22:05 +0000)]
Merge "Query style from asset-created font (Minikin)" into lmp-preview-dev
Craig Mautner [Wed, 4 Jun 2014 22:03:12 +0000 (22:03 +0000)]
am
d842513c: Merge "Launch document sharing into unique activities" into lmp-preview-dev
* commit '
d842513c3df5fd3e46a70ab6798b4d3d20c4ef0b':
Launch document sharing into unique activities
Elliott Hughes [Wed, 4 Jun 2014 22:02:34 +0000 (22:02 +0000)]
am
38a5a257: am
759a8978: Merge "Minor javadoc improvements for PackageManager."
* commit '
38a5a257a9aaf85606eb7117d943a877dc7d3c93':
Minor javadoc improvements for PackageManager.
Zhijun He [Wed, 4 Jun 2014 21:56:26 +0000 (21:56 +0000)]
Merge "Camera2: Update availableStreamConfigurations for JPEG sizes" into lmp-preview-dev
Matthew Williams [Wed, 4 Jun 2014 16:25:11 +0000 (09:25 -0700)]
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
Elliott Hughes [Wed, 4 Jun 2014 21:53:17 +0000 (21:53 +0000)]
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
Selim Cinek [Wed, 4 Jun 2014 21:49:02 +0000 (21:49 +0000)]
Merge "Simplified maxPanelHeight logic." into lmp-preview-dev
Elliott Hughes [Wed, 4 Jun 2014 21:48:08 +0000 (21:48 +0000)]
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
Elliott Hughes [Wed, 4 Jun 2014 21:46:12 +0000 (21:46 +0000)]
am
759a8978: Merge "Minor javadoc improvements for PackageManager."
* commit '
759a89782d38ddf6ab7f4a2c22c8911ea206b275':
Minor javadoc improvements for PackageManager.
Alan Viverette [Wed, 4 Jun 2014 21:35:42 +0000 (14:35 -0700)]
Update ripple spec, fix ripple mask, rotate progress drawable
Change-Id: I4fc155bf2f12d9f324c354dee81479f9cddafac4
Adam Powell [Wed, 4 Jun 2014 21:32:57 +0000 (21:32 +0000)]
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
Selim Cinek [Wed, 4 Jun 2014 21:32:51 +0000 (21:32 +0000)]
am
62f877c7: Merge "Fixed an animation bug" into lmp-preview-dev
* commit '
62f877c7226450edcc5548fbd89be67665b65947':
Fixed an animation bug
Robert Greenwalt [Wed, 4 Jun 2014 21:32:34 +0000 (21:32 +0000)]
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.
Eric Laurent [Wed, 4 Jun 2014 21:32:13 +0000 (21:32 +0000)]
am
b1873bdd: Merge "AudioSystem JNI: fix audio gain channel count" into lmp-preview-dev
* commit '
b1873bdd565509097b6fe711773dc023589f9a11':
AudioSystem JNI: fix audio gain channel count
Raph Levien [Wed, 4 Jun 2014 21:32:07 +0000 (21:32 +0000)]
am
8fad12dc: Merge "Fix incorrect getStringBounds (Minikin)" into lmp-preview-dev
* commit '
8fad12dc66f47af2fd394f44858802d10cf110f1':
Fix incorrect getStringBounds (Minikin)
Fabrice Di Meglio [Wed, 4 Jun 2014 21:32:00 +0000 (21:32 +0000)]
am
60a6c7f5: Merge "Update permissions assets for Quantum Theme" into lmp-preview-dev
* commit '
60a6c7f59b3ae3c014211753162b2370e61e70d4':
Update permissions assets for Quantum Theme
Eric Laurent [Wed, 4 Jun 2014 21:31:49 +0000 (21:31 +0000)]
am
25d7a394: Merge "add permission for AudioManager routing APIs." into lmp-preview-dev
* commit '
25d7a394c0cf91d9e9711d3f36913f4ed8aa91d8':
add permission for AudioManager routing APIs.
Adrian Roos [Wed, 4 Jun 2014 21:31:45 +0000 (21:31 +0000)]
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
Elliott Hughes [Wed, 4 Jun 2014 21:29:08 +0000 (21:29 +0000)]
am
c0f4ac1b: Merge "Delete duplicate SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION flag"
* commit '
c0f4ac1bb8668702fa0f053d0ca219bab7dde67c':
Delete duplicate SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION flag
Elliott Hughes [Wed, 4 Jun 2014 21:26:49 +0000 (21:26 +0000)]
Merge "Minor javadoc improvements for PackageManager."
Elliott Hughes [Wed, 4 Jun 2014 21:13:56 +0000 (21:13 +0000)]
Merge "Delete duplicate SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION flag"
Robin Lee [Wed, 4 Jun 2014 21:13:24 +0000 (21:13 +0000)]
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
Craig Mautner [Wed, 4 Jun 2014 21:13:06 +0000 (21:13 +0000)]
Merge "Launch document sharing into unique activities" into lmp-preview-dev
Robin Lee [Wed, 4 Jun 2014 21:09:52 +0000 (21:09 +0000)]
am
4891a9f9: am
e46e6004: Merge "Assign AID_EVERYONE gid to newly-created processes"
* commit '
4891a9f9cfee569c0d362f1781f44493f5e320c0':
Assign AID_EVERYONE gid to newly-created processes
Deepanshu Gupta [Wed, 4 Jun 2014 20:56:26 +0000 (20:56 +0000)]
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]
Zhijun He [Wed, 4 Jun 2014 20:42:41 +0000 (13:42 -0700)]
Camera2: Update availableStreamConfigurations for JPEG sizes
Also Fix some doc issue in availableCapabilities
Bug:
12035686
Change-Id: Ie517a587f4a9e6cd9731fcca042e24adf832d9e3
Adam Powell [Wed, 4 Jun 2014 20:55:56 +0000 (20:55 +0000)]
Merge "Fix EdgeEffect clipping and AbsListView's use of it" into lmp-preview-dev
Robin Lee [Wed, 4 Jun 2014 20:55:02 +0000 (20:55 +0000)]
am
e46e6004: Merge "Assign AID_EVERYONE gid to newly-created processes"
* commit '
e46e60041215249a285384cd2282de9f4d956a04':
Assign AID_EVERYONE gid to newly-created processes
Jorim Jaggi [Wed, 4 Jun 2014 20:53:01 +0000 (20:53 +0000)]
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.
Selim Cinek [Wed, 4 Jun 2014 20:52:55 +0000 (20:52 +0000)]
am
75bf1fe9: Merge "Fixed panel top padding animation regression" into lmp-preview-dev
* commit '
75bf1fe9132cb97c073e53b034d10807e602da4e':
Fixed panel top padding animation regression
Robert Greenwalt [Wed, 4 Jun 2014 20:52:50 +0000 (20:52 +0000)]
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
Selim Cinek [Wed, 4 Jun 2014 20:52:45 +0000 (20:52 +0000)]
am
e7a2ece7: Merge "Fixed flickering in panel overscroll" into lmp-preview-dev
* commit '
e7a2ece7852933a9c857e0615601f70abf469f05':
Fixed flickering in panel overscroll
Jorim Jaggi [Wed, 4 Jun 2014 20:52:38 +0000 (20:52 +0000)]
am
6dc68cab: Merge "Fix Keyguard crash when in landscape." into lmp-preview-dev
* commit '
6dc68cab1858bc899fb3209c61dc86a813e7b8ff':
Fix Keyguard crash when in landscape.
Deepanshu Gupta [Wed, 4 Jun 2014 20:52:36 +0000 (20:52 +0000)]
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 '
905e113f97560dbcf71cab517ab4c1ee4faaa4d3':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Jorim Jaggi [Wed, 4 Jun 2014 20:52:33 +0000 (20:52 +0000)]
am
34ed4600: Merge "Fix padding in more card." into lmp-preview-dev
* commit '
34ed46008c725ae3893f23875f3012e35efc5edb':
Fix padding in more card.
Selim Cinek [Wed, 4 Jun 2014 20:52:25 +0000 (20:52 +0000)]
am
246265c2: Merge "In the speedbump view, use hasOverlappingRenderings instead of layers" into lmp-preview-dev
* commit '
246265c228da399b7b894c158c713f06396538ec':
In the speedbump view, use hasOverlappingRenderings instead of layers
Selim Cinek [Wed, 4 Jun 2014 20:52:20 +0000 (20:52 +0000)]
am
dd225891: Merge "Disabled touch interaction when in Quick settings." into lmp-preview-dev
* commit '
dd225891718fa79378e3ec8119aafa0dbb17a82e':
Disabled touch interaction when in Quick settings.
Adrian Roos [Wed, 4 Jun 2014 20:52:14 +0000 (20:52 +0000)]
am
612734fb: Merge "Display time to charge on lock screen" into lmp-preview-dev
* commit '
612734fbfa24b925d51dcf47260a87290629f220':
Display time to charge on lock screen
Selim Cinek [Wed, 4 Jun 2014 20:52:08 +0000 (20:52 +0000)]
am
b8bf46b2: Merge "Fixed that app-info longpress was lost on configuration changes." into lmp-preview-dev
* commit '
b8bf46b250c7f299d6fcfe7942fdbfabb688f27a':
Fixed that app-info longpress was lost on configuration changes.
Selim Cinek [Wed, 4 Jun 2014 20:52:03 +0000 (20:52 +0000)]
am
a4e01205: Merge "Changed the overscroll and expanding behaviour." into lmp-preview-dev
* commit '
a4e01205c0782dccfe56597bd1144c75b4e08081':
Changed the overscroll and expanding behaviour.
Jorim Jaggi [Wed, 4 Jun 2014 20:51:58 +0000 (20:51 +0000)]
am
af4418ff: Merge "Fix more card appearance to spec from design." into lmp-preview-dev
* commit '
af4418ffb2b5bf289f85fb91a47fc63fc36949cd':
Fix more card appearance to spec from design.
Robin Lee [Wed, 4 Jun 2014 20:51:53 +0000 (20:51 +0000)]
Merge "Assign AID_EVERYONE gid to newly-created processes"
George Mount [Wed, 4 Jun 2014 20:51:52 +0000 (20:51 +0000)]
am
46e2688a: Merge "Create reasonable Activity Transition defaults for quantum theme." into lmp-preview-dev
* commit '
46e2688a20758d8529ccd3da83a0fcbbf3e8b5fb':
Create reasonable Activity Transition defaults for quantum theme.
Deepanshu Gupta [Wed, 4 Jun 2014 20:48:19 +0000 (20:48 +0000)]
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 '
03df93bcb854eedc600ef0120fd238ec974c44a1':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Adam Powell [Wed, 4 Jun 2014 20:46:55 +0000 (13:46 -0700)]
Fix EdgeEffect clipping and AbsListView's use of it
Make sure that we clip the edge glow against the edges of the view and
not against padding. If we're clipping to padding already, this will
happen automatically.
Bug
15020863
Change-Id: I4645c92f2a372d3c9fa8bb5a9fda44c0d82ac4cf
Raph Levien [Wed, 4 Jun 2014 20:46:35 +0000 (13:46 -0700)]
Query style from asset-created font (Minikin)
This patch sets fStyle on the TypefaceImpl based on querying the font,
which is important in the Typeface.createFromAsset path. This fixes both
the style returned from getStyle() and also selects fallback fonts to
best match the style of the main font.
Fixes bug
15429916: "Typeface.getStyle always returning 0 in some L
devices".
Change-Id: I1992ba1e65e7f488d331e175f5f12843f67c2faa
Deepanshu Gupta [Wed, 4 Jun 2014 20:45:02 +0000 (20:45 +0000)]
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 '
5cde33a6ffd6a3be87f6622e67c3d83fb61519cb':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Deepanshu Gupta [Wed, 4 Jun 2014 20:43:08 +0000 (20:43 +0000)]
am
9f213b1e: (-s ours) am
46c3beef: am
3ce1ca68: am
0ed9d498: am
328b1f92: (-s ours) am
5d3e3851: am
af3f96e4: am
e87c63e0: (-s ours) am
d2dff39b: am
b1ca2a0c: am
f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
9f213b1e2b2db2589cbe2f6554fd6e18ed871bad':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Deepanshu Gupta [Wed, 4 Jun 2014 20:43:02 +0000 (20:43 +0000)]
am
3c15d8d6: (-s ours) am
14104896: am
e4aa3138: am
a9e82914: Merge branch \'klp-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-dev
* commit '
3c15d8d6889806d0b517eec03ed6a4f8728ebc16':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Deepanshu Gupta [Wed, 4 Jun 2014 20:42:07 +0000 (20:42 +0000)]
Merge "Distinguish between menus in ActionBar and popup."
Deepanshu Gupta [Wed, 4 Jun 2014 20:41:47 +0000 (20:41 +0000)]
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 '
dcfba78fbb4dad6792113383b2d32eff7f2c1f88':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Selim Cinek [Wed, 4 Jun 2014 20:41:04 +0000 (22:41 +0200)]
Simplified maxPanelHeight logic.
Bug:
14487435
Change-Id: If171758a3143b24d7a1443c4761890670d03e49a
Selim Cinek [Wed, 4 Jun 2014 20:39:55 +0000 (20:39 +0000)]
Merge "Fixed an animation bug" into lmp-preview-dev
Deepanshu Gupta [Wed, 4 Jun 2014 20:38:25 +0000 (20:38 +0000)]
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 '
ed5ab0f01eac6686165f67fe0e9dec3bb48bbb4b':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Deepanshu Gupta [Wed, 4 Jun 2014 20:36:35 +0000 (20:36 +0000)]
am
f2862a84: (-s ours) am
4da5807c: am
88c9ca28: am
d49f9b25: am
2983ee55: (-s ours) am
12b657d7: am
dade24b4: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev
* commit '
f2862a849c6ba93c61c8bcc03da2ca9b8b8cc86f':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Selim Cinek [Wed, 4 Jun 2014 20:24:18 +0000 (22:24 +0200)]
Fixed an animation bug
Reposition animations were generated even if the shade is closed
or animations are disabled.
Bug:
15181880
Change-Id: I278278862f4b4837fe164ce2b769d9d50fa50ced
Deepanshu Gupta [Wed, 4 Jun 2014 20:34:14 +0000 (20:34 +0000)]
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 '
022d8a9f4400dc7ec2926b133fc7151d8a5c24a3':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Deepanshu Gupta [Wed, 4 Jun 2014 20:32:50 +0000 (20:32 +0000)]
am
46c3beef: am
3ce1ca68: am
0ed9d498: am
328b1f92: (-s ours) am
5d3e3851: am
af3f96e4: am
e87c63e0: (-s ours) am
d2dff39b: am
b1ca2a0c: am
f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
46c3beefad751fde9ba44d092a947df49d94219a':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Deepanshu Gupta [Wed, 4 Jun 2014 20:32:46 +0000 (20:32 +0000)]
am
14104896: am
e4aa3138: am
a9e82914: Merge branch \'klp-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-dev
* commit '
14104896770dd26195cd9ccfac8c1604cb95dbc6':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Deepanshu Gupta [Wed, 4 Jun 2014 20:32:43 +0000 (20:32 +0000)]
am
4da5807c: am
88c9ca28: am
d49f9b25: am
2983ee55: (-s ours) am
12b657d7: am
dade24b4: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev
* commit '
4da5807ce0e6a190c5e1de37297d454368906e76':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Deepanshu Gupta [Wed, 4 Jun 2014 20:30:05 +0000 (20:30 +0000)]
am
bad112f2: am
c8235b8e: am
ffcad247: am
904b89c5: am
295184bc: am
8782a120: resolved conflicts for merge of
61fb5784 to jb-mr1-dev
* commit '
bad112f23f09f8839b4b7294439b0fe725cc2034':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Deepanshu Gupta [Wed, 4 Jun 2014 20:29:11 +0000 (20:29 +0000)]
am
3ce1ca68: am
0ed9d498: am
328b1f92: (-s ours) am
5d3e3851: am
af3f96e4: am
e87c63e0: (-s ours) am
d2dff39b: am
b1ca2a0c: am
f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
3ce1ca68309231e693964824917a66f36e575fd7':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Deepanshu Gupta [Wed, 4 Jun 2014 20:29:06 +0000 (20:29 +0000)]
am
e4aa3138: am
a9e82914: Merge branch \'klp-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-dev
* commit '
e4aa31382139ee2e319110fbfff402e0c6315952':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Deepanshu Gupta [Wed, 4 Jun 2014 20:29:03 +0000 (20:29 +0000)]
am
88c9ca28: am
d49f9b25: am
2983ee55: (-s ours) am
12b657d7: am
dade24b4: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev
* commit '
88c9ca28effb9745d13647bd25d34b6ef53e7cb9':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Deepanshu Gupta [Wed, 4 Jun 2014 20:27:49 +0000 (20:27 +0000)]
am
c8235b8e: am
ffcad247: am
904b89c5: am
295184bc: am
8782a120: resolved conflicts for merge of
61fb5784 to jb-mr1-dev
* commit '
c8235b8e7446c849df10ff2f897d2a3743b4934d':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Deepanshu Gupta [Wed, 4 Jun 2014 20:26:07 +0000 (20:26 +0000)]
am
0ed9d498: am
328b1f92: (-s ours) am
5d3e3851: am
af3f96e4: am
e87c63e0: (-s ours) am
d2dff39b: am
b1ca2a0c: am
f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
0ed9d498b740273fdbcdf51f55648c23df29accc':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
OSDN Git Service
