147346 Commits

Author SHA1 Message Date
Ji-Hwan Lee
ca18eb045b Merge "TIF: Make TvContract URI consistent" into lmp-dev 2014-08-07 16:56:07 +00:00
Ji-Hwan Lee
156aeecef2 TIF: Make TvContract URI consistent
- input/*/channel -> channel?input=*
- channel/#/program -> program?channel=#

Bug: 16806157, Bug: 16804331
Change-Id: Idbded032da166e789148c4b8e38ea521468fd9fa
2014-08-08 22:15:00 +09:00
Alan Viverette
f9b4c2cc6f Merge "Fix CTS test for nine patch padding sanity check" into lmp-dev 2014-08-06 23:49:20 +00:00
Alan Viverette
ac1f5884fb Fix CTS test for nine patch padding sanity check
BUG: 16826969
Change-Id: I96628a38300dec58eb8523559741c28fed35eba2
2014-08-07 13:55:26 -07:00
Igor Murashkin
cd3a994e50 Merge "camera2: (LEGACY) Add face detection support and vstab modes" into lmp-dev 2014-08-07 17:50:16 +00:00
Igor Murashkin
0a1ef4dbf3 camera2: (LEGACY) Add face detection support and vstab modes
Also work-around CTS freezing forever in Camera#setPreviewTexture

* Set preview texture to null after unconfiguring (Camera#stopPreview)
* Remove all uses of recording hint

(Some devices disable face detection unconditionally when recording is not
using HDR mode; recording hints will be introduced after we add
capture intent support)

Change-Id: I2f0a80f1d580af214cb0f53abcbf33c7391790f1
2014-08-07 13:46:25 -07:00
Alan Viverette
e46a9b97fb Merge "Remove clipToOutline workaround for null backgrounds" into lmp-dev 2014-08-07 15:00:45 +00:00
Alan Viverette
2c18333577 Remove clipToOutline workaround for null backgrounds
BUG: 16566746
Change-Id: Icdf0d40b75c0fa9d972eb6300f51079e48fbe5fd
2014-08-07 13:43:05 -07:00
Alan Viverette
7870dfe361 Merge "Use translatable strings for time picker AM/PM labels" into lmp-dev 2014-08-07 17:50:16 +00:00
Alan Viverette
271ed9ae87 Use translatable strings for time picker AM/PM labels
BUG: 16842390
Change-Id: Ibdbe9cffb39373f200a09eb0d28b956a1eeb5d13
2014-08-07 13:33:30 -07:00
Adrian Roos
95202de09d Merge "Fix pending dismiss action not cleared when leaving bouncer" into lmp-dev 2014-08-07 18:49:59 +00:00
Adrian Roos
559b41f424 Fix pending dismiss action not cleared when leaving bouncer
Bug: 16307958
Change-Id: Id9ae360b6d4f606b3b76a092b32756ac04d06344
2014-08-07 22:27:56 +02:00
Alan Viverette
11e84ce024 Merge "Add an extra pixel to the ripple radius used for bounds" into lmp-dev 2014-08-07 17:50:16 +00:00
Alan Viverette
036a66596d Add an extra pixel to the ripple radius used for bounds
BUG: 16850241
Change-Id: I0f3a046100c104a6321ca7eb24cd0295878e4f47
2014-08-07 13:00:03 -07:00
Eino-Ville Talvala
47082b9c7e Merge topic 'camera2-remove-hidden' into lmp-dev
* changes:
  Camera2: Fix session shutdown race, frequent warning log
  Camera2: Remove hidden parts of public CameraDevice
  Camera2: Fix null-listener capture for CameraCaptureSession
2014-08-07 15:00:45 +00:00
Eino-Ville Talvala
d3b85f69a8 Camera2: Fix session shutdown race, frequent warning log
- Make sure that session.close followed by device.createCaptureSession cannot race on
  configureOutputs calls
- Silence warning about RAW_OPAQUE format

Change-Id: I02e4a048e8b26ea61aadcf115b029e9fbb58ad4e
2014-08-07 13:16:53 -07:00
Eino-Ville Talvala
a6b5ba5603 Camera2: Remove hidden parts of public CameraDevice
- Remove everything @hide in CameraDevice
- Move bits that are still needed into CameraDeviceImpl

Change-Id: Ie22059a0eb5c4238142a8a1e8dbcf1a422e845aa
2014-08-07 13:16:53 -07:00
Eino-Ville Talvala
7875a886b8 Camera2: Fix null-listener capture for CameraCaptureSession
Correctly allow null listener/handler when invoked on a thread with no
looper; otherwise all capture/repeating requests will fail even if listener
is null.

Change-Id: I4c64c81ad7f14b5cb309b4f92822cb50dbd74ba6
2014-08-07 13:16:22 -07:00
Jason Monk
d3ea7d61a3 Update strings for QS footer.
Bug: 16854706
Change-Id: Iba7ecae45f0bc9a8819f5172ad5922fddab95076
2014-08-07 20:09:39 +00:00
Dan Sandler
09723fd04a Merge "Need to post-process all action icons to get the correct color." into lmp-dev 2014-08-07 09:28:12 +00:00
Prashant Malani
fed4a5565b Merge "Move wakelock release to handleMessage" into klp-modular-dev 2014-08-06 23:49:20 +00:00
Prashant Malani
7450614a49 Move wakelock release to handleMessage
There were certain code paths in handleDockStateChange() that were
exiting without releasing the wakelock. So we move the release to the
calling function to prevent stray held wakelocks.

Bug: 16841895

Change-Id: I8ae4d2ab8f775c42a893d3bcdef34321c5f631a6
Signed-off-by: Prashant Malani <pmalani@google.com>
2014-08-06 22:22:18 -07:00
Robert Ly
6f273458fb Merge "docs: remove "developer preview" and point to Android-specific doc" into klp-modular-docs 2014-08-06 23:49:20 +00:00
Christopher Tate
bcc48b6cb0 Merge "Reify the transport lookup/selection API" into lmp-dev 2014-08-06 23:49:20 +00:00
Christopher Tate
d5cf722ae6 Reify the transport lookup/selection API
Introduce a stable BackupTransport interface class for transport
implementations to derive from.

Make the interface for viewing/selecting the active backup transport
part of the stable API.

Make restore-related classes (RestoreSession, RestoreSet) stable API.

Express backup manager APIs needed for transport operation as
@SystemApi methods in BackupManager.

Bug 16661321

Change-Id: I423b87ae8f45c1b77831d4f8ffd97715484c2d2b
2014-08-07 19:43:22 +00:00
Dianne Hackborn
df192a47fc Merge "Fix to call VoiceInteractionSession.onDestroy()." into lmp-dev 2014-08-07 18:53:12 +00:00
Dianne Hackborn
9a35d78cad Fix to call VoiceInteractionSession.onDestroy().
Change-Id: I2b4f19538700c691dac3a83aadfa0959ef1fe458
2014-08-07 12:34:37 -07:00
Dianne Hackborn
0068d3dcf1 Fix issue @16555033: Battery history overflowing too much
- No longer track process starts/stops normally.
- Increase buffer size to 256KB.
- Buffer size increase requires reworking how battery stats
  are retrieved, since it is going to be hitting IPC limits.
- Also, store the last full stats after a reset, to be reported
  at the next checkin.
- Also, discharge and charge times are tagged with the screen
  and battery save state during that time.

Change-Id: Ie108ac9b626846108a9bb858101ac2b93276ac16
2014-08-07 12:19:39 -07:00
Sandeep Siddhartha
6b8556d2e3 Dump the state of SoundTriggerHelper for bugreports
Change-Id: I01a17d969fbd22c6bcbb161e3542ca14a3f8c7c8
2014-08-07 12:10:48 -07:00
Behdad Esfahbod
ec2332121b Merge "Remove dependency on SkPaintOptionsAndroid" into lmp-dev 2014-08-07 18:49:59 +00:00
Derek Sollenberger
6f03023ece Remove dependency on SkPaintOptionsAndroid
Change-Id: I579a3503697efe3b8fd9bc809a6c9bfbf735cb1b
2014-08-07 14:38:51 -04:00
Sandeep Siddhartha
f30fc111a3 Merge "Handle microphone contention/Phone calls while recognition is active" into lmp-dev 2014-08-07 15:42:44 +00:00
Sandeep Siddhartha
cb4e81c7fe Handle microphone contention/Phone calls while recognition is active
Internally we pause the recognition when:
 - a phone call is active/off-hook/ringing
 - or some other application grabs the microphone

we auto-resume when the condition that caused us to pause reverses.

Both these events are notified to the client via callbacks so that they can choose to display on their UI,
that the recognition is paused for some reason.

Bug: 16515468
Bug: 16740806
Bug: 16514535
Change-Id: Ib274d68522c8cf37d42402c875b16159957657f0
2014-08-07 11:53:02 -07:00
Santos Cordon
8abea42490 Remove ldaps from AOSP code.
Bug: 16327484
Change-Id: I1fbeed8e1642e8228310cf0e7b95c4809b50901b
2014-08-07 11:37:52 -07:00
Sandeep Siddhartha
3da5ba05d6 Merge "Fix build break" into lmp-dev 2014-08-07 15:31:24 +00:00
Sandeep Siddhartha
db92e35211 Fix build break
Change-Id: I7af700671f1a2e910b6e08498381c8adb40631f8
2014-08-07 11:23:03 -07:00
Sandeep Siddhartha
256e1a6267 Handle same keyphrase for multiple users
Also notify the VIS of a change after finishing the change

Bug: 16816191
Change-Id: I6c96595819cd07182c3825c522d9bae559bb6814
2014-08-07 10:50:18 -07:00
Sandeep Siddhartha
a13104fe7d Merge "Read audio format from the recognition event" into lmp-dev 2014-08-07 15:31:24 +00:00
Sandeep Siddhartha
2178e2e085 Read audio format from the recognition event
Bug: 16549061
Change-Id: I9e418f7be67eb330b7bfaa97bbb90d0b5640469d
2014-08-07 10:48:51 -07:00
Adam Powell
9413b245a6 Nested pre-fling for AbsListView and ScrollView
Add nested pre-fling support to all framework widgets that currently
support nested fling.

Change-Id: Ieaf9d12938dbfeea779c2aee2f5a081c287c8e96
2014-08-07 10:24:04 -07:00
Jae Seo
579befecb2 TIF: Do not log non-searchable channel watch history
Bug: 16798476
Change-Id: Ic131009ad65a661331e4f8f0820c5c183a9f4986
2014-08-07 10:00:52 -07:00
Winson Chung
57c84544d9 Merge "Initial changes to add task affiliation styling. (Bug 16656169)" into lmp-dev 2014-08-07 15:27:35 +00:00
Winson Chung
ec396d6399 Initial changes to add task affiliation styling. (Bug 16656169)
- Fixing issue with launch-in-background animation
2014-08-07 17:57:25 +00:00
Christopher Tate
3432720bf9 Merge "Make TrafficStats uid attribution @SystemApi" into lmp-dev 2014-08-07 15:00:45 +00:00
Christopher Tate
a2496de37a Make TrafficStats uid attribution @SystemApi
Anything that runs as a singleton may need to attribute traffic to
various client apps; in particular, backup transports need to do this.
Apropos of which, introduce a @SystemApi method specifically for that
purpose, setThreadStatsTagBackup().

Bug 16661321

Change-Id: Id5d22e28bdc68edb53f2a1fdba80b144fcbc61d2
2014-08-07 19:43:20 +00:00
Christopher Tate
cbd7a6ecbb Introduce system API for distinguishing the owner user
Support services that special case the owner but are instantiated
per-user, and so need to be able to distinguish.

Bug 16661321

Change-Id: I7ff5168c91e39821317fdf5cfaba34e90d30de95
2014-08-07 19:43:17 +00:00
Kenny Guy
ae267d20c6 Merge "Revert "Remove String version of getBadgedLabel"" into lmp-dev 2014-08-07 09:28:12 +00:00
Kenny Guy
9962f335a1 Revert "Remove String version of getBadgedLabel"
This reverts commit ed0096c14ae1b17845bc9bb8fbb1cdc47adfdd68.

Change-Id: If026db7e804be81aaa02cfd2a4e1a0a03ee020f1
2014-08-07 16:48:06 +00:00
Kenny Guy
4a4f275f24 Remove String version of getBadgedLabel
It was left to allow unbundled apps time to update.

Bug: 16484455
Change-Id: Ibae2576ac7fc88000ec81c669e66536aaa2e3e79
2014-08-07 11:28:48 +00:00
Andy Hung
1ade85d68d Merge "Fix track sample rate limit" into lmp-dev 2014-08-06 23:49:20 +00:00