144265 Commits

Author SHA1 Message Date
Eric Laurent
212532b58e AudioService: implement TV system volume
Implement volume policy for TV devices:
- No ringer mode: never silent
- All stream volumes are synchronized: changing any
stream volume will change the volume for all sources.
- Volume is maintained per output device.
- If a CEC capable HDMI sink is connected, digital volume
is maxed out and volume controls are sent to HDMI sink.

Bug: 15759753.

Change-Id: Ic4c38c749ef0440def9635a1669068ccef02a323
2014-07-24 23:24:26 +00:00
Selim Gurun
ab29dfe7c1 am 773433af: Merge "Address API review" into lmp-dev
* commit '773433af8196217e744752bdcd18be3b632a6f38':
  Address API review
2014-07-24 22:42:44 +00:00
John Spurlock
183d10b162 am a20b6388: Merge "QS: Handle all camera api exceptions during init." into lmp-dev
* commit 'a20b63882407656b01062088861071e4a9ebe380':
  QS: Handle all camera api exceptions during init.
2014-07-24 22:17:54 +00:00
Anish Athalye
8020721059 Merge "Fix bug in measurement of paragraphs" into lmp-dev 2014-07-24 22:06:48 +00:00
Anish Athalye
c14b3ada5c Fix bug in measurement of paragraphs
This fixes b/16510772.

When measuring paragraphs, leading margins should be taken into account.
When computing line width, the margin should be added to the absolute
value of the extent (there were missing parenthesis). Both of these
caused views with leading margins to be rendered incorrectly.

Change-Id: I5029b2790a249192a858eb226d7b793d0622a70d
2014-07-25 17:55:46 +00:00
Raph Levien
1d97d39879 Merge "Fix docs build breakage in #TextView_letterSpacing" into lmp-dev 2014-07-24 22:06:48 +00:00
Raph Levien
40d83df87e Fix docs build breakage in #TextView_letterSpacing
This patch removes the @hide annotations and public reference from the
new letterSpacing attribute, so the docs will build. It's still not an
ideal state because a test app can't find the attribute, but at least it
unbreaks the build.

Change-Id: I5425fbe3d63f7a759fabe43bd2136196c7112eed
2014-07-24 22:46:09 -07:00
Zhijun He
dd3bcd7bb7 Merge "MediaFormat: add capture rate key" into lmp-dev 2014-07-24 22:06:48 +00:00
Zhijun He
86c545ea8c MediaFormat: add capture rate key
Change-Id: I2f7dd244d41d52aab6a172ae5df3e1fce3edd694
2014-07-25 00:52:42 +00:00
Alan Viverette
ccf9fca471 Merge "Clip windows to their background by default" into lmp-dev 2014-07-24 22:06:48 +00:00
Alan Viverette
07470537df Clip windows to their background by default
BUG: 16549166
Change-Id: I4ed0f60316df02b6ee56e163ad25e27e1396a6ae
2014-07-24 16:18:53 -07:00
Alan Viverette
366c693b60 Merge "Fix radio button tints" into lmp-dev 2014-07-24 22:06:48 +00:00
Alan Viverette
c734dafb21 Fix radio button tints
BUG: 16513084
Change-Id: I0cda30f25c54a3d9814bbbb4578893734efb5d82
2014-07-25 00:15:11 +00:00
Alan Viverette
f43192c845 Merge "Separate background from ripple for better focus/press UX" into lmp-dev 2014-07-24 22:06:48 +00:00
Alan Viverette
6ce6d70f9c Separate background from ripple for better focus/press UX
Regresses the "jump" when focus changes, since the background position
is static and we don't have any reasonable UX spec for this yet.

BUG: 16323640
Change-Id: I7152546ed08375864174049b342653b3c4d3d9fb
2014-07-24 16:31:42 -07:00
Chelsea Derrick
2f862eb4c0 Merge "Also unhide WifiConfiguration.lastUpdatedUid." into lmp-dev 2014-07-24 22:06:48 +00:00
Selim Gurun
c5a1e2c872 Merge "Address API review" into lmp-dev 2014-07-24 22:06:48 +00:00
Selim Gurun
48f6c45069 Address API review
Bug: 16403458

Address API review. This change updates the FileChooser api. The
largest change is, as requested by API council, providing a helper
to reduce the code app developers need to implement. This
change does not include the CookieManager changes that was requested.

Change-Id: I30d75f36df6bc96d9842b63fdd25c4ff62aee5bb
2014-07-24 15:18:57 -07:00
John Reck
b06650720e am 7f6c99df: Merge "fix build" into lmp-dev
* commit '7f6c99df4a1c1829a7bf40d5f19c041db9926b98':
  fix build
2014-07-24 21:52:52 +00:00
Robert Greenwalt
6482beb588 am 457a09d5: Merge "Fix DUN-based tethering." into lmp-dev
* commit '457a09d5af90d6e452a9c20606884fd75455ae0c':
  Fix DUN-based tethering.
2014-07-24 21:52:49 +00:00
Chelsea Derrick
eb8f329a5e Also unhide WifiConfiguration.lastUpdatedUid.
Bug: 16153258
Change-Id: I69c2666a63c3e56787c4aa2699c2cfd22c053353
2014-07-24 14:50:06 -07:00
Yao Chen
17e20859ec am 5599c63b: Use a sequence number for thumbnail callback.
* commit '5599c63b69b07990d1a4a25bbad4cf0eed31c146':
  Use a sequence number for thumbnail callback.
2014-07-24 21:48:04 +00:00
Yao Chen
80bb169d0f Use a sequence number for thumbnail callback.
Change-Id: I27888cd0437b4f654cb29371b7d86b9341d84ae9
2014-07-24 21:40:40 +00:00
John Reck
32e4a73238 am c8f0e9b1: Fix ALL compile warnings
* commit 'c8f0e9b1319e6db54074905178a80eff5c95a220':
  Fix ALL compile warnings
2014-07-24 21:32:49 +00:00
John Reck
1aa5d2d706 Fix ALL compile warnings
All warnings/errors fixed for GCC & Clang

Change-Id: I2ece3a136a5ae97a9acc3069537ed986238b5fd3
2014-07-24 14:28:08 -07:00
George Mount
0550d06d50 am fc687570: Merge "Fix no transition when only shared element exists." into lmp-dev
* commit 'fc687570c437d938f7849fda314b4743e7315adc':
  Fix no transition when only shared element exists.
2014-07-24 21:21:46 +00:00
Jean-Michel Trivi
27762fc336 am a71bb88d: Merge "Remove MediaFocusControl persisting media button receiver" into lmp-dev
* commit 'a71bb88da69813a9f8f77a852e80960cba35f87b':
  Remove MediaFocusControl persisting media button receiver
2014-07-24 21:15:20 +00:00
Baligh Uddin
c69281b9eb am ee7df0a3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit 'ee7df0a31234c9490f7384edf66900d82eec2533':
  Import translations. DO NOT MERGE
2014-07-24 21:11:08 +00:00
Baligh Uddin
20f42ae428 am a81e8b66: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit 'a81e8b66f03f746682c16365e4e86f3d75cc294d':
  Import translations. DO NOT MERGE
2014-07-24 21:11:05 +00:00
Craig Mautner
6d4e83690b am b803a2be: Refactor screen blocking logic.
* commit 'b803a2be0f54e7b4f1b5f606dbda4dbf86307f12':
  Refactor screen blocking logic.
2014-07-24 20:51:59 +00:00
Alan Viverette
54027f1758 am 37a2d88f: Merge "Remove the max ripple count exceeded warning" into lmp-dev
* commit '37a2d88f2616282ab8c06c89c334e3e8af8adc6c':
  Remove the max ripple count exceeded warning
2014-07-24 20:51:55 +00:00
Craig Mautner
6714e86a54 Refactor screen blocking logic.
Because of the call to turn on the screen introduced in ag/495255
is now made earlier we may not have sent the wakeup broadcast by
the time the windows have all drawn. In such a case onScreenOn()
did not release the wakelock and the screen stayed off.

This change ensures that no matter the timing of onScreenOn()
the wakelock will be released but only for the onScreenOn()
called in response to the most recent screen on transition.

Fixes bug 16404078.

Change-Id: Ic1e3e61e16c1fc34d4ec657e0e53ac49a05ca6a4
2014-07-24 20:49:57 +00:00
Jon Miranda
1a0449eb1d Merge "Animates AbsSeekBar progress movement from key presses." into lmp-dev 2014-07-24 20:48:02 +00:00
Jon Miranda
0c11a48907 Animates AbsSeekBar progress movement from key presses.
Change-Id: I9ef00c61351e8fe28be7a7a7d592f09a5124caa0
2014-07-25 00:47:55 +00:00
Christopher Tate
db573fc0bb Merge "A couple of restore fixes:" into lmp-dev 2014-07-24 20:48:02 +00:00
Christopher Tate
7ff106c20d A couple of restore fixes:
* Fix crasher after transport-level failure attempting to ask for
  the name of the next package to be restored

* Current-dataset single-package restore path no longer requires
  that the package have its own backup agent.

Bug 16548983

Change-Id: Id37f2f0e6075d53c414d9a997bf738bbf0cfff8b
2014-07-24 18:58:23 -07:00
Craig Mautner
a0bb44efe9 Merge "Finish crashed activities immediately" into klp-modular-dev 2014-07-24 20:48:02 +00:00
Sreeram Ramachandran
ba6e4c60e7 Merge "Don't create a ConnectivityManager when the service isn't ready yet." into lmp-dev 2014-07-24 20:48:02 +00:00
Sreeram Ramachandran
62a61314bc Don't create a ConnectivityManager when the service isn't ready yet.
Bug: 16550853
Change-Id: Ib244c93dc982cbfe5d065a20e4b8f0aeefb15b8f
2014-07-24 16:26:59 -07:00
wsmlby
194124965f Merge "Add memory tracking for persistent proccesses and launcher" into lmp-dev 2014-07-24 20:48:02 +00:00
wsmlby
6c77e104bc Add memory tracking for persistent proccesses and launcher
Change-Id: I5228bd67884dc8b77207a597f279fd4032c7f9d9
2014-07-24 15:58:54 -07:00
Prashant Malani
886de6d1e6 Merge "resolved conflicts for merge of bc3699b1 to lmp-dev" into lmp-dev 2014-07-24 20:48:02 +00:00
Prashant Malani
85d5144984 resolved conflicts for merge of bc3699b1 to lmp-dev
Change-Id: I1b219b5b48afb08ce3704a4f064a85652d2d9339
2014-07-24 15:29:27 -07:00
Baligh Uddin
b3bb0e3f0d Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-07-24 20:48:02 +00:00
George Mount
71d34ec5be Merge "Fix no transition when only shared element exists." into lmp-dev 2014-07-24 20:48:02 +00:00
Alan Viverette
5792029f54 am d2a2e3bb: Merge "Update icons for search and back" into lmp-dev
* commit 'd2a2e3bb818eb9009782dd7d399514e43fed7cba':
  Update icons for search and back
2014-07-24 20:45:40 +00:00
Adam Lesinski
2463884a91 am 94499248: Merge "Add <feature-group> tag and change aapt badging" into lmp-dev
* commit '94499248f296e62dbb19ebae5a219a936afcfd53':
  Add <feature-group> tag and change aapt badging
2014-07-24 20:34:11 +00:00
Craig Mautner
8e5b133bf6 Finish crashed activities immediately
By finishing crashed activities right away the VirtualDisplays
associated with ActivityView are removed immediately rather than
being deferred. Also there is no waiting for Pause (0.5 sec) and
Destroy (10 sec) timeouts to expire.

Fixes bug 15092354.

Change-Id: Ie4941cb19dcc6f6fc61b2475162ea2794c9558a2
2014-07-24 13:32:37 -07:00
George Mount
b4c5d7bf21 Fix no transition when only shared element exists.
Bug 16245703

Change-Id: Ie31baaf7f58038fc79ffca0206ce3bec0ef64cb4
2014-07-24 13:19:51 -07:00
Prerepa Viswanadham
3f10f58d28 am 6565c129: cleanup : delete BLE advertising related hidden state references in Bluetooth Adapter
* commit '6565c12905b959401c2f9d3cb123e200bb7ce0e2':
  cleanup : delete BLE advertising related hidden state references in Bluetooth Adapter
2014-07-24 19:32:41 +00:00