Commit Graph

57024 Commits

Author SHA1 Message Date
Trevor Johns
682c24e228 Resolve merge conflicts of a5060ee to nyc-dev
This undoes the automerger skip which occured in
commit e740c84dc3 and
replays it as a standard (NOT -s ours) merge.

Change-Id: If5a47be26f73d6a0735c425cd66310a3e2a89086
2016-04-19 02:03:59 -07:00
TreeHugger Robot
d92e5c314e Merge "Add implemention for isSameTrustConfiguration" into nyc-dev 2016-04-12 21:28:52 +00:00
Alan Viverette
20f2b38ea4 Merge "Include current selection mode in TimePicker event text" into nyc-dev 2016-04-12 21:18:15 +00:00
Sunny Goyal
1fe7dfa66a Merge "Changing LauncherApps to resolve activity by component name" into nyc-dev 2016-04-12 20:55:32 +00:00
Felipe Leme
93c442e44f Merge "Make getStorageVolume(File file) public." into nyc-dev 2016-04-12 20:44:06 +00:00
TreeHugger Robot
4db2f1f602 Merge "Notification MessagingStyle: Add handset views" into nyc-dev 2016-04-12 20:12:41 +00:00
Chad Brubaker
5116ac0d22 Add implemention for isSameTrustConfiguration
Bug: 27672565
Change-Id: Id5291a4a5f2ca75fdf84db4d51363735f1a76845
2016-04-12 13:04:43 -07:00
Shreyas Basarge
997743d29e Merge "Documentation for flex field" into nyc-dev 2016-04-12 19:35:21 +00:00
Adam Powell
c4bf6e43d1 Merge "Dispatch View#onVisibilityAggregated to views becoming invisible" into nyc-dev 2016-04-12 19:32:10 +00:00
Adam Lesinski
daeee0b5d7 Merge "BatteryStats: Don't log BluetoothScanTimer when it doesn't exist" into nyc-dev 2016-04-12 19:26:48 +00:00
TreeHugger Robot
e341ddfa05 Merge "Document when usesCleartextTraffic is ignored." into nyc-dev 2016-04-12 19:18:15 +00:00
Adam Lesinski
ba9d893976 BatteryStats: Don't log BluetoothScanTimer when it doesn't exist
Bug:27998591
Change-Id: I80ca8a2353141c16595b4be0b0aed195f40e366a
2016-04-12 12:06:03 -07:00
Alan Viverette
b0f5461eec Include current selection mode in TimePicker event text
Bug: 23118708
Change-Id: I709f28674c7a959cdfb279f8643a07aa562d8fef
2016-04-12 14:58:09 -04:00
Adrian Roos
c1a80b08f0 Notification MessagingStyle: Add handset views
Bug: 27250207
Change-Id: I499cf2beaeeb34f0f189815fc0911f3b8954bd50
2016-04-12 11:52:49 -07:00
Adam Powell
fa58a8daa6 Dispatch View#onVisibilityAggregated to views becoming invisible
When a view becomes newly invisible/gone via setFlags, its visibility
state will have already changed by the time we
dispatchVisibilityAggregated. Since we already do visibility filtering
in the ViewGroup override when we traverse to child views, permit the
normal View implementation to dispatch onVisibilityAggregated if we're
not visible and dispatching visibility false.

Bug 28123146

Change-Id: I528dffe95d2057ef938508b9fb4219c5338b060c
2016-04-12 11:18:57 -07:00
Chad Brubaker
2df5ba777a Document when usesCleartextTraffic is ignored.
In N and above when using an Android Network Security Config the
cleartext configuration from that is used and
android:usesCleartextTraffic in the manifest is ignored.

Bug:27596429
Change-Id: I50ec765cead6cfd6bbaec585723f99d72e0fd945
2016-04-12 11:07:51 -07:00
Alexander Hills
e3f3cb1048 Merge "Fixes name of intent launch flag for Action Extender" into nyc-dev 2016-04-12 17:10:19 +00:00
Alan Viverette
0f0ffb0450 Merge "Default font scale is 1 if not otherwise specified" into nyc-dev 2016-04-12 16:29:28 +00:00
Alex Hills
4ec3ff4f8f Fixes name of intent launch flag for Action Extender
Changes the name from set/getHintContentIntentLaunchesActivity
to set/getLaunchesActivty

Change-Id: I8ef879ae82cc360163fcd689eb5fad0d2b9d7db0
2016-04-12 11:44:36 -04:00
Mark Renouf
91eb2651a0 Customizes input extract edit view for Wear
Provides an alternate presentation of the extract edit area
of an input method window, designed for sub 250dp width screens.

An icon is used on a round material style button in place of a text
action, providing more horizontal space for the editing area.

BUG: 28098677
(cherry picked from commit fd71a6a5d99bad5d3ab32edc328fb5b026b66215)

Change-Id: I0e559d17f78d1a48b37979a49e11ae1aad7503f4
2016-04-12 15:05:13 +00:00
Alan Viverette
04fd67cb8e Default font scale is 1 if not otherwise specified
Prevents the previous user's font scale from being used as the default.

Bug: 27187556
Change-Id: I51a66ddf2d6272bd74d433158db1c8cc54b45b6d
2016-04-12 10:54:04 -04:00
John Reck
d2eec0efb2 Merge "Framework-side of SurfaceView#getBitmap" into nyc-dev 2016-04-12 14:36:11 +00:00
Oleksandr Peletskyi
26e3385508 Merge "Fixed cross profile usage of TextClock." into nyc-dev 2016-04-12 11:33:19 +00:00
Shreyas Basarge
9e6d588c93 Documentation for flex field
Add documentation for getFlexMillis in JobInfo.

Bug: 27530396
Change-Id: I98319cd8ceb0ecd56ab3000bdd31d8bca1bacc3f
2016-04-12 11:04:53 +01:00
Felipe Leme
c250e45eda Make getStorageVolume(File file) public.
BUG: 27951594
Change-Id: I354f6a29b3fa3374ea07bcbe14096e9673d282c5
2016-04-11 18:52:28 -07:00
Siyamed Sinir
7903aba3ca Fix Patterns.UCS_CHAR character class
Wrap Patterns.UCS_CHAR character class with brackets. Previously CL
Ie6df818dc4d33dfee6ee54432a2231cca51ec423 broke autoLink email and URL
patterns while excluding the empty spaces.

Bug: 28020781
Change-Id: Ieb7d09cb5e544c1e7cbc1a4d665b979c65e7e773
2016-04-11 18:45:29 -07:00
Siyamed Sinir
4b92594857 Merge "Exclude unicode space characters from autoLink URL patterns" into nyc-dev 2016-04-12 00:35:29 +00:00
Jeff Sharkey
01a1ad511e Merge "Fix notifications that are sent for USER_ALL." into nyc-dev 2016-04-11 23:19:07 +00:00
Jeff Sharkey
012bc7bb9f Fix notifications that are sent for USER_ALL.
Also avoid creating a heavy LoadedApk object which will be cached
around in the long-lived system process.

Bug: 28116427
Change-Id: I1a5fc43e6d559a09088636b2fe4b5c76f08d3413
2016-04-11 17:18:29 -06:00
Makoto Onuki
bc20320f7f Merge "ShortcutManager: First cut of CTS" into nyc-dev 2016-04-11 23:11:41 +00:00
Sunny Goyal
45d3e97748 Changing LauncherApps to resolve activity by component name
This makes the behavior of resolveActivity similar to isActivityEnabled.
Not that starting this activity may still fail due to other reasons.

Bug: 27549770
Change-Id: I924d7aa2305c64fd319ca1e38058f9f956c0c256
2016-04-11 16:02:27 -07:00
John Reck
10dd0585c1 Framework-side of SurfaceView#getBitmap
Bug: 27708453

Change-Id: Ie6fd7eca522d3e6549d8af587c975fd7e6053649
2016-04-11 16:00:22 -07:00
Adam Powell
e60b8f8970 Merge "Prevent duplicate loader onLoadFinished calls on config change" into nyc-dev 2016-04-11 22:57:47 +00:00
Makoto Onuki
5ba0d3e3a3 ShortcutManager: First cut of CTS
Bug 27548047

Change-Id: Idd7a768ea4fee44c2cf6e3bd473cea9e67f5f7cd
2016-04-11 14:48:44 -07:00
Robert Greenwalt
6e1e880f00 Merge "Add settings for SUW data control." into nyc-dev 2016-04-11 21:28:01 +00:00
Adam Powell
eba13dd07f Prevent duplicate loader onLoadFinished calls on config change
Loaders report entering the started state in two places, once from
their host callbacks and once when moving into their host fragment's
starting state. In the former, we will also deliver load results if
we're finishing a retained cycle.

In practice, the individual fragment start happens first which clears
the report-next-start flag, then the finishRetain step sees that flag
is cleared and dispatches the finished load results again. Change
reportStart to only call onLoadFinished if we are not finishing up a
retain step.

Bug 28074512

Change-Id: I85b848f7d7b239c8fac5aec8f0c91e4eea6bcebf
2016-04-11 14:26:58 -07:00
Greg Kaiser
7c0393abdf Merge "NanoApp: Make indentation consistent" into nyc-dev 2016-04-11 21:21:37 +00:00
John Reck
825fa4d5ae Merge "Revert "Make stopped state a first-class thing"" into nyc-dev 2016-04-11 20:54:36 +00:00
John Reck
eab3f2658a Revert "Make stopped state a first-class thing"
This reverts commit 945961f78a.

Change-Id: Iebc1d49fac33380233f8785fc39bec6c30a5e714
2016-04-11 20:49:28 +00:00
Greg Kaiser
1f3560e75e NanoApp: Make indentation consistent
Four spaces is our style standard.

Change-Id: I94f4493268e29b7de5d4fc0f5ef98637997b3957
2016-04-11 12:49:21 -07:00
Greg Kaiser
f4d380537a Merge "ContextHubManager: Avoid bad NanoApp objects" into nyc-dev 2016-04-11 17:23:48 +00:00
Makoto Onuki
390a81302f Merge "Add UserHandle to ShortcutInfo, and simplify LauncherApps APIs." into nyc-dev 2016-04-11 16:45:10 +00:00
Fyodor Kupolov
4c74334c44 Merge "Added getProfileIds method returning array of userIds" into nyc-dev 2016-04-11 16:40:55 +00:00
Chris Thornton
9e928c1f71 Merge "Support multiple Enrollment APKs" into nyc-dev 2016-04-11 16:40:43 +00:00
Yohei Yukawa
063fe652be Merge "Make additional IME Subtype ID persistent." into nyc-dev 2016-04-11 15:46:12 +00:00
Greg Kaiser
cb83bd04b7 ContextHubManager: Avoid bad NanoApp objects
We provide a preferred constructor for the user which will
always generate a serializable NanoApp object.  While we
still support the other path, we throw a specific exception
when trying to serialize a bad NanoApp object to ease
debugging.

Change-Id: I7ee610f0fce2f0dd489526e4819f66035281024b
2016-04-11 08:27:10 -07:00
Benjamin Franz
3f7fdaaa76 Merge "Revert "Throw security exception for non-parent aware APIs"" into nyc-dev 2016-04-11 14:32:49 +00:00
Benjamin Franz
a26c626564 Revert "Throw security exception for non-parent aware APIs"
This reverts commit bd7ae782ed.

Bug: 28107853

Change-Id: Ic286d9a181e96b8eb9826dab9ed297e0e4dfa6de
2016-04-11 12:43:17 +00:00
Oleksandr Peletskyi
5a33106d7e Fixed cross profile usage of TextClock.
Fixed crash of a widget that uses TextClock and belongs to a work
profile when is being added to the dash board.

BUG:27035203
Change-Id: I70c66cb792d159d2527050db820e7154784148a2
2016-04-11 14:07:28 +02:00
Yohei Yukawa
a8c81c1a80 Merge "Fix inefficient CursorAnchorInfo#hashCode()." into nyc-dev 2016-04-11 09:49:23 +00:00