OSDN Git Service
Deepanshu Gupta [Fri, 2 May 2014 19:43:11 +0000 (19:43 +0000)]
am
63e91b36: am
e57487be: am
500a3139: (-s ours) am
7a0985ec: am
f8144032: Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
* commit '
63e91b36c00c8d98bfa44e66ed389a42aca20bfc':
Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:43:09 +0000 (19:43 +0000)]
am
b6de19b7: am
05d791c3: am
efa617f9: (-s ours) am
15994863: am
89fdc0c5: Layoutlib tests now check methods return value [DO NOT MERGE]
* commit '
b6de19b753445383689ee450a7b4a8b15971dae7':
Layoutlib tests now check methods return value [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:43:06 +0000 (19:43 +0000)]
am
b971bae3: am
2800200d: am
a9b296a5: (-s ours) am
edd048fb: am
d4f0073f: Remove references to java package class Objects. [DO NOT MERGE]
* commit '
b971bae3d1ad98cecc312c63cc3b6d432687223a':
Remove references to java package class Objects. [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:38:37 +0000 (19:38 +0000)]
am
e57487be: am
500a3139: (-s ours) am
7a0985ec: am
f8144032: Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
* commit '
e57487be9ac9068710a603fc4cf584ee35bc367f':
Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:38:35 +0000 (19:38 +0000)]
am
05d791c3: am
efa617f9: (-s ours) am
15994863: am
89fdc0c5: Layoutlib tests now check methods return value [DO NOT MERGE]
* commit '
05d791c38bd4f7412df317ed393c36910a37ae87':
Layoutlib tests now check methods return value [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:38:32 +0000 (19:38 +0000)]
am
2800200d: am
a9b296a5: (-s ours) am
edd048fb: am
d4f0073f: Remove references to java package class Objects. [DO NOT MERGE]
* commit '
2800200db2d293ee1f157164376eafede4b256ae':
Remove references to java package class Objects. [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:34:34 +0000 (19:34 +0000)]
am
500a3139: (-s ours) am
7a0985ec: am
f8144032: Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
* commit '
500a3139def6ac57dbf48b0dc505a9876f5c9d63':
Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:34:31 +0000 (19:34 +0000)]
am
efa617f9: (-s ours) am
15994863: am
89fdc0c5: Layoutlib tests now check methods return value [DO NOT MERGE]
* commit '
efa617f9fe4cbf5449d735118bf39fcfbc1dbf74':
Layoutlib tests now check methods return value [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:34:28 +0000 (19:34 +0000)]
am
a9b296a5: (-s ours) am
edd048fb: am
d4f0073f: Remove references to java package class Objects. [DO NOT MERGE]
* commit '
a9b296a57e3f23870bf869727e18b3f055b86c06':
Remove references to java package class Objects. [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:30:24 +0000 (19:30 +0000)]
am
7a0985ec: am
f8144032: Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
* commit '
7a0985ec245e3b587f4725f7ae6856c85bc41346':
Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:30:21 +0000 (19:30 +0000)]
am
15994863: am
89fdc0c5: Layoutlib tests now check methods return value [DO NOT MERGE]
* commit '
15994863df716d78ad384bddfb9b71f65a9b2ac9':
Layoutlib tests now check methods return value [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:30:18 +0000 (19:30 +0000)]
am
edd048fb: am
d4f0073f: Remove references to java package class Objects. [DO NOT MERGE]
* commit '
edd048fb546ff62c0e285455adf94280237f56c4':
Remove references to java package class Objects. [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:23:44 +0000 (19:23 +0000)]
am
f8144032: Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
* commit '
f8144032d1fb7319bfd24914b12597505cfcc91f':
Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:23:42 +0000 (19:23 +0000)]
am
89fdc0c5: Layoutlib tests now check methods return value [DO NOT MERGE]
* commit '
89fdc0c556cf0fe2562fb8f0476e03cd51045164':
Layoutlib tests now check methods return value [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:23:39 +0000 (19:23 +0000)]
am
d4f0073f: Remove references to java package class Objects. [DO NOT MERGE]
* commit '
d4f0073f4805cd1036218f243d9b7c7c5bb90e41':
Remove references to java package class Objects. [DO NOT MERGE]
Scott Main [Fri, 2 May 2014 18:44:43 +0000 (18:44 +0000)]
am
1d7ea94d: am
937db487: Merge "update dashboard for 5/1/14" into klp-docs
* commit '
1d7ea94d72808162e70e55a531563cb011ac6f30':
update dashboard for 5/1/14
Scott Main [Fri, 2 May 2014 18:40:33 +0000 (18:40 +0000)]
am
937db487: Merge "update dashboard for 5/1/14" into klp-docs
* commit '
937db487443171b75f321190be591c8f3d5f74bb':
update dashboard for 5/1/14
Scott Main [Fri, 2 May 2014 18:36:41 +0000 (18:36 +0000)]
Merge "update dashboard for 5/1/14" into klp-docs
Scott Main [Fri, 2 May 2014 18:13:11 +0000 (18:13 +0000)]
am
44e7ed77: am
5584601c: add intel USB vendor ID bug:
13982556
* commit '
44e7ed77f16f6773d950e8b7a4fadb526b4c7a8a':
add intel USB vendor ID bug:
13982556
Scott Main [Fri, 2 May 2014 18:10:30 +0000 (18:10 +0000)]
am
5584601c: add intel USB vendor ID bug:
13982556
* commit '
5584601c8ade068f403808a3c2b5e9c611134ab2':
add intel USB vendor ID bug:
13982556
Scott Main [Fri, 2 May 2014 17:50:50 +0000 (10:50 -0700)]
add intel USB vendor ID
bug:
13982556
Change-Id: I34fae455f0eee04088bed3f79243776321c745cf
Justin Koh [Fri, 2 May 2014 17:25:50 +0000 (17:25 +0000)]
Merge "Make global action key timeout configurable." into klp-modular-dev
Justin Koh [Fri, 2 May 2014 17:02:44 +0000 (10:02 -0700)]
Make global action key timeout configurable.
Make global action key timeout configurable: deprecated the old public method
and created a new one: getDeviceGlobalActionKeyTimeout.
Bug:
14441321
Change-Id: Ifa9b136984a9f02cfe4040baeff11275174967c5
Scott Main [Thu, 1 May 2014 18:22:34 +0000 (11:22 -0700)]
update dashboard for 5/1/14
Change-Id: I874f060089ecc701c23b91adc52d19d50fd51014
Mark Renouf [Thu, 1 May 2014 18:18:40 +0000 (14:18 -0400)]
Implement cliff guard for swipeDismiss gesture
BUG:
14319825
Change-Id: I6a80c91b4a6ee2eaf49a8c0c69065d4b97d7f8f2
Jeff Brown [Thu, 1 May 2014 23:25:11 +0000 (23:25 +0000)]
Merge "Clean up some terminology related to interactive state." into klp-modular-dev
Vinod Krishnan [Thu, 1 May 2014 22:43:58 +0000 (22:43 +0000)]
Merge "DialogAlert window changes for Micro" into klp-modular-dev
Jeff Brown [Thu, 1 May 2014 22:18:00 +0000 (15:18 -0700)]
Clean up some terminology related to interactive state.
Change-Id: Ife4445685a5314dea64332a3490fa8dd3ffd89a2
Mindy Pereira [Thu, 1 May 2014 20:34:35 +0000 (20:34 +0000)]
Merge "Update fling min velocity" into klp-modular-dev
Robert Ly [Thu, 1 May 2014 17:47:23 +0000 (17:47 +0000)]
am
a9dfeaa9: am
7fadcf84: Merge "Revert "update wear stack notifications to coincide with devbyte code"" into klp-docs
* commit '
a9dfeaa94083c322fb95d8bd2ac765521ae8bceb':
Revert "update wear stack notifications to coincide with devbyte code"
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"
Robert Ly [Thu, 1 May 2014 17:44:16 +0000 (17:44 +0000)]
am
7fadcf84: Merge "Revert "update wear stack notifications to coincide with devbyte code"" into klp-docs
* commit '
7fadcf84244172004568c4107083d415f1285b75':
Revert "update wear stack notifications to coincide with devbyte code"
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"
Robert Ly [Thu, 1 May 2014 17:41:39 +0000 (17:41 +0000)]
Merge "Revert "update wear stack notifications to coincide with devbyte code"" into klp-docs
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
Robert Ly [Thu, 1 May 2014 17:40:16 +0000 (17:40 +0000)]
Revert "update wear stack notifications to coincide with devbyte code"
This reverts commit
b8e3f209af70a7707be75d866b142dc1fccc8d5f.
Change-Id: Iba48e235b23cb0b6ce191809e6eb87395c6d1766
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
Baligh Uddin [Thu, 1 May 2014 16:18:20 +0000 (16:18 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
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
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
Robert Ly [Thu, 1 May 2014 15:47:14 +0000 (08:47 -0700)]
docs: fix method name
Change-Id: If7efbc891eb8f1403bd167ae21d17a2847b257cc
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
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
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
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
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
Mindy Pereira [Thu, 1 May 2014 00:09:35 +0000 (17:09 -0700)]
Update fling min velocity
Make it configurable for watch
Change-Id: Icf90ebd5bd5924fb2a5beb6715479d5dbe7e7dd9
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
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
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
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]
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]
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
Mindy Pereira [Wed, 30 Apr 2014 18:36:59 +0000 (11:36 -0700)]
Make touch slop region smaller for watch
Change-Id: I3ebe8855b13648dea5f9a374ec4daae6271f22db
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
Deepanshu Gupta [Wed, 30 Apr 2014 02:37:01 +0000 (19:37 -0700)]
Fix class name for OverflowMenuButton [DO NOT MERGE]
Change-Id: Ie3e709e7aadb2193397df8befef0c55624d7e4e3
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]
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]
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)
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
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
Baligh Uddin [Tue, 29 Apr 2014 21:02:59 +0000 (21:02 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Vinod Krishnan [Fri, 18 Apr 2014 21:35:53 +0000 (14:35 -0700)]
DialogAlert window changes for Micro
Bug:
13243004
- The only difference between alert_dialog_micro.xml and alert_dialog_holo.xml is:
< android:layout_height="match_parent"
---
> android:layout_height="wrap_content"
> android:layout_marginStart="8dip"
> android:layout_marginEnd="8dip"
Change-Id: I84f9a88099a37aa7f5868e128b19cb1e812cb745
Guang Zhu [Tue, 29 Apr 2014 03:12:35 +0000 (20:12 -0700)]
make success explicit in BT instrumentation util
Change-Id: I6c8eb8cdb7928fa6a7c1bc96b374667d1d6ae6a1
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
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
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
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
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.
Adam Lesinski [Mon, 28 Apr 2014 20:30:35 +0000 (20:30 +0000)]
Merge "Various CTS fixes" into klp-modular-dev
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.
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
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
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
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
6f9baea47757fef4745de434e09bd552fddc1f03)
Deepanshu Gupta [Wed, 16 Apr 2014 02:30:35 +0000 (19:30 -0700)]
Layoutlib tests now check methods return value [DO NOT MERGE]
The change is a cherry-pick from klp-dev.
The change also fixes the errors found by fixing the tests.
Change-Id: I87cef323c4eaee4e9f60475f01156b276593fa50
(cherry-picked from commit
bdd0ad79b9b027280bd371c7b6795b04ed89ac8f)
Deepanshu Gupta [Fri, 18 Oct 2013 03:06:44 +0000 (20:06 -0700)]
Remove references to java package class Objects. [DO NOT MERGE]
Remove references to Java 7 class java.util.Objects and replace it with
a new class that can be loaded on Java 6.
Change-Id: Ibbd9b20b8bc89e247f1d0c48d743d06d1a4f0704
(cherry-picked from commit
45f5cd49fa898a59484edfd8e291dbe10df82db2)
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.
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
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
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
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
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
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
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
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
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
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
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
Craig Mautner [Fri, 25 Apr 2014 03:03:37 +0000 (03:03 +0000)]
Merge "Too soon." into klp-modular-dev
Craig Mautner [Fri, 25 Apr 2014 03:01:40 +0000 (03:01 +0000)]
Too soon.
Change-Id: I1abb1d4841e4e6342c3b861d33ae22e22ed0a161
Craig Mautner [Fri, 25 Apr 2014 00:39:05 +0000 (00:39 +0000)]
Merge "Add test for attribute android:allowEmbedded" into klp-modular-dev
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.
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.
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
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
Craig Mautner [Thu, 24 Apr 2014 16:30:14 +0000 (16:30 +0000)]
Merge "Add activity attribute allowEmbedded" into klp-modular-dev
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
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
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
OSDN Git Service
