Commit Graph

63473 Commits

Author SHA1 Message Date
Makoto Onuki
9d25ead98b Merge "ShortcutManager: Address API review feedback." into nyc-dev
am: 1d616f0

* commit '1d616f0d880d0a4109e811221f3c3ff2e016013b':
  ShortcutManager: Address API review feedback.

Change-Id: I83cf33d390ba695117b88b397667e378902f439e
2016-04-12 22:52:26 +00:00
Makoto Onuki
1d616f0d88 Merge "ShortcutManager: Address API review feedback." into nyc-dev 2016-04-12 22:34:17 +00:00
Joe Onorato
f35f061c50 Merge "Add some tests for procstats, and fix some bugs that the tests uncovered." into nyc-dev
am: 5dc3c67

* commit '5dc3c674a2635179d17e96af8fb248142e03b87e':
  Add some tests for procstats, and fix some bugs that the tests uncovered.

Change-Id: I53ee3334f58db4a0904370fc4f2f1b6b29365020
2016-04-12 22:22:52 +00:00
Chad Brubaker
f62489edd9 Merge "Add implemention for isSameTrustConfiguration" into nyc-dev
am: d92e5c3

* commit 'd92e5c314e1a3ffa0bc6daf43e4e9cec2521d217':
  Add implemention for isSameTrustConfiguration

Change-Id: Ic6552d34ce666cea087f40564d944c1249dcc687
2016-04-12 22:22:50 +00:00
Alan Viverette
8042045fdf Merge "Include current selection mode in TimePicker event text" into nyc-dev
am: 20f2b38

* commit '20f2b38ea4633446e9da23a86a29b40a59067af6':
  Include current selection mode in TimePicker event text

Change-Id: Ie06ee0564b207e4f83b8409d9d2174752fa3246f
2016-04-12 22:22:47 +00:00
Andreas Gampe
0c322abb25 Frameworks/base: Add no-thread marking to zygote
am: 1ef8aef

* commit '1ef8aef260c19236be023c429b41a46e7f5da8b0':
  Frameworks/base: Add no-thread marking to zygote

Change-Id: I8ac948e3c107324ce18e44bdff74fce1bd97fc6c
2016-04-12 22:22:43 +00:00
Sunny Goyal
59c30a01af Merge "Changing LauncherApps to resolve activity by component name" into nyc-dev
am: 1fe7dfa

* commit '1fe7dfa66aaf37045c62094438ab3db2ee5403c5':
  Changing LauncherApps to resolve activity by component name

Change-Id: I517285d5ca79af026080cc80e938e2134d98f14e
2016-04-12 22:22:34 +00:00
Felipe Leme
db95b32d7d Merge "Make getStorageVolume(File file) public." into nyc-dev
am: 93c442e

* commit '93c442e44f3aa6bd7a27ef74770aeeb2dfb4880d':
  Make getStorageVolume(File file) public.

Change-Id: Ib27ed0eb8538f997d01b1ef0541e5c6e5f181566
2016-04-12 22:22:22 +00:00
Adrian Roos
28d6762456 Merge "Notification MessagingStyle: Add handset views" into nyc-dev
am: 4db2f1f

* commit '4db2f1f6020a82012bcd3141a22bd59e0baed1d5':
  Notification MessagingStyle: Add handset views

Change-Id: Ib1971c6c1d8aa07ef586073bf2316f2b3b18bfab
2016-04-12 22:22:15 +00:00
Shreyas Basarge
8a71af509a Merge "Documentation for flex field" into nyc-dev
am: 997743d

* commit '997743d29e46ed034a0769e765a5ce83cd3f903a':
  Documentation for flex field

Change-Id: I6ef9763ec0c6e333ddae002e6dcf4a66d862464e
2016-04-12 22:21:00 +00:00
Adam Powell
c3e096953d Merge "Dispatch View#onVisibilityAggregated to views becoming invisible" into nyc-dev
am: c4bf6e4

* commit 'c4bf6e43d14ffe8d719227ddcc66e9b66dba005a':
  Dispatch View#onVisibilityAggregated to views becoming invisible

Change-Id: I2f97021a5bdc545b3c4cf516d93e5e4763eaec7d
2016-04-12 22:20:50 +00:00
Adam Lesinski
e44263c1fe Merge "BatteryStats: Don\'t log BluetoothScanTimer when it doesn\'t exist" into nyc-dev
am: daeee0b

* commit 'daeee0b5d70e2f97e7a8eebce181e092121b1809':
  BatteryStats: Don't log BluetoothScanTimer when it doesn't exist

Change-Id: I2497ab5496461933d37f75d5492bab151c240c7f
2016-04-12 22:20:40 +00:00
Chad Brubaker
2ac28363f3 Merge "Document when usesCleartextTraffic is ignored." into nyc-dev
am: e341ddf

* commit 'e341ddfa05e61d7ef937d6b3fd21a2bf4fa903fd':
  Document when usesCleartextTraffic is ignored.

Change-Id: I0e7534a0d58800704129a2f9a008347c471418df
2016-04-12 22:19:47 +00:00
TreeHugger Robot
5dc3c674a2 Merge "Add some tests for procstats, and fix some bugs that the tests uncovered." into nyc-dev 2016-04-12 21:38:10 +00: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
Andreas Gampe
1ef8aef260 Frameworks/base: Add no-thread marking to zygote
Use ZygoteHooks code to mark zygote initialization to not be
allowed to create threads. This is helpful when new classes are
found to be used by apps but cannot be preloaded as they spawn
threads.

Bug: 27248115
Change-Id: I1dc3620d9e7d0054c672b993d89459fc4b353dfc
2016-04-12 21:04:35 +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
Joe Onorato
65adfeecd2 Add some tests for procstats, and fix some bugs that the tests uncovered.
Bug: 27045736
Change-Id: Ia910730c5a3a899c89aa63dd7ab48be62cf9cfef
2016-04-12 13:13:41 -07: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
Jorim Jaggi
90fde3948d Don\'t remove background when resizing
am: 971d8e6

* commit '971d8e6399d556302b52a92dd29abf44830a587c':
  Don't remove background when resizing

Change-Id: I145e0843c11bfbcd61952e24d5fb0fd81f42c2a1
2016-04-12 18:54:02 +00: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
Jorim Jaggi
971d8e6399 Don't remove background when resizing
This leads to flickers, as we should not draw in a translucent way
if we didn't specify that our window is translucent, because the
renderer has some about translucency.

Instead, we should clip the backdrop content by the inverse of the
content clip rect, which is not yet implemented.

Bug: 28009524
Change-Id: Ia3f54fb83997ace863e78ff1cbe45cfb64f92f26
2016-04-12 18:14:14 +00: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
Makoto Onuki
b6d3523dfb ShortcutManager: Address API review feedback.
- "delete" -> "remove"
- add/deleteDynamicShortcut() now takes a list.
- Throttling default settings is now 2 calls / hour.

- Add categories to ShortcutInfo.
- getIconResourceId() is now public

Bug 27923857
Bug 27548047

Change-Id: I8457b30e4b2f7c63ab2988648b37178fd16ea45b
2016-04-12 10:35:20 -07:00
Alex Hills
06660697a3 Merge "Fixes name of intent launch flag for Action Extender" into nyc-dev
am: e3f3cb1

* commit 'e3f3cb10484260fac167e59d0178902a63ea7a6b':
  Fixes name of intent launch flag for Action Extender

Change-Id: Idbfc4beca1067031b9a7608930aa61779644901e
2016-04-12 17:24:10 +00: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
6265624bf3 Merge "Default font scale is 1 if not otherwise specified" into nyc-dev
am: 0f0ffb0

* commit '0f0ffb0450e223dab3a0e85f2968156c0da324b3':
  Default font scale is 1 if not otherwise specified

Change-Id: I25965bc2f5ec3dbd7a517f7b69f1cfa50fbaa5ce
2016-04-12 16:34:56 +00:00
Yuichi Biwa
5986b16057 Merge "Fix: ResolverActivity sometimes cannot update the last chosen activity" into nyc-dev
am: f763ea3

* commit 'f763ea3b0573a53543f0031a81bb48d99679977f':
  Fix: ResolverActivity sometimes cannot update the last chosen activity

Change-Id: I9a4fccdae9071de2b28a17408eb34c8103a01b78
2016-04-12 16:34:54 +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
Yuichi Biwa
66e495e647 Fix: ResolverActivity sometimes cannot update the last chosen activity
Symptom:
Calling startActivity() with an implicit intent,
ResolverActivity displays preferred activity candidates.
At first user selects one of them as "JUST ONCE".
And next, the last one is shown again on the top with "JUST ONCE" and
"ALWAYS".

But even if user selects another ones except top with "JUST ONCE".
Next time, the last one is not shown on the top.
Instead of that, first one still remain on the top.

It means that user can't select activities as "ALWAYS"
except first one.

Root cause:
The implicit intent has a URI but not MIME type.
In this case, Intent#resolveTypeIfNeeded returns "null".
So MIME type is not passed to PackageManagerService.
That's why this issue happens.

Change-Id: I87b6da9c5d8b47e071bbedf9f7d5f3ecea730875
2016-04-12 09:18:20 -07: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
0c133c82b5 Merge "Customizes input extract edit view for Wear" into nyc-dev
am: bbc9823

* commit 'bbc98232f36542f9245053371e385a2788490c2b':
  Customizes input extract edit view for Wear

Change-Id: I43ce88ccda7812aa5275d58a6125ced1b52a2b3a
2016-04-12 15:29:09 +00: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
f3c2dee3e1 Merge "Framework-side of SurfaceView#getBitmap" into nyc-dev
am: d2eec0e

* commit 'd2eec0efb2e47b23b2a12ab2967e422f0be49094':
  Framework-side of SurfaceView#getBitmap

Change-Id: I4da75d89a536c11dbaa9ee1feba8e5838fbb5a41
2016-04-12 14:45:44 +00:00
John Reck
d2eec0efb2 Merge "Framework-side of SurfaceView#getBitmap" into nyc-dev 2016-04-12 14:36:11 +00:00
Oleksandr Peletskyi
08fb03c261 Merge "Fixed cross profile usage of TextClock." into nyc-dev
am: 26e3385

* commit '26e33855089ddfb0e4fee4ee7df2c316c6f30a82':
  Fixed cross profile usage of TextClock.

Change-Id: I35651f1192d5e3890e674755c8897224c5a28db8
2016-04-12 11:43:19 +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
Mihai Nita
e66546c268 Merge "Use DisplayNameWithDialect only for some locales" into nyc-dev
am: e544d40

* commit 'e544d408c06fe3e6bc3b237f718b56f03f079f29':
  Use DisplayNameWithDialect only for some locales

Change-Id: I0611e41a010c6b5c4a937c8c5de501d3749cd438
2016-04-12 05:03:34 +00:00