Commit Graph

52534 Commits

Author SHA1 Message Date
Benjamin Franz
469dd58bae Align the behaviour of different lock task modes
Currently lock task modes started by the activity flag
android:lockTaskMode behave differently from those started using
startLockTask(). With those changes lock tasks initiated by non-priv
apps cannot finish without calling into stopLockTask. Revoking the
whitelisting on a locked task will also kill that task, independently
of the way the lock task mode was started.

Bug: 21608206
Change-Id: I841abf1103855e2d7218a4a8ca9b43c105630dc9
2015-06-09 17:17:34 +01:00
Abodunrinwa Toki
7d3b8833df Merge "Fix ActionMode.snooze API" into mnc-dev 2015-06-08 11:36:19 +00:00
Martijn Coenen
6280481af6 Merge "Remove NFC CardEmulation dynamic resource APIs." into mnc-dev 2015-06-08 08:05:14 +00:00
Seigo Nonaka
e937216c33 Catch BadTokenException and continue in clearInsetofPreviousIme.
This is a follow up CL for Ib04967f39b2529251e4835c42e9f99dba2cf43f2.
As well explained in the I2c21573cf972145ab08e66604cdb9344139a3f31,
the race condition here cannot be avoided without an unacceptable
performance penalty.  For now, we follow the same way.

Bug: 21600287
Change-Id: I0ffdf8bf7e8a53cf8aba1339024b32da65d4f32d
2015-06-08 12:47:25 +09:00
Jae Seo
683e3cfef1 Merge "MediaController: Keep the controller when touch exploration is enabled" into mnc-dev 2015-06-06 05:06:07 +00:00
Adam Skory
e76e7014c7 Don't forget to parcel mIsAppProvidedIntent
If you forget to parcel it like I did, it's
not going to do you much good.

Change-Id: I85191594e7ffab2c36aeed317932b126da288bdf
2015-06-05 19:08:01 -06:00
Adam Skory
a28863e769 Merge "Record provision of custom Intents in AssistContent" into mnc-dev 2015-06-06 01:01:00 +00:00
Adam Skory
cd70c64f50 Record provision of custom Intents in AssistContent
Simplifies behavior wrt automatically setting the
web URI for ACTION_VIEW Intents, by not doing so
for custom Intents.

Adds a boolean isAppProvidedIntent() as a signal for
recepients of the AssistContent that a custom Intent
was provided. Custom Intents are more likely to be
relevant.

Change-Id: Ibe4bfa040eba904411b9820ab4ddfcf509413829
2015-06-05 18:55:29 -06:00
Eino-Ville Talvala
76233f068b Merge "Camera2: Legacy: Do not remap EACCES error code to PERMISSION_DENIED" into mnc-dev 2015-06-06 00:40:16 +00:00
Jae Seo
63d37d9f16 MediaController: Keep the controller when touch exploration is enabled
Also added missing final and @Override keywords

Bug: 17199815
Change-Id: If96554e36799557a2d81767f287aeb446e4a1983
2015-06-05 17:27:30 -07:00
Zhijun He
d3bc26a853 Merge "Camera2: add missing HFR implementation" into mnc-dev 2015-06-06 00:06:46 +00:00
Ruben Brunk
8f955f89c2 Merge "Add UI for camera + flashlight battery reporting." into mnc-dev 2015-06-06 00:04:24 +00:00
James Cook
74f3d39671 Merge "Allow different visual and voice assist prompts" into mnc-dev 2015-06-05 23:49:59 +00:00
Stefan Kuhne
5c6c06bf18 Merge "Adding am send-trim-memory command" into mnc-dev 2015-06-05 23:37:15 +00:00
James Cook
6cf397508e Allow different visual and voice assist prompts
* Introduce VoiceInteractor.Prompt, holding multiple voice prompts
("What genre?", "What genre of music?", "What genre of music, for
example classical?") as well as a different visual prompt to show
on screen ("Choose genre").
* Migrate framework voice interactor code from a CharSequence prompt
to Prompt.

Bug: 21024958
Change-Id: Ib595fbdb2801cc558085e9b8366d619ff1d4d656
2015-06-05 16:36:22 -07:00
Adam Lesinski
8e518c81ea Merge "Update docs to reflect correct time units" into mnc-dev 2015-06-05 23:31:28 +00:00
Stefan Kuhne
16045c24fe Adding am send-trim-memory command
This patch adds a send-trim-memory command to the ActivityManager to allow
for better debugging&testing.

The command is
adb shell am send-trim-memory [--user <USER_ID>] <PROCESS> <LEVEL>
whereas LEVEL can be one of the following:
[HIDDEN|RUNNING_MODERATE|BACKGROUND|RUNNING_LOW|MODERATE|
 RUNNING_CRITICAL|COMPLETE]

Bug: 21633189
Change-Id: I7a41ce02c3c9043ffd3e5aaa791f7b7306a9de49
2015-06-05 16:30:29 -07:00
Zhijun He
d24e49bba8 Camera2: add missing HFR implementation
Bug: 21442271
Change-Id: I08c0a5b75ccb0f737013026511cfe3bf9e15c744
2015-06-05 14:55:04 -07:00
Wei Wang
a73c8b6fbf Merge "add gps gid to system_server" into mnc-dev 2015-06-05 21:34:11 +00:00
Kevin Tang
c6432e5c72 add gps gid to system_server
system_server hosts gps service, it should pocess gps
gid, so it can communicate with native gps daemons.

Change-Id: I59d7e99ec996891b19fa15a3ed66e055e6bccad8
2015-06-05 14:18:49 -07:00
Adam Powell
cedc7b3ba4 Merge "Use real rounding in ImageView bounds configuration" into mnc-dev 2015-06-05 20:07:07 +00:00
Adam Lesinski
7b83b0c75c Update docs to reflect correct time units
Change-Id: Id2757e45e989b148671cf83d51011984e07cd017
2015-06-05 12:59:36 -07:00
Alan Viverette
a06b41b06e Merge "Avoid NPE when drawable fails to load" into mnc-dev 2015-06-05 17:20:41 +00:00
Alan Viverette
42cc892be1 Merge "Account for margins in ScrollView onMeasure() when filling viewport" into mnc-dev 2015-06-05 17:18:47 +00:00
Alan Viverette
0f1c95edf8 Avoid NPE when drawable fails to load
Bug: 17760671
Change-Id: I99364e915e318b3e49fc758811784939a937de7c
2015-06-05 10:17:21 -07:00
Clara Bayarri
3e85c1ed0c Merge "Fix Select All should not be shown when everything is already selected" into mnc-dev 2015-06-05 16:19:31 +00:00
Adam Powell
14d1f1383f Use real rounding in ImageView bounds configuration
While a useful tactic in previous years, the (int) (float + 0.5f)
trick is inaccurate in some cases. Tradeoffs have changed; do the real
thing now.

Bug 20145160

Change-Id: I8af31bcb1945dc113fd36e094f5970ebd4ec0304
2015-06-05 08:51:45 -07:00
Mady Mellor
0f2f9f7a51 Merge "Stylus scale - API review feedback" into mnc-dev 2015-06-05 15:50:52 +00:00
Chet Haase
e790c97787 Hide View.getBackgroundColor() prior to removal
Issue #21572678  API Review: android.view.View.getBackgroundColor()

Change-Id: Ia4fa9e207db3af6e076581bf23747eba6e56bb69
2015-06-05 14:41:51 +00:00
Zoltan Szatmary-Ban
c92550e4b4 Merge "Replace renamed reference to NetworkStats in javadoc" into mnc-dev 2015-06-05 09:59:02 +00:00
Martijn Coenen
a2344eac37 Remove NFC CardEmulation dynamic resource APIs.
No longer needed.

Bug: 21343778
Change-Id: I5188c4bc819146861d346f3f4339f002b7173027
2015-06-05 10:45:50 +02:00
Zhijun He
16ed7e70c8 Merge "Camera2: fix doc build" into mnc-dev 2015-06-05 03:33:59 +00:00
Zhijun He
39d1461cf1 Camera2: fix doc build
Bug: 21645842
Change-Id: Ibd4ce455d9906da858b98f17fd7859016c1730c3
2015-06-04 20:21:23 -07:00
Abodunrinwa Toki
4741f6a4c7 Merge "TextView: Make sure the contentRect is within visibile bounds." into mnc-dev 2015-06-05 03:08:09 +00:00
Johnson Hsieh
997f3ccad3 Merge "Fix build: documentation error in AlarmClock.java." into mnc-dev 2015-06-05 02:58:42 +00:00
Johnson Hsieh
bcc1ff6726 Fix build: documentation error in AlarmClock.java.
Change-Id: I3f64df1857c516d4c6a4ed56094a27f489eddef3
2015-06-04 19:51:52 -07:00
Abodunrinwa Toki
9e211282d3 Fix ActionMode.snooze API
Bug: 21572677
Change-Id: If9fdb8ace3773b983418b0148082712644fd1fa5
2015-06-05 03:35:15 +01:00
Filip Gruszczynski
43c4cd1c82 am 93634166: am d88e4d50: Merge "ActivityView: set surface on a background thread." into cw-d-mr1-dev
* commit '93634166c8c78bdeccf045c62a0f601dceed74e3':
  ActivityView: set surface on a background thread.
2015-06-05 02:18:35 +00:00
Clara Bayarri
01243ac57e Fix Toolbar is not refreshed after Select All
Bug: 21361248
Change-Id: Iab913bd610c208e5881d3d0eb5574efdf9eb5d92
2015-06-05 03:03:31 +01:00
Clara Bayarri
3b69fd81df Fix Select All should not be shown when everything is already selected
Condition Select All on whether the full text is already selected,
and add/remove this item when needed on ActionMode invalidation.

Bug: 21608943
Change-Id: Iad5f8a77a03b98024f7dcf355b2f7f0d1338b94a
2015-06-05 02:53:30 +01:00
Zhijun He
0ccc940a0d Merge "Camera2: implement high speed video APIs" into mnc-dev 2015-06-05 01:07:52 +00:00
Mady Mellor
d9ff4df850 Stylus scale - API review feedback
Fixed typo and javadoc error.

Bug: 21572278
Change-Id: Ia710971f1f4a97df7ed8e898d972f617465900b9
2015-06-04 18:03:49 -07:00
Doris Liu
5de55868a9 Merge "Make ListView's EdgeEffect respect the clipToPadding flag" into mnc-dev 2015-06-05 00:57:32 +00:00
Doris Liu
f36c061909 Make ListView's EdgeEffect respect the clipToPadding flag
This CL sets the position of EdgeEffect based on whether
clipToPadding is enabled. When enabled, the EdgeEffect will be
bounded to the padding. Otherwise, it will be drawn at the view's
bounds.

Bug: 21595866
Change-Id: I3968e5b8d3a75ce2d7607e2037bc372024694d5b
2015-06-04 17:50:47 -07:00
Clara Bayarri
c1f28bc97d Merge "Separate the SelectionActionMode into Insertion and Selection." into mnc-dev 2015-06-05 00:40:43 +00:00
Wale Ogunwale
733f147401 Merge "Always have a handler for PendingIntents sent in the system process" into mnc-dev 2015-06-05 00:23:28 +00:00
Abodunrinwa Toki
601523ad00 TextView: Make sure the contentRect is within visibile bounds.
Bug: 21620604
Change-Id: Idd0d891e423316b2ebacf883fd3cbfff9ef69743
2015-06-05 00:42:06 +01:00
Ruben Brunk
5b1308f02d Add UI for camera + flashlight battery reporting.
Bug: 11694505
Change-Id: Ieefa78a1d641851f4141fe666dae7b9fde394f09
2015-06-04 16:41:11 -07:00
Johnson Hsieh
6c72febd35 Merge "Updates AlarmClock intent API." into mnc-dev 2015-06-04 23:34:50 +00:00
Eino-Ville Talvala
db70a97853 Camera2: Legacy: Do not remap EACCES error code to PERMISSION_DENIED
This remap causes non-Legacy and Legacy devices to have different
error behavior when the camera permission is removed from a pre-M
application.

Without the remap, both routes map to CameraAccessException with
code CAMERA_DISABLED.

Bug: 21604925
Change-Id: I4ab18dca961cc7cedaccba0531253c9c4ef1d60e
2015-06-04 16:15:35 -07:00