40767 Commits

Author SHA1 Message Date
Fabrice Di Meglio
6b2df21eca Merge "Fix SeekBarPreference Theming" 2014-06-16 15:46:16 +00:00
Fabrice Di Meglio
19ae4ca5a7 Fix SeekBarPreference Theming
- make the layout a Theme attribute and use it
- make a specific Material version of the layout for matching
what we have in the Settings App

See bug: #15414236 Define a framework theme for system settings

and #15384992 Setting Dashboard - padding updates

Change-Id: I69c90523fab112fecf26d89de8fc35dd62430c06
2014-06-16 15:58:25 -07:00
John Reck
b69fc08303 Merge "Add atlas map pointer validation" 2014-06-16 22:12:26 +00:00
John Reck
b8802b1293 Add atlas map pointer validation
Bug: 15425820

 This just prevents the crash, it's still unclear how bad pointers
 are getting into the map in the first place

Change-Id: I3acffaae09548ec48973035b7fcf5f35606bad60
2014-06-16 15:28:50 -07:00
Raph Levien
466cd7a2a6 Merge "Clean up dirFlags / bidiFlags confusion" 2014-06-16 22:12:26 +00:00
Adam Lesinski
2c749d2427 New command to get device config
Change-Id: I7172a3a150fd83e2382ca3e4e4a0188758189f14
2014-06-16 23:01:19 +00:00
Raph Levien
051910b9f9 Clean up dirFlags / bidiFlags confusion
The dirFlags and bidiFlags enums are distinct, and have different
meanings. The former is a determined direction for a run of text, while
the latter is a request for the bidi algorithm. They have been used
interchangeably, and this has caused some problems, notably running the
bidi algorithm needlessly when the direction for a run is already
determined.

This patch cleans up the confusion, by always naming each occurrence
explicitly "boolean isRtl" or "int bidiFlags" (the previous code often
just used "int flags", which added to the confusion), and converts
between the meanings when a function takes an isRtl argument but passes
it to another function expecting bidiFlags.

Fixes b/15089607 Clean up bidi flag mess

Change-Id: I410b6604376e853dd12c255e7f5a9d2b9a310dd9
2014-06-16 14:36:08 -07:00
Narayan Kamath
97df96d8eb am 2ecc4dc8: am f36fe3f8: am 1083573c: Merge "Track changes to libcore ICU apis."
* commit '2ecc4dc88fc209f75f5dfe815d6a1fbb5fd49ef2':
  Track changes to libcore ICU apis.
2014-06-16 11:10:00 +00:00
Narayan Kamath
2ecc4dc88f am f36fe3f8: am 1083573c: Merge "Track changes to libcore ICU apis."
* commit 'f36fe3f85daaf9e3b3270143d6648394768bb324':
  Track changes to libcore ICU apis.
2014-06-16 11:01:29 +00:00
Narayan Kamath
5af1edc4bb am 5a44bdc8: am 8382b0d3: am ab9a19e3: Merge "Remove some pointless code."
* commit '5a44bdc828cba61aa055e2d71b3af62f39100179':
  Remove some pointless code.
2014-06-16 10:03:19 +00:00
Narayan Kamath
5a44bdc828 am 8382b0d3: am ab9a19e3: Merge "Remove some pointless code."
* commit '8382b0d3c6639ee0eeadec02983bfceaf5ba0a32':
  Remove some pointless code.
2014-06-16 09:54:49 +00:00
Narayan Kamath
8966fd383b am 031dec4a: am bfa6ddd0: Merge "Support deprecated language codes."
* commit '031dec4acd384ae6c5ab183139c7f91289a05f62':
  Support deprecated language codes.
2014-06-16 09:44:03 +00:00
Jinsuk Kim
6d97f5b91c A few more APIs for HdmiControlService
Added following APIs in HdmiControlService:

- portSelect
- sendKeyEvent
- getPortInfo
- addDeviceEventListener

Some are not fleshed out yet. Will work on it in a follow up CL.

Change-Id: Ia8c635176c0378f6e8db589bf714d82bf21ce85d
2014-06-16 14:01:45 +09:00
Vinod Krishnan
61eb51b8f5 am 1e6048e0: Merge "DO NOT MERGE Cherry picking 3 CLs to fix CTS testFitSystemWindows" into klp-modular-dev
* commit '1e6048e0158310ee31e0310661bed06a41ac7dd7':
  DO NOT MERGE Cherry picking 3 CLs to fix CTS testFitSystemWindows
2014-06-14 01:06:50 +00:00
Craig Mautner
916cd9770c am 6335fbcb: Revert "Revert "Close ActivityView and ActivityContainer cleanly.""
* commit '6335fbcba106147d914acae0a9d8f4fcd53af768':
  Revert "Revert "Close ActivityView and ActivityContainer cleanly.""
2014-06-14 00:30:47 +00:00
Craig Mautner
6335fbcba1 Revert "Revert "Close ActivityView and ActivityContainer cleanly.""
This reverts commit dd5c94717077c9366dee364c88a86a78e5ee2688.
2014-06-13 17:18:47 -07:00
Vinod Krishnan
1e6048e015 Merge "DO NOT MERGE Cherry picking 3 CLs to fix CTS testFitSystemWindows" into klp-modular-dev 2014-06-13 21:09:46 +00:00
Adam Powell
11335f14b9 DO NOT MERGE Cherry picking 3 CLs to fix CTS testFitSystemWindows
----
Explicitly track consumed state for WindowInsets

Treating 0-insets as fully consumed is incorrect since it means that
you can't dispatch empty insets down the view hierarchy - traversal
terminates immediately. Track consumed state independent of actual
values. Replacing a given set of insets with all zeroes will mark it
consumed.
----
Fix incorrect dispatch of empty WindowInsets from ActionBarOverlayLayout

Fix a bug where ActionBarOverlayLayout was using a private constructor
of WindowInsets to return empty insets that should have been marked
fully consumed. This caused dispatch to further child views not to
stop appropriately, corrupting application layout in some cases.
---
Fix CTS regression in fitSystemWindows

Don't attempt to apply null insets from a call to fitSystemWindows.
Immediately return false since null insets cannot be applied.
----

Bug: 15452706
Change-Id: I34276a90305b141b4653aef0048f70350c69d02a
2014-06-13 16:51:01 -07:00
Justin Koh
0f3d3dd26c am dd5c9471: Revert "Close ActivityView and ActivityContainer cleanly."
* commit 'dd5c94717077c9366dee364c88a86a78e5ee2688':
  Revert "Close ActivityView and ActivityContainer cleanly."
2014-06-13 17:27:48 +00:00
Justin Koh
dd5c947170 Revert "Close ActivityView and ActivityContainer cleanly."
This reverts commit 4a9f129874785d34930f165268dbc618e4bc2618.

Conflicts:
	services/core/java/com/android/server/am/ActivityStackSupervisor.java

Change-Id: Ic1f4df7f4cb644de7ddebcdc8ce632b46c5ba8f2
2014-06-13 09:55:09 -07:00
Craig Mautner
f5030ecbca am 4a9f1298: Close ActivityView and ActivityContainer cleanly.
* commit '4a9f129874785d34930f165268dbc618e4bc2618':
  Close ActivityView and ActivityContainer cleanly.
2014-06-12 00:00:17 +00:00
Craig Mautner
4a9f129874 Close ActivityView and ActivityContainer cleanly.
- Do not call IActivityContainer.release() from
ActivityView.finalize() if it has already been called from
ActivityView.release(). Eliminates IBinder finalized Exception.

- Call ActivityRecord.makeFinishing() before calling ActivityStack.
destroyActivityLocked(). Forces call to scheduleDestroyActivity()
and eventually removeFromHistory(). Otherwise removeFromHistory()
is never called and window manager AppWindowTokens become orphans.

- Defer call to ActivityContainer.detachLocked() until all
activities have finished or timed out. Fixes problem where Display
is removed while activities are still launching.

- Call ActivityStackSupervisor.deleteActivityContainer() when all
activities have finished or timed out. Fixes orphaned
ActivityContainers.

Fixes bug 15450798.
Fixes bug 15484154.
Fixes bug 15383479.
Fixes bug 15316558.
Fixes bug 15168560.
Fixes bug 15143914.

Change-Id: Id3c641976b6f825458690f9ee063c07818b56f23
2014-06-11 16:33:00 -07:00
Narayan Kamath
e79c8ce682 Support deprecated language codes.
Locale.toLanguageTag will transform the obsolete (and
deprecated) language codes "in", "ji" and "iw" to
"id", "yi" and "he" respectively.

All versions of android prior to "L" used the deprecated
language tags, so we will need to support them for backwards
compatibility.

bug: 13230947

(cherry-picked from commit 21fc8ba39c4799a346caf95)

(also contains a partial cherry-pick of 857ba4af because
including it is the easiest way to avoid conflicts.)

Change-Id: Ia1d0f2d8e20f5679ff3990506f6468ebf789c94a
2014-06-13 19:03:13 +01:00
Jinsuk Kim
ca515e307e Merge "Added an argument isPressed to HdmiControlService#sendKeyEvent" 2014-06-10 22:31:57 +00:00
Yorke Lee
b4ce1432c6 Add TelecommManager to system services
Change-Id: I48a75c578a99aca1149fbae84a5d0f9ac0a457f3
2014-06-16 14:41:50 -07:00
Jeff Sharkey
c4858a2ba9 Switch PackageParser to reference single path.
It previously kept mPath separate from mScanPath for some very odd
edge cases around moving apps-on-SD.  This changes it to always use
a single path, refactors moving to keep separate paths.

Refactors method names in PackageParser to be clearer about their
APK-versus-package relationship.

Beginnings of a split package parser.  Instead of requiring that
callers check error codes when null, switch to always throwing on
parse errors, to require that callers deal with the error.  Longer
term the entire parser should switch to this style, but its too
pervasive for a simple refactoring.

Change-Id: If071d8e55e46e56cc201fadfb51cb471713ae973
2014-06-16 13:20:18 -07:00
Adam Powell
c5f83d0c3f Merge "Add TextView#set/getShowSoftInputOnFocus" 2014-06-16 15:39:47 +00:00
Adam Powell
206c6e85ab Add TextView#set/getShowSoftInputOnFocus
These APIs allow an application to suppress the default editable
TextView focus gain behavior of displaying the IME. Useful in cases
where an app provides an alternate way of entering content, such as a
dialpad or calculator pad.

Bug 11540727

Change-Id: I1abd98db6e1522a9655a42b6ee712f50a962ea00
2014-06-16 12:57:16 -07:00
Yorke Lee
0612d3dfe4 Merge "Add ability to set and get DefaultPhoneApplication" 2014-06-16 19:03:13 +00:00
Yorke Lee
2e024708b1 Add ability to set and get DefaultPhoneApplication
Change-Id: I8aa8cb16965106175c538f36915a31cf4830cef2
2014-06-16 10:42:59 -07:00
Jay Civelli
05dc89bf3a Merge "Make sure TrustAgent applies trust if granted before it is bound." 2014-06-16 15:39:47 +00:00
Adam Powell
8a30b31a77 Fix CTS regression in fitSystemWindows
Don't attempt to apply null insets from a call to fitSystemWindows.
Immediately return false since null insets cannot be applied.

Bug 15452706

Change-Id: I1ad4cc0288db36b3e9485481173e64b2140a0204
2014-06-16 11:49:55 -07:00
Jinsuk Kim
0d3985a977 Added an argument isPressed to HdmiControlService#sendKeyEvent
sendKeyEvent requires additional argument isPressed to handled
both up/down key event.

Change-Id: I0080adc72920dd7ae4e4dae041781f76a6658f9b
2014-06-16 17:26:10 +09:00
Emily Bernier
c5db4bfb10 Merge "Add an app ops code for microphone muting." 2014-06-14 02:21:10 +00:00
Emily Bernier
22c921a910 Add an app ops code for microphone muting.
When OP_AUDIO_MICROPHONE (linked to the DISALLOW_UNMUTE_MICROPHONE user
restriction) is set, the system blocks calls to setMicrophoneMute.

Bug: 13585692

Change-Id: Ib32138bcc256cfbac4fe21a090d5ba34f5c641fc
2014-06-16 11:25:22 -04:00
Selim Gurun
527a293cb4 Merge "Unhide the file API" 2014-06-14 02:21:10 +00:00
Selim Gurun
1b6e10bcca Unhide the file API
Bug: 6930981
Change-Id: I4818d5dff3cb05b38e4d8f9f817e4fcdeade7f00
2014-06-16 11:52:05 -07:00
ztenghui
7cd8ec237b Merge "Make ViewAnimationUtils final" 2014-06-16 15:39:47 +00:00
ztenghui
1c2ebed64b Make ViewAnimationUtils final
Change-Id: I356586c77e8a495709e5a99c8b51620b82d9fbac
2014-06-12 13:51:10 -07:00
ztenghui
e5e92602a4 Add AnimatedVectorDrawable
Currently as a hidden class.
It can support many the animations now as far as ObjectAnimator and
hierarchical group can support.
And we don't have path morphing yet.

Also support the Animator / Interpolator inflation from Context and Resources.

Change-Id: I948bbdf7373ad291171eed0b497959dce8c2edf3
2014-06-12 13:18:59 -07:00
Jay Civelli
4f22777efb Make sure TrustAgent applies trust if granted before it is bound.
Change-Id: Ibe704d162930e4bb6135fabccb15263935ced009
2014-06-12 11:03:33 -07:00
Chong Zhang
90c91c2adf Merge "support for CEA-608 closed caption" 2014-06-12 17:09:07 +00:00
Chong Zhang
bdfd910247 support for CEA-608 closed caption
Bug: 15470448
Change-Id: Ic6a527f5c35a8ee0a08a5b043336e4d193216083
2014-06-11 17:57:23 -07:00
Christopher Tate
2110ca327a Merge "Implement full data backup through transport" 2014-06-13 21:09:46 +00:00
Christopher Tate
9ff53a7100 Implement full data backup through transport
Currently no timed/scheduled full-data backup operations are
performed by the OS, but the plumbing is now in place and can
be tested using 'adb shell bmgr fullbackup pkg [pkg2 pkg3 ...]'.

The LocalTransport test transport implementation has been augmented
to support the new full-data backup API as well.

In addition, 'adb backup' now takes the -compress/-nocompress
command line options to control whether the resulting archive is
compressed before leaving the device.  Previously the archive was
always compressed.  (The default is still to compress, as it will
usually reduce the archive size considerably.)

Internally, the core implementation of gathering the full backup
data stream from the target application has been refactored into
an "engine" component that is shared by both 'adb backup' and the
transport-oriented full backup task.  The archive file header
generation, encryption, and compression logic are now factored out
of the engine itself instead of being hardwired into the data
handling.

Bug 15329632

Change-Id: I4a044faa4070d684ef457bd3e11771198cdf557c
2014-06-15 17:35:33 -07:00
Robert Greenwalt
7c9f5529ea am 558aeb90: Merge "Make NetworkCapabilities publicly immutable." into lmp-preview-dev
* commit '558aeb901144fac460575402e38fc8baa2da83eb':
  Make NetworkCapabilities publicly immutable.
2014-06-12 18:49:07 +00:00
Adam Powell
90132dd7ca am c72a2a82: Merge "Explicitly track consumed state for WindowInsets" into lmp-preview-dev
* commit 'c72a2a82160099e8f20c42eb0d36881c31537130':
  Explicitly track consumed state for WindowInsets
2014-06-12 18:37:33 +00:00
Alan Viverette
30794097ac Fix NPE in focus hotspot management
BUG: 15631051
Change-Id: I24b014f940c43a1f92fd050439bb6a42b8e24310
2014-06-14 12:23:51 -07:00
Robert Greenwalt
7569f1811f Make NetworkCapabilities publicly immutable.
Applying API council comments.

bug: 15142362

(cherry picked from commit Ie0bde68b72656a676d90c0343b9756fe9268d8d6)
Change-Id: Ie0bde68b72656a676d90c0343b9756fe9268d8d6
2014-06-11 23:29:39 +00:00
Adam Powell
0d9fdbad75 Explicitly track consumed state for WindowInsets
Treating 0-insets as fully consumed is incorrect since it means that
you can't dispatch empty insets down the view hierarchy - traversal
terminates immediately. Track consumed state independent of actual
values. Replacing a given set of insets with all zeroes will mark it
consumed.

Bug 15341653

Change-Id: I55b33b7dfbf4cae1e906a82140537156cffdbf47
2014-06-11 15:35:51 -07:00