3079 Commits

Author SHA1 Message Date
Alan Viverette
4a357cd2e5 Replace usages of deprecated Resources.getColor() and getColorStateList()
Change-Id: I8f64fe6c4c44a92ff6d07250223ba590a1d691b0
2015-03-18 18:37:18 -07:00
Chris Craik
43c410eaac Merge "Remove HardwareCanvas" 2015-03-18 21:36:56 +00:00
Dianne Hackborn
27eac1d58f Add ability to get a screenshot for assist.
New flag you pass in to startSession() to say you want it,
new callback on VoiceInteractionSession to receive it.

Change-Id: I61fdcfdee41a60d46036a2ef16681a9b4181115a
2015-03-17 16:45:51 -07:00
Dianne Hackborn
3d07c94c39 Add new voice request for picking from a list.
Also add API for voice interaction service to control
whether the system should hold a wake lock while it is
working with an activity (and actually *do* hold a wake
lock while doing so, duh!).

And while in there, clean up the launching wake lock to
correctly give blame to the app that is launching.

Change-Id: I7cc4d566b80f59fe0a9ac51ae9bbb7188a01f433
2015-03-16 11:29:12 -07:00
Dianne Hackborn
a83ce1dd2a More work on collecting assist data.
Optimize parceling of AssistData (which is now renamed to
AssistStructure) by pooling duplicated class name strings.

Change text associated with a view node to a CharSequence,
so styling information comes along.

Include global text attributes -- size, colors, etc.

Introduce a new AssistContent structure, which allows us
to propagate information about the intent and data the
activity is looking at.  This further allows us to propagate
permission grants, so the assistant can dig in to that data.
The default implementation propagates the base intent of an
activity, so if for example you bring up the assistant while
doing a share the assistant itself has the same information
and access that was given to the share activity (so it could
for example share it in another way if it wanted to).

Did some optimization of loading PersistableBundle from xml,
to avoid duplicating hash maps and such.

Changed how we dispatch ACTION_ASSIST to no longer include
the more detailed AssistStructure (and new AssistContent)
data when launching; now the example code that intercepts
that needs to be sure to ask for assist data when it starts
its session.  This is more like it will finally be, and allows
us to get to the UI more quickly.

Change-Id: I88420a55761bf48d34ce3013e81bd96a0e087637
2015-03-12 17:07:51 -07:00
Chris Craik
f6829a0a61 Remove HardwareCanvas
Change-Id: I239646a7f00f09d3f76fe6b6162eed86bc0d6e77
2015-03-10 14:56:11 -07:00
Adam Lesinski
978a1ed5aa Add generic "INTERACTION" event type to UsageStatsManager
This will allow for updating a package's last time used
property for packages that are interacted in ways other than
launching their activities (interacting with notifications, etc.)

Change-Id: Ic6f9519f46fa04abd37ea6fc9475bcd9ea721003
2015-03-02 12:54:14 -08:00
Dianne Hackborn
ffeecb1bfb Rework voice interaction session lifecycle.
We now have a formal concept of the session being shown and
hidden, with it being able to continue running while hidden
as long as there is enough RAM.

This changes the flow that a VoiceInteractionSession will
see: onCreate() is when it is first created, onCreateContentView()
is when its UI first needs to be built, onShow() is called each
time it needs to be shown and has the arguments given when the
show request was made (which has been renamed from startSession to
showSession), and then onHide() will be called when the UI is
no longer shown.

The methods show() and hide() now allow a VoiceInteractionSession
subclass to control when it is shown and hidden, working with the
shown state being maintained by the system.

Change-Id: Ic4a430ec7e8bf76a5441fd0425e2932806170fcc
2015-02-25 17:36:17 -08:00
Chris Craik
36a35e366a Fix layer shader to store layer pointer
bug:19419672

Change-Id: I4277348ceab41fbf45a107a8b21f64e2b4af23e0
2015-02-18 17:47:21 +00:00
Dianne Hackborn
ae6688b096 Update voice interaction layer for new UI design.
Can switch from a pure overlay at the top of the screen,
to interactive mode with the voice UI drawing at the bottom
and pushing its target activity up like an IME.

Add mechanism to get assist data to the voice interaction UI.

Add some basic visualization of the assist data, outlining
where on the screen we have text.

Add a test ACTION_ASSIST handler, which can propagate the
assist data it gets to the voice interaction session so
you can see what kind of data we are getting from different
apps.

Change-Id: I18312fe1601d7926d1fb96a817638d60f6263771
2015-02-13 11:27:57 -08:00
Narayan Kamath
3bdd327f85 Move apache specific portions of android.net.http to external/apache-http.
We continue to compile external/apache-http into ext.jar. This contains
a few changes apart fom the classes moving around :

- Makefile changes to build docs and api-stubs for now. A future change
  will revert these changes and remove these classes from stubs and
  docs.
- Hardcode event IDs in legacyerrorstrings to avoid a dependency between
  the frameworks and apache. These strings are on their way out and will
  never change anyway.
- Remove imports due to {@link} tags and use {@code} instead.
- Remove an accidental(?) dependency on apache commons code that's a
  part of apache-http.

bug: 18027885

Change-Id: I51cd038d846ec7d02c283a4541b10a6a9cf62ecf
2015-02-12 11:15:49 +00:00
Craig Mautner
83162a9027 Eliminate groupId and add task to AppWindowToken
Simplifies access by eliminating indirect referencing.

Fixes bug 18088522 item #15.

Change-Id: I9049192a7f3e1028d60c4f2d4d4a0d4aad590aa4
2015-01-27 13:56:20 -08:00
Craig Mautner
8667eff6b8 Merge "Remove unused method moveTaskToBack." 2015-01-16 01:54:59 +00:00
Craig Mautner
428ecf2966 Remove unused method moveTaskToBack.
Everyone uses moveActivityTaskToBack() instead.

Fixes item #3 of bug 18088522.

Change-Id: I16028335fe1eef8a2aa47804f46536e395a16d8c
2015-01-15 17:20:40 -08:00
Adam Lesinski
97611881e1 am 5c61dfc2: am e488ce86: am 94e30215: Merge "AAPT: Handle all old unversioned attribute usage" into lmp-mr1-dev
* commit '5c61dfc25fed75a436dc32b0fb18854bde0c4cea':
  AAPT: Handle all old unversioned attribute usage
2015-01-15 03:44:43 +00:00
Adam Lesinski
5c61dfc25f am e488ce86: am 94e30215: Merge "AAPT: Handle all old unversioned attribute usage" into lmp-mr1-dev
* commit 'e488ce8668538b45c586eba21f5bca288d749686':
  AAPT: Handle all old unversioned attribute usage
2015-01-14 20:47:47 +00:00
Adam Lesinski
28994d8d18 AAPT: Handle all old unversioned attribute usage
All references to attributes defined in pre-LOLLIPOP_MR1 SDK
are moved to version qualified resource entries.

Bug:18221682
Change-Id: Ifd739530ebcf99e6bc7ddb3f10bc5e05f0726e62
2015-01-14 12:02:15 -08:00
ztenghui
054a17caaa Limit the scope of clip path to the group, not global
http://b/18758765

Change-Id: I899401a5fcbccd0421687bd5cf671f7751092195
2015-01-09 14:53:47 -08:00
ztenghui
825096df5f am 84c7ef8a: am d8ce65c9: Merge "Remove 2 sub-tests from the internal test app." into lmp-mr1-dev
automerge: 8a23b38

* commit '8a23b3820d6f4d08b6b6ca3ffb0f85bd829f5e97':
  Remove 2 sub-tests from the internal test app.
2014-12-16 17:58:27 +00:00
ztenghui
8a23b3820d am 84c7ef8a: am d8ce65c9: Merge "Remove 2 sub-tests from the internal test app." into lmp-mr1-dev
* commit '84c7ef8a28d321e190d4d3f9a0c91ee5ae41bf9a':
  Remove 2 sub-tests from the internal test app.
2014-12-16 17:56:51 +00:00
ztenghui
d8ce65c9b5 Merge "Remove 2 sub-tests from the internal test app." into lmp-mr1-dev 2014-12-16 17:45:02 +00:00
ztenghui
d76da520ed Remove 2 sub-tests from the internal test app.
b/18171696

Change-Id: I4c4e96c2d0a8e664d81abb300a8f56c5bbb358cd
2014-12-15 15:47:41 -08:00
Guang Zhu
61e0abc2f5 am d8ca1208: am 07bba9ab: Merge "shell based UI Automator source move" into lmp-mr1-dev
automerge: 9954a44

* commit '9954a44896937d8f7fd7aebbe276c570101d4c77':
  shell based UI Automator source move
2014-12-14 04:09:14 +00:00
Guang Zhu
9954a44896 am d8ca1208: am 07bba9ab: Merge "shell based UI Automator source move" into lmp-mr1-dev
* commit 'd8ca1208b3ee76e45e45e47d5806c398442a55a3':
  shell based UI Automator source move
2014-12-14 04:04:26 +00:00
Guang Zhu
18b892c723 shell based UI Automator source move
frameworks/testing/uiautomator -> frameworks/base/cmds/uiautomator
  (samples, utils sub folders exlcuded)
frameworks/testing/uiautomator/utils -> frameworks/base/tests/utils

no source files changed, only one line makefile update (for
UI Automator API check)

Bug: 18708851
Change-Id: I396bd386d3d55a52df18af183685daf80caa9f73
2014-12-12 17:31:38 -08:00
Narayan Kamath
5e41c66881 am 37da3f0d: am 7bd28de5: Merge "Remove some crufty "core" tests."
automerge: c1c4edf

* commit 'c1c4edf129d984be20aa79af2d5d6f8d881e2f26':
  Remove some crufty "core" tests.
2014-12-11 10:37:44 +00:00
Narayan Kamath
c1c4edf129 am 37da3f0d: am 7bd28de5: Merge "Remove some crufty "core" tests."
* commit '37da3f0d28815a5dfbea929fc173d89cb62bd318':
  Remove some crufty "core" tests.
2014-12-11 10:35:19 +00:00
Narayan Kamath
d627c6761f Remove some crufty "core" tests.
nobody runs these, and these things are well tested elsewhere
and a part of CTS.

Change-Id: I1ec00f2a085fc82f902f538ace692ac989ca03df
2014-12-10 19:49:59 +00:00
John Reck
af878b91f9 am 389baa39: am 7d74cb6c: am 14c43689: Merge "Fix issue with RNA destruction mid-animation" into lmp-mr1-dev
* commit '389baa395125d5ae5aac3b9d2f98457dde09da26':
  Fix issue with RNA destruction mid-animation
2014-12-09 23:49:22 +00:00
Dmitriy Ivanov
39191142ce am 5a785719: am 4fed05b4: am f0070999: Merge "Remove unsed check for simulator"
* commit '5a785719492519afe54eb2dbde3094253826d695':
  Remove unsed check for simulator
2014-12-09 23:44:57 +00:00
John Reck
389baa3951 am 7d74cb6c: am 14c43689: Merge "Fix issue with RNA destruction mid-animation" into lmp-mr1-dev
* commit '7d74cb6c6139d42aad65fe1466ab4c5f8e029539':
  Fix issue with RNA destruction mid-animation
2014-12-09 22:18:27 +00:00
John Reck
c47c98be04 Fix issue with RNA destruction mid-animation
Bug: 18521508

Fix an issue where an RNA's native object was destroyed
before the java-side object was started

Change-Id: I487fb476e0ecdf7000515f4f7320e8cfbc50a52b
2014-12-09 12:35:12 -08:00
Dmitriy Ivanov
5a78571949 am 4fed05b4: am f0070999: Merge "Remove unsed check for simulator"
* commit '4fed05b4e679276050b5eaad51ce96848ddc561e':
  Remove unsed check for simulator
2014-12-09 14:40:56 +00:00
Przemyslaw Szczepaniak
4b73867a12 Add UtteranceProgressListener#onStop callback
New UtteranceProgressListener callback that allows
to detect a call to TextToSpeech#stop() (or QUEUE_FLUSH usage)
from the same client, or a QUEUE_DESTROY usage from any other
client (Talkback uses it to preempt other users of TextToSpeech
queue). This change is required for seamless Books read aloud
feature+Talkback usage.

+ Fixes for broken tests/TtsTests

Bug: 17901521

Change-Id: I30d2f297bb7c8d05cbeb16f63e85c1be0cca5c84
2014-12-09 11:06:06 +00:00
Dianne Hackborn
e68249c0e1 am 7039f6b4: am 7ca6cc75: am 7194bf4d: Merge "Add test for isolated services." into lmp-mr1-dev
* commit '7039f6b423d2795eea6bebc932c9cb0d8422de88':
  Add test for isolated services.
2014-12-09 00:16:31 +00:00
Dianne Hackborn
7039f6b423 am 7ca6cc75: am 7194bf4d: Merge "Add test for isolated services." into lmp-mr1-dev
* commit '7ca6cc75e32437594bfa53c6f2ca14156c44eb17':
  Add test for isolated services.
2014-12-08 19:11:51 +00:00
Dmitriy Ivanov
4b58cda367 Remove unsed check for simulator
Change-Id: I46f134d960db330e7b6e7dbfebc84d602d3a3466
2014-12-05 14:08:04 -08:00
Dianne Hackborn
875e464e36 Add test for isolated services.
Change-Id: Ibcbc4e766400acb8cf0385f922db6ca448a652a3
2014-12-01 16:22:14 -08:00
ztenghui
2086293e60 am bb97b311: am 21bc2e3e: am cb721bf6: Merge "Supporrt tapas build for vector tests" into lmp-mr1-dev
* commit 'bb97b311ea46d22864f40578d9ef37ccf0a28274':
  Supporrt tapas build for vector tests
2014-11-22 00:00:06 +00:00
ztenghui
bb97b311ea am 21bc2e3e: am cb721bf6: Merge "Supporrt tapas build for vector tests" into lmp-mr1-dev
* commit '21bc2e3e1e30e34d661e3c3cf961eb058ca3834e':
  Supporrt tapas build for vector tests
2014-11-21 23:07:08 +00:00
ztenghui
996f22f4df Supporrt tapas build for vector tests
Such that UX team has less pain on building the VD / AVD assets.
This also requires removing internal API dependence in the test.

To build the VectorDrawableTest with prebuilt SDK.
<root dir>/tapas VectorDrawableTest
<root dir>/make -j64 showcommand
Then later for incremental build.
<root dir>/mmm ./frameworks/base/tests/VectorDrawableTest/ -j20

b/18260896

Change-Id: Id559074df78d7c2a5c529c545834da23986bc15f
2014-11-21 19:40:34 +00:00
ztenghui
5287c18880 am 3458abd6: am 002bc810: Merge "ASLD: ASLD\'s XML reversible flag can turn off the reverse behavior now." into lmp-mr1-dev automerge: e9dbfe5
* commit '3458abd6a7d0709f0360c1c18cce036bb7bc4299':
  ASLD: ASLD's XML reversible flag can turn off the reverse behavior now.
2014-11-21 03:11:39 +00:00
ztenghui
3458abd6a7 am 002bc810: Merge "ASLD: ASLD\'s XML reversible flag can turn off the reverse behavior now." into lmp-mr1-dev
automerge: e9dbfe5

* commit 'e9dbfe5afd5cd350f06f078775a40e8df4e69ce6':
  ASLD: ASLD's XML reversible flag can turn off the reverse behavior now.
2014-11-21 02:53:38 +00:00
Dianne Hackborn
3b35226300 am 42d9bf66: am a6d2789c: Merge "Add new empty app test entry points." into lmp-mr1-dev
automerge: 5b01f08

* commit '5b01f0894dacec272ce02fe07e879369ecd2ed93':
  Add new empty app test entry points.
2014-11-21 01:53:27 +00:00
Dianne Hackborn
5b01f0894d am 42d9bf66: am a6d2789c: Merge "Add new empty app test entry points." into lmp-mr1-dev
* commit '42d9bf665598ae316bfae3fd28cbb5c8f2c95824':
  Add new empty app test entry points.
2014-11-21 00:43:57 +00:00
ztenghui
002bc81088 Merge "ASLD: ASLD's XML reversible flag can turn off the reverse behavior now." into lmp-mr1-dev 2014-11-20 23:11:38 +00:00
ztenghui
5b84eace6c ASLD: ASLD's XML reversible flag can turn off the reverse behavior now.
Previously, the android:reversible flag behaves like a suggestion.
Now it is used to enforce no reverse when set to false. In this way, user can
safely setup one direction animation only.
When set to true, but AVD can't reverse , then it will show a warning.

At the same time, update the tests to show different cases, including
AnimationDrawable.

b/18413484

Change-Id: I5552c49dcbd76b0724b4d5593bce8388b27bd905
2014-11-20 14:41:33 -08:00
Dianne Hackborn
4f0e4a9ada Add new empty app test entry points.
Change-Id: Ib899c95de6b7bb936d2114e86bec4c5aef5f7eda
2014-11-19 14:21:07 -08:00
ztenghui
2f96e233de am bac3f5a6: am 9f671553: am 475569e9: Merge "Fix the starting pen\'s position when a path close." into lmp-mr1-dev
* commit 'bac3f5a6f055876d8892ff27fb8db7355a188a68':
  Fix the starting pen's position when a path close.
2014-11-14 19:17:00 +00:00
ztenghui
bac3f5a6f0 am 9f671553: am 475569e9: Merge "Fix the starting pen\'s position when a path close." into lmp-mr1-dev
* commit '9f67155332e49686ef622b096b715ee62845d401':
  Fix the starting pen's position when a path close.
2014-11-14 00:03:16 +00:00