git.osdn.net Git - android-x86/frameworks-base.git/log

(root) / android-x86 / frameworks-base.git / log

Robert Ly [Thu, 1 May 2014 17:47:19 +0000 (17:47 +0000)]

am 9f129366: am 80b2cbbe: Revert "docs: fix method name"

* commit '9f129366e6963aacb00893e0be1892003bc0b39d':
Revert "docs: fix method name"

commit | commitdiff | tree

Robert Ly [Thu, 1 May 2014 17:44:13 +0000 (17:44 +0000)]

am 80b2cbbe: Revert "docs: fix method name"

* commit '80b2cbbe6c134ff415072f29eaa7392c1ebb0c52':
Revert "docs: fix method name"

commit | commitdiff | tree

Robert Ly [Thu, 1 May 2014 17:40:33 +0000 (17:40 +0000)]

Revert "docs: fix method name"

This reverts commit b39ce1b6c1dc34b3c99d312bc3f02dcc9efbbaed.

Change-Id: Ib7ed4fac07301dd5640fc41348af0d49ad9ef518

commit | commitdiff | tree

Mark Renouf [Thu, 1 May 2014 17:26:45 +0000 (17:26 +0000)]

Merge "SwipeDismiss: limit fade to 50% alpha while swiping" into klp-modular-dev

commit | commitdiff | tree

Baligh Uddin [Thu, 1 May 2014 16:18:20 +0000 (16:18 +0000)]

Merge "Import translations. DO NOT MERGE" into klp-modular-dev

commit | commitdiff | tree

Robert Ly [Thu, 1 May 2014 15:56:58 +0000 (15:56 +0000)]

am 6b7f3936: am b39ce1b6: docs: fix method name

* commit '6b7f3936ede97bf29ab5d606c172ff2be7bf9160':
docs: fix method name

commit | commitdiff | tree

Robert Ly [Thu, 1 May 2014 15:53:03 +0000 (15:53 +0000)]

am b39ce1b6: docs: fix method name

* commit 'b39ce1b6c1dc34b3c99d312bc3f02dcc9efbbaed':
docs: fix method name

commit | commitdiff | tree

Robert Ly [Thu, 1 May 2014 15:47:14 +0000 (08:47 -0700)]

docs: fix method name

Change-Id: If7efbc891eb8f1403bd167ae21d17a2847b257cc

commit | commitdiff | tree

Robert Ly [Thu, 1 May 2014 09:37:01 +0000 (09:37 +0000)]

am 8873025b: am f26a7100: Merge "update wear stack notifications to coincide with devbyte code" into klp-docs

* commit '8873025b2a52ca1ecccfaa9840e82681e17900d4':
update wear stack notifications to coincide with devbyte code

commit | commitdiff | tree

Robert Ly [Thu, 1 May 2014 08:22:05 +0000 (08:22 +0000)]

am f26a7100: Merge "update wear stack notifications to coincide with devbyte code" into klp-docs

* commit 'f26a71003de069355931eab340433ba8345ba3f7':
update wear stack notifications to coincide with devbyte code

commit | commitdiff | tree

Robert Ly [Thu, 1 May 2014 07:27:22 +0000 (07:27 +0000)]

Merge "update wear stack notifications to coincide with devbyte code" into klp-docs

commit | commitdiff | tree

Robert Ly [Thu, 1 May 2014 07:23:42 +0000 (00:23 -0700)]

update wear stack notifications to coincide with devbyte code

Change-Id: I4ccfc39eb47c938b9c1e9ba9309aaba54319f53b

commit | commitdiff | tree

Mark Renouf [Thu, 1 May 2014 00:50:30 +0000 (20:50 -0400)]

SwipeDismiss: limit fade to 50% alpha while swiping

BUG: 14319825

Change-Id: I3704fab77f2d3660ae374bdf16c767c124dcb8e9

commit | commitdiff | tree

Ricardo Cervera [Wed, 30 Apr 2014 22:03:40 +0000 (22:03 +0000)]

am 27515952: am ba333f2f: docs: Added release notes for Android Studio 0.5.2

* commit '27515952f54a8c98eaec694ce74c3b9d9b152746':
docs: Added release notes for Android Studio 0.5.2

commit | commitdiff | tree

Ricardo Cervera [Wed, 30 Apr 2014 21:59:19 +0000 (21:59 +0000)]

am ba333f2f: docs: Added release notes for Android Studio 0.5.2

* commit 'ba333f2f4c2ca5325b4df1b131c6c26a18beb877':
docs: Added release notes for Android Studio 0.5.2

commit | commitdiff | tree

Ricardo Cervera [Tue, 29 Apr 2014 00:52:55 +0000 (17:52 -0700)]

docs: Added release notes for Android Studio 0.5.2

Change-Id: Ia364620d0ab14648b4db523890c529a0dc5b940d

commit | commitdiff | tree

Deepanshu Gupta [Wed, 30 Apr 2014 20:35:04 +0000 (20:35 +0000)]

am c0c96012: am 4b5fa4d3: Fix class name for OverflowMenuButton [DO NOT MERGE]

* commit 'c0c96012c667d1d91d8f6b763df45e566cae0eaf':
Fix class name for OverflowMenuButton [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Wed, 30 Apr 2014 20:31:35 +0000 (20:31 +0000)]

am 4b5fa4d3: Fix class name for OverflowMenuButton [DO NOT MERGE]

* commit '4b5fa4d318e7efaffdc678e0cb8953ffc78c2b1e':
Fix class name for OverflowMenuButton [DO NOT MERGE]

commit | commitdiff | tree

Mindy Pereira [Wed, 30 Apr 2014 19:43:58 +0000 (19:43 +0000)]

Merge "Make touch slop region smaller for watch" into klp-modular-dev

commit | commitdiff | tree

Mindy Pereira [Wed, 30 Apr 2014 18:36:59 +0000 (11:36 -0700)]

Make touch slop region smaller for watch

Change-Id: I3ebe8855b13648dea5f9a374ec4daae6271f22db

commit | commitdiff | tree

Baligh Uddin [Wed, 30 Apr 2014 16:48:51 +0000 (09:48 -0700)]

Import translations. DO NOT MERGE

Change-Id: I1ccf4c1b33a7aa11cbf76dd86a2dd13be3f31ab9
Auto-generated-cl: translation import

commit | commitdiff | tree

Deepanshu Gupta [Wed, 30 Apr 2014 02:37:01 +0000 (19:37 -0700)]

Fix class name for OverflowMenuButton [DO NOT MERGE]

Change-Id: Ie3e709e7aadb2193397df8befef0c55624d7e4e3

commit | commitdiff | tree

Deepanshu Gupta [Wed, 30 Apr 2014 00:38:35 +0000 (00:38 +0000)]

am 8c15cd0d: am c967d8dc: Add special system view cookie to OverflowButton. [DO NOT MERGE]

* commit '8c15cd0dc1d04490b82fd7d8da7611ff3219a1f0':
Add special system view cookie to OverflowButton. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Wed, 30 Apr 2014 00:30:29 +0000 (00:30 +0000)]

am c967d8dc: Add special system view cookie to OverflowButton. [DO NOT MERGE]

* commit 'c967d8dc62c429ecf3e27bf3714a953636e75cbf':
Add special system view cookie to OverflowButton. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Fri, 25 Apr 2014 18:07:19 +0000 (11:07 -0700)]

Add special system view cookie to OverflowButton. [DO NOT MERGE]

Add a special view cookie to enable the IDE to identify the overflow
menu button in the Action Bar.

Change-Id: Ida3ed776afb8c9fa8af23b73d4cf6d47eef0ab87
(cherry picked from commit 674af92fd3a618695448ff88568b03390e90bc66)

commit | commitdiff | tree

Guang Zhu [Tue, 29 Apr 2014 23:06:39 +0000 (23:06 +0000)]

Merge "make success explicit in BT instrumentation util" into klp-modular-dev

commit | commitdiff | tree

Jinsuk Kim [Tue, 29 Apr 2014 21:32:49 +0000 (21:32 +0000)]

Merge "Move logical address allocation logic into native service from HAL" into klp-modular-dev

commit | commitdiff | tree

Baligh Uddin [Tue, 29 Apr 2014 21:02:59 +0000 (21:02 +0000)]

Merge "Import translations. DO NOT MERGE" into klp-modular-dev

commit | commitdiff | tree

Guang Zhu [Tue, 29 Apr 2014 03:12:35 +0000 (20:12 -0700)]

make success explicit in BT instrumentation util

Change-Id: I6c8eb8cdb7928fa6a7c1bc96b374667d1d6ae6a1

commit | commitdiff | tree

Yuling Liang [Mon, 28 Apr 2014 23:16:12 +0000 (23:16 +0000)]

Merge "Followon fix for 14276128 Clipping at bottom of TextView" into klp-modular-dev

commit | commitdiff | tree

David Friedman [Mon, 28 Apr 2014 23:03:25 +0000 (23:03 +0000)]

am 3fef8e60: am 1053b2c5: Merge "Fixed missing line break, broken link. Bug: 13975265 Staged at: boku:9195/guide/topics/manifest/manifest-element.html" into klp-docs

* commit '3fef8e60668bb955763367ac17c1195e46b3078c':
Fixed missing line break, broken link. Bug: 13975265 Staged at: http://boku:9195/guide/topics/manifest/manifest-element.html

commit | commitdiff | tree

David Friedman [Mon, 28 Apr 2014 21:56:07 +0000 (21:56 +0000)]

am 1053b2c5: Merge "Fixed missing line break, broken link. Bug: 13975265 Staged at: boku:9195/guide/topics/manifest/manifest-element.html" into klp-docs

* commit '1053b2c5d43ca58e9f0fe611770b278e88c76fa3':
Fixed missing line break, broken link. Bug: 13975265 Staged at: http://boku:9195/guide/topics/manifest/manifest-element.html

commit | commitdiff | tree

David Friedman [Mon, 28 Apr 2014 21:52:45 +0000 (21:52 +0000)]

Merge "Fixed missing line break, broken link. Bug: 13975265 Staged at: boku:9195/guide/topics/manifest/manifest-element.html" into klp-docs

commit | commitdiff | tree

Griff Hazen [Mon, 28 Apr 2014 20:33:22 +0000 (20:33 +0000)]

am 2c6131bb: am 293977bd: Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE.

* commit '2c6131bba957dc5b4e1638bb8b0c10ebddf2049a':
Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE.

commit | commitdiff | tree

Adam Lesinski [Mon, 28 Apr 2014 20:30:35 +0000 (20:30 +0000)]

Merge "Various CTS fixes" into klp-modular-dev

commit | commitdiff | tree

Griff Hazen [Mon, 28 Apr 2014 20:29:12 +0000 (20:29 +0000)]

am 293977bd: Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE.

* commit '293977bdb028e2aa893fbeb370e20132646094a9':
Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE.

commit | commitdiff | tree

Raph Levien [Thu, 24 Apr 2014 19:51:35 +0000 (12:51 -0700)]

Followon fix for 14276128 Clipping at bottom of TextView

The previous fix did not work when the text was ellipsized, because the
test for whether the line was the last line was incorrect. The new test
handles both the end of the buffer and the case where it is the last
line because of ellipsizing.

So this should be the proper fix for bug 14276128 Clipping at bottom of
TextView when lineSpacingMultiplier < 1

This version of the patch also handles the single-line case (which is
computed in BoringLayout rather than StaticLayout).

Change-Id: I88791acc2aa493cc8c599b374f4d213571260b4b

commit | commitdiff | tree

Griff Hazen [Mon, 28 Apr 2014 15:37:20 +0000 (08:37 -0700)]

Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE.

The logic was opposite.

Change-Id: I62e0b1e6701a4c9990119a1b94918e64783e9b1a

commit | commitdiff | tree

Baligh Uddin [Mon, 28 Apr 2014 16:53:10 +0000 (09:53 -0700)]

Import translations. DO NOT MERGE

Change-Id: I1d6579e5a984f30f7dd19dcb22d134645120ed8f
Auto-generated-cl: translation import

commit | commitdiff | tree

Vince Harron [Fri, 25 Apr 2014 23:22:07 +0000 (23:22 +0000)]

am e9a4e9de: Merge "Clarified recommended use cases for NDK. Added - "game engines" officially supported use case for NDK Removed - "self-contained" ambiguous in general and confusing to someone who is trying to do game development in C++ Removed - "that don\'t allocat

* commit 'e9a4e9deaad6a3185269bf5696c2a2946962fbd2':
Clarified recommended use cases for NDK. Added - "game engines" officially supported use case for NDK Removed - "self-contained" ambiguous in general and confusing to someone who is trying to do game development in C++ Removed - "that don't allocate a lot of memory" game engines do allocate a lot of memory.

commit | commitdiff | tree

Vince Harron [Fri, 25 Apr 2014 23:17:36 +0000 (23:17 +0000)]

Merge "Clarified recommended use cases for NDK. Added - "game engines" officially supported use case for NDK Removed - "self-contained" ambiguous in general and confusing to someone who is trying to do game development in C++ Removed - "that don't allocate a lot of memory" game engines do allocate a lot of memory." into klp-ub-dev

commit | commitdiff | tree

Ricardo Cervera [Fri, 25 Apr 2014 22:33:25 +0000 (22:33 +0000)]

am 86afa0b5: am 039bd508: Merge "docs: Added release notes for ADT 22.6.3" into klp-docs

* commit '86afa0b56bf8af0a2c94fcabf5eb7f64f6c66c2d':
docs: Added release notes for ADT 22.6.3

commit | commitdiff | tree

Ricardo Cervera [Fri, 25 Apr 2014 22:21:10 +0000 (22:21 +0000)]

am 039bd508: Merge "docs: Added release notes for ADT 22.6.3" into klp-docs

* commit '039bd50825f7ea8b706c8ea6e54a1c893759309d':
docs: Added release notes for ADT 22.6.3

commit | commitdiff | tree

Ricardo Cervera [Fri, 25 Apr 2014 22:15:28 +0000 (22:15 +0000)]

Merge "docs: Added release notes for ADT 22.6.3" into klp-docs

commit | commitdiff | tree

David Friedman [Fri, 25 Apr 2014 21:00:28 +0000 (14:00 -0700)]

Fixed missing line break, broken link.
Bug: 13975265
Staged at: http://boku:9195/guide/topics/manifest/manifest-element.html

Change-Id: I69f7e56f9b261c776672161cfb1649c4cd72c96e

commit | commitdiff | tree

Craig Mautner [Fri, 25 Apr 2014 18:39:46 +0000 (18:39 +0000)]

Merge "Throw exception from startActivity if not allowed." into klp-modular-dev

commit | commitdiff | tree

Craig Mautner [Fri, 25 Apr 2014 17:09:00 +0000 (10:09 -0700)]

Throw exception from startActivity if not allowed.

The ActivityView.startActivity method may defer calling
ActivityContainer.startActivity if the ActivityView is not yet
visible. If the activity being started doesn't have allowEmbedded
attribute set to true then the SecurityException will not be
thrown until the ActivityView is visible. In such a case the caller
of ActivityView.startActivity cannot catch the SecurityException.

This fix checks the attribute at the time ActivityView.startActivity
is called.

Fixes bug 14317210.

Change-Id: I7fff23e39b67a9a0aa1b2e555920d02ae38906d9

commit | commitdiff | tree

Adam Lesinski [Wed, 23 Apr 2014 20:46:21 +0000 (13:46 -0700)]

Various CTS fixes

WallpaperManager should always do a null check on the service object.
SystemServer should always bring up the DevicePolicyManagerService,
and let the service do appropriate default no-ops if the feature
is not supported.

Change-Id: Iaaf12b60ed375fe2e341ec11faa10c9344d7d9da

commit | commitdiff | tree

Yuling Liang [Fri, 25 Apr 2014 17:32:28 +0000 (17:32 +0000)]

Merge "Revert "Followon fix for 14276128 Clipping at bottom of TextView"" into klp-modular-dev

commit | commitdiff | tree

Yuling Liang [Fri, 25 Apr 2014 17:32:08 +0000 (17:32 +0000)]

Revert "Followon fix for 14276128 Clipping at bottom of TextView"

This reverts commit a10e19845ce76c0e4dd38018c84b83c9255dc9fe.

Change-Id: I6d40451c9eb6285859e16d251b55947663a3553a

commit | commitdiff | tree

Yuling Liang [Fri, 25 Apr 2014 16:30:12 +0000 (16:30 +0000)]

Merge "Followon fix for 14276128 Clipping at bottom of TextView" into klp-modular-dev

commit | commitdiff | tree

Craig Mautner [Fri, 25 Apr 2014 03:03:37 +0000 (03:03 +0000)]

Merge "Too soon." into klp-modular-dev

commit | commitdiff | tree

Craig Mautner [Fri, 25 Apr 2014 03:01:40 +0000 (03:01 +0000)]

Too soon.

Change-Id: I1abb1d4841e4e6342c3b861d33ae22e22ed0a161

commit | commitdiff | tree

Craig Mautner [Fri, 25 Apr 2014 00:39:05 +0000 (00:39 +0000)]

Merge "Add test for attribute android:allowEmbedded" into klp-modular-dev

commit | commitdiff | tree

Andrew Solovay [Thu, 24 Apr 2014 23:41:26 +0000 (23:41 +0000)]

am 27547e6d: am fdc9e56f: Correcting name of \'Backup & reset\' menu.

* commit '27547e6d3a22fb9615594769e460c6a86f2dd44b':
Correcting name of 'Backup & reset' menu.

commit | commitdiff | tree

Andrew Solovay [Thu, 24 Apr 2014 23:37:40 +0000 (23:37 +0000)]

am fdc9e56f: Correcting name of \'Backup & reset\' menu.

* commit 'fdc9e56ff8a1019c353e77f5d4b5f3566d173941':
Correcting name of 'Backup & reset' menu.

commit | commitdiff | tree

Andrew Solovay [Thu, 24 Apr 2014 22:47:38 +0000 (15:47 -0700)]

Correcting name of 'Backup & reset' menu.

Doc is staged at
http://asolovay.mtv.corp.google.com:9000/guide/topics/data/backup.html#Testing

Bug: 14253720
Change-Id: Ib8eb213d8708c02c93c8bc93233db2c828caa925

commit | commitdiff | tree

Raph Levien [Thu, 24 Apr 2014 19:51:35 +0000 (12:51 -0700)]

Followon fix for 14276128 Clipping at bottom of TextView

The previous fix did not work when the text was ellipsized, because the
test for whether the line was the last line was incorrect. The new test
handles both the end of the buffer and the case where it is the last
line because of ellipsizing.

So this should be the proper fix for bug 14276128 Clipping at bottom of
TextView when lineSpacingMultiplier < 1

Change-Id: Iac5c96f2273142031c18a27f504f7d6d5fcf823e

commit | commitdiff | tree

Craig Mautner [Thu, 24 Apr 2014 16:30:14 +0000 (16:30 +0000)]

Merge "Add activity attribute allowEmbedded" into klp-modular-dev

commit | commitdiff | tree

Raph Levien [Thu, 24 Apr 2014 16:12:54 +0000 (16:12 +0000)]

Merge "Fix bug 14276128 Clipping at bottom of TextView" into klp-modular-dev

commit | commitdiff | tree

Michael Kolb [Thu, 24 Apr 2014 16:08:21 +0000 (16:08 +0000)]

Merge "Use rotation to position circular display mask" into klp-modular-dev

commit | commitdiff | tree

Michael Kolb [Thu, 24 Apr 2014 05:06:21 +0000 (22:06 -0700)]

Use rotation to position circular display mask

Bug: 14231785

Change-Id: Ib6d69f3b9c2a638731539f1c1e51b56ad1698adc

commit | commitdiff | tree

Craig Mautner [Thu, 24 Apr 2014 15:42:32 +0000 (08:42 -0700)]

Add test for attribute android:allowEmbedded

Throw a SecurityException if it is not true for an activity launched
using ActivityContainer.startActivity().

Change-Id: Id1d70e630195a49a3eccdc64a0beccc420400332

commit | commitdiff | tree

Craig Mautner [Thu, 24 Apr 2014 04:38:50 +0000 (21:38 -0700)]

Add activity attribute allowEmbedded

Activitys without allowEmbedded=true may not be launched in an ActivityView.

Fixes bug 13693121.

Change-Id: I431d554300fc3504ab1bc7d73a58d5dad24f8639

commit | commitdiff | tree

Baligh Uddin [Thu, 24 Apr 2014 14:28:31 +0000 (14:28 +0000)]

Merge "Import translations. DO NOT MERGE" into klp-modular-dev

commit | commitdiff | tree

Craig Mautner [Thu, 24 Apr 2014 04:28:27 +0000 (04:28 +0000)]

Merge "Force ActivityView activities to start in new task" into klp-modular-dev

commit | commitdiff | tree

Deepanshu Gupta [Thu, 24 Apr 2014 01:31:24 +0000 (01:31 +0000)]

am 7947ec71: am b64732d9: Merge "Fix style warnings in RenderSessionImpl [DO NOT MERGE]" into klp-dev

* commit '7947ec715d8b4a0c82135553abb4947b61bf802b':
Fix style warnings in RenderSessionImpl [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 24 Apr 2014 01:31:20 +0000 (01:31 +0000)]

am a019e772: am 6aaea1bd: Merge "Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]" into klp-dev

* commit 'a019e77252f86962b9803042c01b897f7f1aa89f':
Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 24 Apr 2014 01:31:15 +0000 (01:31 +0000)]

am 126f4057: am 5ba2f230: Add view cookies for action bar menus. [DO NOT MERGE]

* commit '126f4057a06756fbb1c194b5d9d40f9f922d14ee':
Add view cookies for action bar menus. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 24 Apr 2014 01:27:53 +0000 (01:27 +0000)]

am b64732d9: Merge "Fix style warnings in RenderSessionImpl [DO NOT MERGE]" into klp-dev

* commit 'b64732d977c023423cd01d32361a49401d9203cd':
Fix style warnings in RenderSessionImpl [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 24 Apr 2014 01:27:50 +0000 (01:27 +0000)]

am 6aaea1bd: Merge "Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]" into klp-dev

* commit '6aaea1bd4aa056335776098cd9dc523e898716f1':
Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 24 Apr 2014 01:27:45 +0000 (01:27 +0000)]

am 5ba2f230: Add view cookies for action bar menus. [DO NOT MERGE]

* commit '5ba2f230faa355eb9bc1e90f6c48eeeb437f390c':
Add view cookies for action bar menus. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 24 Apr 2014 01:21:54 +0000 (01:21 +0000)]

Merge "Fix style warnings in RenderSessionImpl [DO NOT MERGE]" into klp-dev

commit | commitdiff | tree

Deepanshu Gupta [Thu, 24 Apr 2014 01:21:45 +0000 (01:21 +0000)]

Merge "Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]" into klp-dev

commit | commitdiff | tree

Deepanshu Gupta [Wed, 23 Apr 2014 00:22:32 +0000 (17:22 -0700)]

Fix style warnings in RenderSessionImpl [DO NOT MERGE]

Change-Id: I9d3cb23e4ea692f737a3e3d6c18cc8de18b66a3c
(cherry-picked from commit fbfeb1a90b6f8f3966c60a69d50ce8f608d9d861)

commit | commitdiff | tree

Deepanshu Gupta [Fri, 18 Apr 2014 19:32:38 +0000 (12:32 -0700)]

Add view cookies for action bar menus. [DO NOT MERGE]

The change adds the view cookies for the menus rendered in the action
bar. This enables the IDE to map the menu to the relevant XML Tag in the
menu xml and show the highlighting accordingly.

The change also contains a bugfix where a method wasn't renamed
properly.

Change-Id: Idcfc263a8ebe0a4f25afa3a1eb085fa628fd03ca
(cherry-picked from commit 1001961f904bac5294aaf73a47c2497aa764bf7f)

commit | commitdiff | tree

Raph Levien [Wed, 23 Apr 2014 22:52:55 +0000 (15:52 -0700)]

Fix bug 14276128 Clipping at bottom of TextView

Avoid applying "extra" linespacing to the last line of a layout, because
when that is negative, it causes clipping.

Change-Id: I4cc8792fd3444e4118604cc3d0f816d59dfc1e74

commit | commitdiff | tree

Deepanshu Gupta [Tue, 1 Apr 2014 01:59:45 +0000 (18:59 -0700)]

Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]

The bug caused some classes to be missed when computing the dependencies
of the existing classes.

Change-Id: I7285ff67e016ce5d73a8550501f49acc73cfadfa
(cherry-picked from 4a0f93bd32b8dd9b3c351680ad82e461d5111f38)

commit | commitdiff | tree

Craig Mautner [Wed, 23 Apr 2014 02:57:19 +0000 (19:57 -0700)]

Force ActivityView activities to start in new task

Activities were associating with existing tasks when their
components matched. This was causing them to be launched
into existing stacks rather than into their ActivityView. Adding
these flags forces the launches to be in unique tasks on their
ActivityView.

Fixes bug 14252286.

Change-Id: I9ba65a4a2da198435748c0a17396d3f7f8c75f5e

commit | commitdiff | tree

Baligh Uddin [Wed, 23 Apr 2014 18:27:35 +0000 (11:27 -0700)]

Import translations. DO NOT MERGE

Change-Id: I99c697cc9974820312756fa89f51e3cf821401e2
Auto-generated-cl: translation import

commit | commitdiff | tree

Andrew Solovay [Wed, 23 Apr 2014 02:47:50 +0000 (02:47 +0000)]

am 6c5bfa2f: am 026c82b1: Doc: Fixed a code sample to use standard methods. Also some formatting tweaks.

* commit '6c5bfa2f348f1d55cbff5f8f2bd61e88ac2d01ee':
Doc: Fixed a code sample to use standard methods. Also some formatting tweaks.

commit | commitdiff | tree

Andrew Solovay [Wed, 23 Apr 2014 02:44:06 +0000 (02:44 +0000)]

am 026c82b1: Doc: Fixed a code sample to use standard methods. Also some formatting tweaks.

* commit '026c82b1916a9e2b48b9ff62ffeb935d63935a68':
Doc: Fixed a code sample to use standard methods. Also some formatting tweaks.

commit | commitdiff | tree

Andrew Solovay [Tue, 22 Apr 2014 22:46:42 +0000 (15:46 -0700)]

Doc: Fixed a code sample to use standard methods. Also some formatting
tweaks.

Added blank lines for readability, and broke some long lines
so code samples don't need a scroll bar.

(Update: Fixed indentation that I broke on a code sample.)

Bug: 14045051
Change-Id: I1cf08b899ec55f9093545e71861c84120e4b56a1

commit | commitdiff | tree

Baligh Uddin [Wed, 23 Apr 2014 02:07:51 +0000 (02:07 +0000)]

Merge "Import translations. DO NOT MERGE" into klp-modular-dev

commit | commitdiff | tree

Baligh Uddin [Wed, 23 Apr 2014 02:01:08 +0000 (02:01 +0000)]

Merge "Import translations. DO NOT MERGE" into klp-modular-dev

commit | commitdiff | tree

Baligh Uddin [Wed, 23 Apr 2014 02:01:06 +0000 (02:01 +0000)]

Merge "Import translations. DO NOT MERGE" into klp-modular-dev

commit | commitdiff | tree

Baligh Uddin [Wed, 23 Apr 2014 02:01:03 +0000 (02:01 +0000)]

Merge "Import translations. DO NOT MERGE" into klp-modular-dev