Commit Graph

64376 Commits

Author SHA1 Message Date
Adam Lesinski
b9dcdccbce Merge "Merge "BatteryStats: Don\'t log BluetoothScanTimer when it doesn\'t exist" into nyc-dev am: daeee0b" into nyc-dev-plus-aosp
am: e0bd3a0

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

Change-Id: Id83ac464c1a744a4b2538f23908c72ffc453249d
2016-04-12 22:37:39 +00:00
Chad Brubaker
694e960c86 Merge "Merge "Document when usesCleartextTraffic is ignored." into nyc-dev am: e341ddf" into nyc-dev-plus-aosp
am: 82029af

* commit '82029afade6a8f74b0ddee2978218a1ac4bf8d98':
  Document when usesCleartextTraffic is ignored.

Change-Id: I4a0c329f41ef56113f4da0c3bc1662021e0a6bcd
2016-04-12 22:35:27 +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
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
Jorim Jaggi
ce03bcdc74 Don\'t remove background when resizing am: 971d8e6
am: 90fde39

* commit '90fde3948d6cdd5b2bc615b60319cf39bf74423f':
  Don't remove background when resizing

Change-Id: I764fe74e93f6ef69872129e30570694cf45a0c77
2016-04-12 19:00:57 +00: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
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
Alexander Hills
d98785e288 Merge "Fixes name of intent launch flag for Action Extender" into nyc-dev am: e3f3cb1
am: 0666069

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

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

* commit '6265624bf3f992cfa510e04a5656568033789a94':
  Default font scale is 1 if not otherwise specified

Change-Id: Ibb1062c44afd7c22e24ae59492ccb450df2a5fa5
2016-04-12 16:40:24 +00:00
Adam Powell
207fbdbb24 Merge "Fix: ResolverActivity sometimes cannot update the last chosen activity" into nyc-dev am: f763ea3
am: 5986b16

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

Change-Id: I32266362685b6159be137a6d9afa271328001b8d
2016-04-12 16:40:22 +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
0878022e22 Merge "Customizes input extract edit view for Wear" into nyc-dev am: bbc9823
am: 0c133c8

* commit '0c133c82b5e58292739ed62fe5eb7a4bb465ceed':
  Customizes input extract edit view for Wear

Change-Id: I570acac5236e5a8084dd20f60572c000222c375d
2016-04-12 15:34:33 +00: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
d8b22c5ff9 Merge "Framework-side of SurfaceView#getBitmap" into nyc-dev am: d2eec0e
am: f3c2dee

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

Change-Id: I60d5b10c643fbb646a69fa6896f3c83bde273256
2016-04-12 14:51:08 +00: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
Kirill Grouchnikov
e1684cda2b Merge "Add @TestApi method to Spinner to test whether popup is showing." 2016-04-12 12:29:08 +00:00
Oleksandr Peletskyi
0ec262cda4 Merge "Fixed cross profile usage of TextClock." into nyc-dev am: 26e3385
am: 08fb03c

* commit '08fb03c261bab00ebb69bb6449bfcf215e09f604':
  Fixed cross profile usage of TextClock.

Change-Id: I724e7310e2e0f5f7a45c1831ad05cea3336af302
2016-04-12 11:48:32 +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
Mihai Niță
3d23877f2c Merge "Use DisplayNameWithDialect only for some locales" into nyc-dev am: e544d40
am: e66546c

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

Change-Id: I9661a10628471ad1970987e0650f4e660dace431
2016-04-12 05:08:39 +00: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
Mihai Niță
e544d408c0 Merge "Use DisplayNameWithDialect only for some locales" into nyc-dev 2016-04-12 04:56:05 +00:00
Siyamed Sinir
a8709c7160 Merge "Fix Patterns.UCS_CHAR character class" into nyc-dev am: 9f98646
am: c7f1e02

* commit 'c7f1e02dd162eaadca61aa3ea5164ba814d2b4ef':
  Fix Patterns.UCS_CHAR character class

Change-Id: Ia18e65d71c97317195dcc7f1e84790681b39b45a
2016-04-12 02:41:59 +00:00
Siyamed Sinir
c7f1e02dd1 Merge "Fix Patterns.UCS_CHAR character class" into nyc-dev
am: 9f98646

* commit '9f986466f45d4d114a76b3efe3b2986844d80bcd':
  Fix Patterns.UCS_CHAR character class

Change-Id: I3d8cbd995ce977b7afa97beed3512b479c16d427
2016-04-12 02:37:01 +00: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
4b46826f16 Merge "Exclude unicode space characters from autoLink URL patterns" into nyc-dev am: 4b92594
am: cda996c

* commit 'cda996cff8ab4a0b8009768a6754a031b2c2a731':
  Exclude unicode space characters from autoLink URL patterns

Change-Id: I00026490816b2a64424effe34d349870eaeae549
2016-04-12 00:48:10 +00:00
Siyamed Sinir
cda996cff8 Merge "Exclude unicode space characters from autoLink URL patterns" into nyc-dev
am: 4b92594

* commit '4b92594857ce52f96252f43c776f3ed31f0ebdfb':
  Exclude unicode space characters from autoLink URL patterns

Change-Id: Ie8c41292ab33ed50cd41a62eaa98ca7f1a06db14
2016-04-12 00:43:08 +00: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
3af69b89b3 Merge "Fix notifications that are sent for USER_ALL." into nyc-dev am: 01a1ad5
am: 4ed2fb8

* commit '4ed2fb8b5cfe63087d155d1f4f2bbe0b8a312980':
  Fix notifications that are sent for USER_ALL.

Change-Id: Ifa2314c4f0f913f92f22fe02ff770912e307e913
2016-04-11 23:30:46 +00:00
Makoto Onuki
1187239423 Merge "ShortcutManager: First cut of CTS" into nyc-dev am: bc20320
am: 0beb56d

* commit '0beb56d4e49f433759f7c825374c90442f2aed53':
  ShortcutManager: First cut of CTS

Change-Id: I048150bf9451e8d28dc599673321bd31f8d119a1
2016-04-11 23:30:43 +00:00
Jeff Sharkey
4ed2fb8b5c Merge "Fix notifications that are sent for USER_ALL." into nyc-dev
am: 01a1ad5

* commit '01a1ad511e126aca0b445457f06e31f903b84ffb':
  Fix notifications that are sent for USER_ALL.

Change-Id: I73f0984bf8d298017577fbe20406a0f19996fed6
2016-04-11 23:25:25 +00:00
Makoto Onuki
0beb56d4e4 Merge "ShortcutManager: First cut of CTS" into nyc-dev
am: bc20320

* commit 'bc20320f7f224d1cc5be3c436a1a5ece2067f2ec':
  ShortcutManager: First cut of CTS

Change-Id: I23d24480870644cf69575d2f11bfc55056c0fb96
2016-04-11 23:25:23 +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
Adam Powell
1629a08fb9 Merge "Prevent duplicate loader onLoadFinished calls on config change" into nyc-dev am: e60b8f8
am: 701bb7a

* commit '701bb7ae13879764b316918042fe8118664d73af':
  Prevent duplicate loader onLoadFinished calls on config change

Change-Id: Ia089ebf5b2ba924ceb8e57132ed5c89b7211b8a5
2016-04-11 23:14:40 +00:00
Mihai Nita
1b2e7adc88 Use DisplayNameWithDialect only for some locales
Although DisplayNameWithDialect seems to return friendlier, more
"casual" names (e.g. "American English"), the result was inconsistent,
and (at times) debatable. And since this setting affects not only
the language of the translation, but a locale, names like "Flemish"
kind of lost the whole "locale / location" idea.

So we revert to use DisplayName for all but a few selected locales
(that we verified are better with the "dialect" form).

Bug: 27704583
Change-Id: I587081da1293cccac3cdabcd188a9b8160c233ea
2016-04-11 16:13:54 -07:00
Makoto Onuki
bc20320f7f Merge "ShortcutManager: First cut of CTS" into nyc-dev 2016-04-11 23:11:41 +00:00