46354 Commits

Author SHA1 Message Date
Justin Koh
6015844578 Merge "Make global action key timeout configurable." into klp-modular-dev 2014-05-02 17:25:50 +00:00
Justin Koh
feabd2c730 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
2014-05-02 10:04:34 -07:00
Mark Renouf
11b1469144 Implement cliff guard for swipeDismiss gesture
BUG: 14319825

Change-Id: I6a80c91b4a6ee2eaf49a8c0c69065d4b97d7f8f2
2014-05-02 01:56:54 +00:00
Jeff Brown
7f6ab17d41 Merge "Clean up some terminology related to interactive state." into klp-modular-dev 2014-05-01 23:25:11 +00:00
Vinod Krishnan
5c10c3cfa6 Merge "DialogAlert window changes for Micro" into klp-modular-dev 2014-05-01 22:43:58 +00:00
Jeff Brown
140ffc783c Clean up some terminology related to interactive state.
Change-Id: Ife4445685a5314dea64332a3490fa8dd3ffd89a2
2014-05-01 15:22:27 -07:00
Mindy Pereira
d5e92318b6 Merge "Update fling min velocity" into klp-modular-dev 2014-05-01 20:34:35 +00:00
Baligh Uddin
bf4927ee0d Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-05-01 16:18:21 +00:00
Mindy Pereira
23ffc73abd Update fling min velocity
Make it configurable for watch

Change-Id: Icf90ebd5bd5924fb2a5beb6715479d5dbe7e7dd9
2014-04-30 17:17:10 -07:00
Mindy Pereira
2920646cbe Make touch slop region smaller for watch
Change-Id: I3ebe8855b13648dea5f9a374ec4daae6271f22db
2014-04-30 11:36:59 -07:00
Baligh Uddin
b77014828f Import translations. DO NOT MERGE
Change-Id: I1ccf4c1b33a7aa11cbf76dd86a2dd13be3f31ab9
Auto-generated-cl: translation import
2014-04-30 09:48:51 -07:00
Guang Zhu
c6ebc0d120 Merge "make success explicit in BT instrumentation util" into klp-modular-dev 2014-04-29 23:06:39 +00:00
Baligh Uddin
c2e5503dba Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-04-29 21:03:00 +00:00
Vinod Krishnan
fa8fc41bdc 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
2014-04-28 22:07:26 -07:00
Guang Zhu
e47ebbeec6 make success explicit in BT instrumentation util
Change-Id: I6c8eb8cdb7928fa6a7c1bc96b374667d1d6ae6a1
2014-04-28 20:12:35 -07:00
Yuling Liang
26a5c2dd74 Merge "Followon fix for 14276128 Clipping at bottom of TextView" into klp-modular-dev 2014-04-28 23:16:13 +00:00
Griff Hazen
3c5a6cf935 am 2c6131bb: am 293977bd: Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE.
* commit '2c6131bba957dc5b4e1638bb8b0c10ebddf2049a':
  Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE.
2014-04-28 20:33:22 +00:00
Adam Lesinski
8ea2d45122 Merge "Various CTS fixes" into klp-modular-dev 2014-04-28 20:30:35 +00:00
Griff Hazen
2c6131bba9 am 293977bd: Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE.
* commit '293977bdb028e2aa893fbeb370e20132646094a9':
  Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE.
2014-04-28 20:29:12 +00:00
Raph Levien
d97b097a5b 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
2014-04-28 18:02:27 +00:00
Griff Hazen
293977bdb0 Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE.
The logic was opposite.

Change-Id: I62e0b1e6701a4c9990119a1b94918e64783e9b1a
2014-04-28 10:32:21 -07:00
Baligh Uddin
6f6ba132a7 Import translations. DO NOT MERGE
Change-Id: I1d6579e5a984f30f7dd19dcb22d134645120ed8f
Auto-generated-cl: translation import
2014-04-28 09:53:10 -07:00
Craig Mautner
247ab65a49 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
2014-04-25 11:20:01 -07:00
Adam Lesinski
2c8d67c9b0 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
2014-04-25 11:07:39 -07:00
Yuling Liang
10973c7776 Revert "Followon fix for 14276128 Clipping at bottom of TextView"
This reverts commit a10e19845ce76c0e4dd38018c84b83c9255dc9fe.

Change-Id: I6d40451c9eb6285859e16d251b55947663a3553a
2014-04-25 17:32:08 +00:00
Raph Levien
a10e19845c 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
2014-04-24 20:00:05 +00:00
Craig Mautner
03981a4c2e Merge "Add activity attribute allowEmbedded" into klp-modular-dev 2014-04-24 16:30:14 +00:00
Raph Levien
e4ee0e3193 Merge "Fix bug 14276128 Clipping at bottom of TextView" into klp-modular-dev 2014-04-24 16:12:54 +00:00
Craig Mautner
ffd14a13ce Add activity attribute allowEmbedded
Activitys without allowEmbedded=true may not be launched in an ActivityView.

Fixes bug 13693121.

Change-Id: I431d554300fc3504ab1bc7d73a58d5dad24f8639
2014-04-24 08:41:29 -07:00
Baligh Uddin
aed314e8f3 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-04-24 14:28:31 +00:00
Deepanshu Gupta
e17ed92200 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]
2014-04-24 01:31:15 +00:00
Deepanshu Gupta
126f4057a0 am 5ba2f230: Add view cookies for action bar menus. [DO NOT MERGE]
* commit '5ba2f230faa355eb9bc1e90f6c48eeeb437f390c':
  Add view cookies for action bar menus. [DO NOT MERGE]
2014-04-24 01:27:45 +00:00
Deepanshu Gupta
5ba2f230fa 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)
2014-04-23 18:04:21 -07:00
Raph Levien
936df68016 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
2014-04-23 23:17:12 +00:00
Baligh Uddin
b43b108355 Import translations. DO NOT MERGE
Change-Id: I99c697cc9974820312756fa89f51e3cf821401e2
Auto-generated-cl: translation import
2014-04-23 11:27:35 -07:00
Baligh Uddin
9daf4ae467 Import translations. DO NOT MERGE
Change-Id: I5867f9bda8854f34ee138c135c46219d36e9be49
Auto-generated-cl: translation import
2014-04-22 17:03:26 -07:00
Justin Koh
3b9a3cc02e Update GlobalActions for watches.
Update GlobalActions for watches: only have power off and settings, due to
limited real estate.

Change-Id: Ie3cbbb287f8c71c8c16a00637c83da6921d56e2e
2014-04-22 10:01:47 -07:00
Baligh Uddin
04acf38ce2 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-04-22 14:46:28 +00:00
Guang Zhu
6c0454ecae Merge "add bt instrumentation to run as a util" into klp-modular-dev 2014-04-22 03:33:47 +00:00
Guang Zhu
03800b8873 add bt instrumentation to run as a util
some bt test util methods are useful as device setup util, this
change exposes some of them via a BluetoothInstrumentation so
that they can be invoked like commands for setting up or
controlling bt state in test harness

Change-Id: I1d40baf374e145ab550ae4fa5f581e2eaf2e29bb
2014-04-21 19:06:17 -07:00
Craig Mautner
6985badc63 Fix black ActivityView
Don't add the surface to the VirtualDisplay until the activity
has drawn. That will keep the TextureView from turning black.

Fixes bug 12821632.

Change-Id: Ia06e9f91be3e14ad724f735ae4e201ac798863a2
2014-04-21 15:28:43 -07:00
Craig Mautner
6cdf51f21d Don't use finalize on ActivityView to cleanup.
Use a static object to contain the IActivityContainer reference
rather than storing it directly in the ActivityView itself. Then
when the ActivityView gives up the reference we can use a clean
finalize() call to release the IActivityContainer.

Fixes bug 14184756.

Change-Id: I7e05fcce3040b2b958f7c9cd030d5e3b745f3169
2014-04-21 15:28:43 -07:00
Craig Mautner
f4c909bcb8 Fix ActivityView lifecycle
Major changes to maintain the VirtualDisplay across repeated
attach/detach cycles of an ActivityView. This keeps the activities
and VirtualDisplays in the ActivityView from getting into bad states.

Fixes bug 14107002.

Change-Id: Idc2aaf85ac496eab0eeb436736cb10a2020040e8
2014-04-21 15:28:42 -07:00
Adam Lesinski
370cda7074 Merge "Allow InputEvents to propagate w/o IME" into klp-modular-dev 2014-04-21 20:18:11 +00:00
Ariel Gertzenstein
a2d8706ca8 DO NOT MERGE Tear down PAN if we can't successfully complete a DHCP request
after establishing a PANU connection.

http://b/13731957

Change-Id: I0c808d5196c66783b52942ba7b7212bdce9f1c07
2014-04-21 14:26:56 -04:00
Baligh Uddin
43ca5efaf0 Import translations. DO NOT MERGE
Change-Id: Ieb3e0b6128807111d32faa3681839723fd47e8f1
Auto-generated-cl: translation import
2014-04-21 11:19:33 -07:00
Kenny Root
89a086c16f am cf677a37: am e00c9185: am 41ec218e: am 6888bee5: am 5a0cc789: am 2ed5f771: am 47231936: am 02bc4b04: am 4a62a6dc: am 451ed5f0: am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
* commit 'cf677a37fb4560058fe29ebcac97f2c02bd55064':
  Use hidden API to validate APK chains
2014-04-18 23:05:30 +00:00
Kenny Root
cf677a37fb am e00c9185: am 41ec218e: am 6888bee5: am 5a0cc789: am 2ed5f771: am 47231936: am 02bc4b04: am 4a62a6dc: am 451ed5f0: am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
* commit 'e00c9185262c675f1680920c258413299995042a':
  Use hidden API to validate APK chains
2014-04-18 23:00:37 +00:00
Kenny Root
e00c918526 am 41ec218e: am 6888bee5: am 5a0cc789: am 2ed5f771: am 47231936: am 02bc4b04: am 4a62a6dc: am 451ed5f0: am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
* commit '41ec218e5f92904fe99c74bc35b9f5e4003c777a':
  Use hidden API to validate APK chains
2014-04-18 22:56:26 +00:00
Kenny Root
41ec218e5f am 6888bee5: am 5a0cc789: am 2ed5f771: am 47231936: am 02bc4b04: am 4a62a6dc: am 451ed5f0: am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
* commit '6888bee598b8c88f7a93ef2da06dd5659cc92dc6':
  Use hidden API to validate APK chains
2014-04-18 22:50:12 +00:00