194617 Commits

Author SHA1 Message Date
Ben Kwa
a6a50d037b Add a divider between the roots selector and files list.
BUG=21643911

Change-Id: Ie7c4d1a014b9fbdccb91d80907c89e2309c9891f
2015-06-09 10:43:59 -07:00
Tony Mantler
bdbb5a8d77 Tweak ApplicationsState for use by TvSettings
b/21328967

Change-Id: I1da8a908491ec4ade7fcc729acf6c08f043cc495
2015-06-09 10:42:59 -07:00
Doris Liu
a46ccc164d Merge "Infer value type for ObjectAnimator, too" into mnc-dev 2015-06-09 17:42:00 +00:00
Ben Kwa
7c04308f51 Merge "Clean up icons in DocumentsUI." into mnc-dev 2015-06-09 17:35:20 +00:00
Tao Bao
7dc2e9c59c Merge "Improve the reboot-to-recovery dialogs" into mnc-dev 2015-06-09 17:34:16 +00:00
Paul McLean
dd0db9f63d Merge "Adding default handler to (re)Routing callbacks where no handler is provided." into mnc-dev 2015-06-09 17:20:50 +00:00
Mike Lockwood
c87cd46dc7 Merge "UsbMidiDevice: Only keep ALSA devices open when device is in use" into mnc-dev 2015-06-09 17:20:20 +00:00
Tony Mantler
d951d65d8a Merge "Move ApplicationsState to SettingsLib" into mnc-dev 2015-06-09 17:20:19 +00:00
Eric Laurent
ba497f0c16 Merge "Use only strong references to AudioEffect" into mnc-dev 2015-06-09 17:19:10 +00:00
Clara Bayarri
0f925d0def Merge "Fallback to old Window.Callback#onWindowStartingActionMode" into mnc-dev 2015-06-09 17:18:50 +00:00
Paul Jensen
7b8ce2fa0e Merge "Log SslErrors from captive portal sign in app." into mnc-dev 2015-06-09 17:16:20 +00:00
Paul Jensen
16bef48d22 Merge "Add support for tel: links in captive portal app." into mnc-dev 2015-06-09 17:11:10 +00:00
Richard Uhler
659716d7a0 Merge "Add Debug.MemoryInfo.getMemoryStats API." into mnc-dev 2015-06-09 16:40:57 +00:00
Julia Reynolds
058652c23d Merge "Remove the ability to set a preferred setup activity." into mnc-dev 2015-06-09 16:37:57 +00:00
Julia Reynolds
cedd53adc3 Remove the ability to set a preferred setup activity.
Bug: 21557327
Change-Id: I8c1809d25c5f5fcd186dfc0636d8ac47ed5fc903
2015-06-09 12:34:27 -04:00
Sudheer Shanka
0fcf4161c5 Merge "Update some strings." into mnc-dev 2015-06-09 16:26:12 +00:00
Andreas Gampe
ee0cdce2a8 Frameworks/base: Add is64Bit method to Process
Add a public method to Process to query whether the current runtime
is running in 64-bit mode.

Bug: 21069469
Change-Id: Ifaf4251f05bbe5eba135fa977190e475632856bd
2015-06-09 09:22:55 -07:00
Chris Craik
342540c030 Merge "Add tracing to GLSurfaceView" into mnc-dev 2015-06-09 16:14:43 +00:00
Filip Gruszczynski
6974f22d11 am 47e53319: Revert "Recompute focus stack if cleared while starting an activity."
* commit '47e53319509474c2f00847ac391dd32776712470':
  Revert "Recompute focus stack if cleared while starting an activity."
2015-06-09 16:05:22 +00:00
Tony Mantler
eeb3443cc6 Merge "Add uses-sdk to reduce red squigglies" into mnc-dev 2015-06-09 16:04:45 +00:00
Filip Gruszczynski
47e5331950 Revert "Recompute focus stack if cleared while starting an activity."
This reverts commit 0b3d573e46b8be0f0cf170802214320859c94905.

Unfortunately, we need more than just that.

Change-Id: I42ac79cb396812b91cec67ba681144592c0e2e01
2015-06-09 15:55:30 +00:00
Paul McLean
5be68ede19 Adding default handler to (re)Routing callbacks where no handler is provided.
Bug: 21669441

Change-Id: I6481652c8703bca6a7e8356614177fd071e71c0e
2015-06-09 08:54:45 -07:00
Wale Ogunwale
64b586e19f am 0b3d573e: Recompute focus stack if cleared while starting an activity.
* commit '0b3d573e46b8be0f0cf170802214320859c94905':
  Recompute focus stack if cleared while starting an activity.
2015-06-09 15:34:40 +00:00
Wale Ogunwale
0b3d573e46 Recompute focus stack if cleared while starting an activity.
When starting an activity with Intent.FLAG_ACTIVITY_CLEAR_TOP flag,
the activity is destoried which can also cause its task to be removed
from its current stack if the activity process record is null. We now
recompute the stack for the activity task when this occurs so we
don't NPE later on.

Bug: 19552874

Change-Id: I50f51ca6dc32d4642f78d59cae93b0774bc6cdb7
(cherry picked from commit 86920fe630911cbbc0839b341dc694c2b905ef9e)
2015-06-09 15:21:17 +00:00
Luan Nguyen
33677f0c10 am d8b632fb: Merge "docs: Fix WatchFace guide to no longer reference deprecated Time.java Also fix links to samples and reference docs." into mnc-preview-docs
* commit 'd8b632fbce276ca0e91bf2b251aff266869e1291':
  docs: Fix WatchFace guide to no longer reference deprecated Time.java Also fix links to samples and reference docs.
2015-06-09 15:01:16 +00:00
Luan Nguyen
d8b632fbce Merge "docs: Fix WatchFace guide to no longer reference deprecated Time.java Also fix links to samples and reference docs." into mnc-preview-docs 2015-06-09 14:50:50 +00:00
Erik Kline
379747a404 initial revision of NetworkDiagnostics
Bug: 21449922
Change-Id: I6a66cfa98601d6ccfe38ff840b0dd49ed1538a41
2015-06-09 23:37:58 +09:00
Tony Mantler
95357fd49a Move ApplicationsState to SettingsLib
Also take InterestingConfigChanges along for the ride

b/21328967

Change-Id: I48af51cc4694ba5c492794631a1e1a54a60fce0b
2015-06-09 09:39:08 -04:00
Sudheer Shanka
5b1a21a385 Update some strings.
Bug: 20518822
Change-Id: I22ed55cf44575a484f727965e2f8f6095f7f2be0
2015-06-09 14:19:07 +01:00
Paul Jensen
41ff524a63 Log SslErrors from captive portal sign in app.
Bug:21604873
Change-Id: I0361da37039bb4f0f9d2e0dabbae4ab2ddbb05e3
2015-06-09 08:55:06 -04:00
Paul Jensen
fd54da9b7c Add support for tel: links in captive portal app.
Bug:21447011
Change-Id: I72ec4fd780ddb89cecfa584aa285f3822f326810
2015-06-09 07:50:51 -04:00
Narayan Kamath
3eb63dc35e Merge "Move linking and directory creation logic to installd." into mnc-dev 2015-06-09 11:31:08 +00:00
Sudheer Shanka
3c300f0d77 Merge "Update AfW related strings." into mnc-dev 2015-06-09 11:26:55 +00:00
Sudheer Shanka
427422d822 Update AfW related strings.
Bug: 20518822
Change-Id: I83304a44457c3942b2def6fc4f2c9a369f61d232
2015-06-09 12:13:23 +01:00
Narayan Kamath
e845a1ef64 Move linking and directory creation logic to installd.
bug: 20889739

Change-Id: I1763376a2fbb25f3a3d55f60c1940cdbddcded07
2015-06-09 10:36:37 +00:00
Andrei Stingaceanu
4c1b7315b1 Completely remove ExtractActionMode from ExtractEditLayout
Use the floating toolbar action mode instead.

Bug: 20128047
Change-Id: I7998c8ee2162a0e01525a0cd66ec14fa5050a953
2015-06-09 10:50:48 +01:00
Neil Fuller
6394a39280 Stop showing long names for local timezones when it is ambiguous
Context:

Android uses a hand-crafted list for timezones to pick from in
Settings. Independently of what we actually show the user, when a
user is selecting their timezone they are selecting an olson timezone
ID. Separate olson ids exist for a sets of zone rules. If two places
have differed in their zone rules in the past they have different
olson ids. Olson Ids are usually named after cities and have
"exemplar locations", e.g. "Europe/London" covers the UK and the
exemplar location is "London".
Exemplar locations were often chosen based on historic considerations
and do not necessarily make sense to contemporary users.

Normal Android users don't know or care about any of this, but they do
understand geography/cities and sometimes understand things like
timezone names like "British Summer Time" (but usually not in other
countries).

Unfortunately timezone names understood by users also don't have a
one-to-one mapping with olson IDs. Two places can have the same
timezone name for part of the year but not the rest. For example, all
of a the country Foo may be using "Foo Standard Time" for part of the
year, but in summer some parts of the country may switch to "Foo
Summer Time" while others stay on "Foo Standard Time". These would
have different Olson Ids.

Also, two places that historically differed in their choice of
timezone rules may have since aligned. e.g. parts of Europe. They
still have their own olson ids.

The Android hand-crafted list is (I assume) based on a set of
compromises to provide reasonable coverage of users' needs without
overwhelming them with too many choices for historic irrelevancies.

To assist with picking a timezone that makes sense to a user, Android
currently does the following:

When selecting a timezone:

For "local" timezones Android shows the timezone "long name". e.g.
"British Summer Time", "Eastern Standard Time".
For non-local timezones Android uses the exemplar location (e.g. the
city).

This had an issue:

Some "local" timezones, e.g. Australia for English (Australian),
would show multiple entries for the same long timezone name without
any way of telling them apart.

After this change:

This change means that settings now uses the exemplar location in
preference when the Android display strings would be ambiguous. For
countries where there is no ambiguity (e.g. the UK) Android continues
to use the timezone long name.

Bug: 19058953
Bug: https://code.google.com/p/android-developer-preview/issues/detail?id=2132
Change-Id: I01651f2416f500652bd2bcf447d056efd4fd3598
2015-06-09 10:14:44 +01:00
Erik Kline
1162744fed Merge "Make public Network#bindSocket(FileDescriptor)." into mnc-dev 2015-06-09 07:48:01 +00:00
Erik Kline
d895999858 Make public Network#bindSocket(FileDescriptor).
Code that uses android.system.Os to create sockets as FileDescriptors
should be able to bind them to networks.  Note that FileDescriptors
could already be marked as "protected from VPNs" via
NetworkUtils#protectFromVpn(), but heretofore were not easily bound
to any particular network.

Bug: 21449922
Change-Id: I4bb86db5d95d5a55bb2d7e245848d11eaa351e65
2015-06-09 16:19:24 +09:00
Jinsuk Kim
5795a25cad Merge "TIF: Generate hardware input id in language-neutral fashion" into mnc-dev 2015-06-09 04:49:08 +00:00
Jinsuk Kim
4b20865817 TIF: Generate hardware input id in language-neutral fashion
For certain RtoL languages, digit used as a part of input id
(like HW0) is also localized, hence language change results in
the duplicated inputs for an identical hardware. This CL
changes the way the id is built to language-neutral fashion,
and keeps the digit used in the id in Arabic.

Bug: 21523750
Change-Id: I8f95e0209eeee16ceb543e574ef9ed572e4d031f
2015-06-09 13:09:16 +09:00
Jeff Sharkey
e3d670dc1e Merge "Format volumes with "auto" filesystem type." into mnc-dev 2015-06-09 03:25:10 +00:00
Jorim Jaggi
8972c2a0c7 Fix lockscreen launch animations
- Fix the case in WindowAnimator where the real window was ready
to draw while the starting window was playing the unlock animation.
- Always delay Keyguard done when clicking on a notification. Some
notifications started services/broadcasts instead and thus we didn't
wait, making it a jarring transition. In case the notification click
doesn't result in an activity start at all, we still have the timeout
that saves us from freezing (3s), but most notifications should start
an activity.

Bug: 19412725
Change-Id: I78f6839f59986f8f7ecdff70227d5690a504f475
2015-06-09 02:31:53 +00:00
Jim Miller
4f364c9e5f Fix NPE cause by new fingerprint permission check
We no longer send fingerprintid to non-privileged apps. Though
Keyguard can get the permission, it does not currently use fingerprint
info, so remove the API call.

Fixes bug 21040383

Change-Id: I8a9461ed138c368afc75601fe6d4eadc9a8b91c5
2015-06-08 19:24:13 -07:00
Eric Laurent
76f8133188 Use only strong references to AudioEffect
Modify AudioEffect and Visualizer JNI to use strong references to
native AudioEffect object.

Bug: 21629892.

Change-Id: I4c2dea0b2e16d807d6dc5d6b09e02e4652d48873
2015-06-08 18:50:05 -07:00
Jim Miller
800ebfc166 Merge "Update and cleanup FingerprintManager API to new spec" into mnc-dev 2015-06-09 01:46:22 +00:00
Jeff Sharkey
4e83cc9fc1 Format volumes with "auto" filesystem type.
Bug: 20275581
Change-Id: Id4c7e1ad83f28110a77fecf563e1bcb8ca4d4d9a
2015-06-08 18:34:23 -07:00
Alex Klyubin
12742ab5f4 Merge "Deprecate KeyChain.isBoundKeyAlgorithm." into mnc-dev 2015-06-09 00:51:28 +00:00
Makoto Onuki
bbb912a89e Add more result extras for ACTION_GET_PERMISSIONS_COUNT
Now ACTION_GET_PERMISSIONS_COUNT returns more than counts, its a misnomer, but
I don't think it's worth renaming it, as Svet is planning to change the
interface to a service.

Bug 21615746

Change-Id: I9ce1f3ed674b21bb56ee5a8e2baed0017f5ae81a
2015-06-08 17:51:14 -07:00
Chris Craik
59b429d106 Add tracing to GLSurfaceView
bug:21195272

Change-Id: I96bce6d6021fc720c73993202ba90997b0fc0e09
2015-06-08 17:40:00 -07:00