157902 Commits

Author SHA1 Message Date
Tyler Gunn
2257fe8a75 Merge "Creating connections for conference event package participants." into lmp-mr1-dev
automerge: 450f904

* commit '450f9047ce716ac7b08583436922ad3948f909f1':
  Creating connections for conference event package participants.
2014-10-31 03:36:39 +00:00
Yohei Yukawa
d3f51271f5 Merge "Fix not to show a log with empty default ime" into lmp-mr1-dev
automerge: ba910df

* commit 'ba910dfaddb2e2926c9c52fbc6ca3f2f8cf1028b':
  Fix not to show a log with empty default ime
2014-10-31 03:35:40 +00:00
Mark Renouf
2182bf5ac8 am 3d875f80: am cf0f740e: (-s ours) If no display settings are matched, return the first one. DO NOT MERGE
* commit '3d875f804018ebd48189633bb48ad6083c953eed':
  If no display settings are matched, return the first one. DO NOT MERGE
2014-10-31 03:22:07 +00:00
Tyler Gunn
450f9047ce Merge "Creating connections for conference event package participants." into lmp-mr1-dev 2014-10-31 03:16:09 +00:00
Mark Renouf
3d875f8040 am cf0f740e: (-s ours) If no display settings are matched, return the first one. DO NOT MERGE
* commit 'cf0f740e39f79da3fc8367c61ed473273248e8c1':
  If no display settings are matched, return the first one. DO NOT MERGE
2014-10-31 03:13:21 +00:00
Yohei Yukawa
ba910dfadd Merge "Fix not to show a log with empty default ime" into lmp-mr1-dev 2014-10-31 03:09:05 +00:00
Adam Powell
5dd072d884 Allow swipe down to dismiss for ResolverDrawerLayout
Let the user swipe the intent resolver UI off of the screen to get rid
of it. So satisfying!

Also fix a bug where transitioning between touching the area outside
of the drawer to the drawer itself would misbehave or otherwise
dismiss when it shouldn't.

Bug 18026675

Change-Id: I456cc22b9575dc4c65e45154dc81201fe2045adc
2014-10-30 19:51:41 -07:00
Mark Renouf
cf0f740e39 If no display settings are matched, return the first one. DO NOT MERGE
Language changes will prevent previously saved display settings from
being loaded. This provides a fallback in the event a single entry exists
but does not match the current (localized) name of the Built-In Display.

BUG: 18130296
BUG: 18190800
Change-Id: Ibeff56045fc5713b9f79707dfb92bafc9fadd84f
2014-10-30 21:42:11 -04:00
Rich Slogar
96b245acf0 docs:studio-update-814
Change-Id: Ie20289d8ddeb9bace07f05fa79e89e9b850fa0b1
2014-10-30 17:31:33 -07:00
Jean-Michel Trivi
8fdb0d4def More AudioPolicy registration
Define new usage in AudioAttributes to describe "virtual" sources.
Maintain a registration string in AudioPolicy and AudioMix that
 is used for the address of the mix in the native policy manager.
AudioPolicy registration marks the audio policy configuration and
 the audio mixes as registered.
The AudioPolicy class is used as the factory for the AudioTrack
 and AudioRecord objects that are respectively used as the
 source and sink of the mixes created by the policy owner.

Bug 16009464

Change-Id: I8e5bd351495257597c513d22597e273fcabdbc55
2014-10-30 17:22:34 -07:00
Svetoslav
6c70290ff0 Adding APIs to enable apps to influence accessibility traversal.
Accessibility focus is a token that can be put on any view and is
entirely controlled by accessibility services which decide whether
to put accessibility focus on a given view and what the traversal
strategy is.

Currently accessibility service use the view tree structure for
traversal which does not always reflect the logical order and the
user experience is sub-optimal. In such cases apps should be able
to influence how they are traversed for accessibility.

This change adds the notion of an accessibilty traversal order.
If a view has next in the traversal, an accessibility service has
to traverse the content of this view before traversing the content
next one.

This change will enable accessibility service to move away from
using the view tree and use spatial location of the content while
app developers can also influence the treversal order.

bug:17319923

Change-Id: Ib67ae4577f30b2c96575c71538dc1afdea08bfd3
2014-10-30 16:55:53 -07:00
Alan Viverette
19745dc0f1 am 0c189ca5: Merge "Only draw AbsListView selector when focused or pressed" into lmp-mr1-dev
* commit '0c189ca5c4ee8a61c89d437ff22fd2628b353765':
  Only draw AbsListView selector when focused or pressed
2014-10-30 23:30:33 +00:00
George Mount
cfff54270b am 57928195: Merge "Fix NPE when snapshot ImageView uses ScaleType.MATRIX." into lmp-mr1-dev
* commit '57928195a89971e89273c4ef06397d78b0bd0233':
  Fix NPE when snapshot ImageView uses ScaleType.MATRIX.
2014-10-30 23:30:28 +00:00
Scott Rowe
dfeb60558e am b31c2b07: am 397eb67f: Merge "docs: Cherry pick from lmp-dev update screen shot Change-Id: I9eeed45c7dea9f1b988544c75a906f234a787905" into lmp-docs
* commit 'b31c2b07140481c2cd45367b16f77a710765bc85':
  docs: Cherry pick from lmp-dev update screen shot Change-Id: I9eeed45c7dea9f1b988544c75a906f234a787905
2014-10-30 23:29:18 +00:00
Alan Viverette
0c189ca5c4 Merge "Only draw AbsListView selector when focused or pressed" into lmp-mr1-dev 2014-10-30 23:15:13 +00:00
George Mount
57928195a8 Merge "Fix NPE when snapshot ImageView uses ScaleType.MATRIX." into lmp-mr1-dev 2014-10-30 23:11:53 +00:00
Scott Rowe
b31c2b0714 am 397eb67f: Merge "docs: Cherry pick from lmp-dev update screen shot Change-Id: I9eeed45c7dea9f1b988544c75a906f234a787905" into lmp-docs
* commit '397eb67fbf9af409406750ce58a16b64b4a6b1e2':
  docs: Cherry pick from lmp-dev update screen shot Change-Id: I9eeed45c7dea9f1b988544c75a906f234a787905
2014-10-30 23:06:18 +00:00
Scott Rowe
397eb67fbf Merge "docs: Cherry pick from lmp-dev update screen shot Change-Id: I9eeed45c7dea9f1b988544c75a906f234a787905" into lmp-docs 2014-10-30 22:55:20 +00:00
Mark Renouf
6497dd7325 am b5c5a0dc: am 7be03da0: (-s ours) Merge "Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE" into klp-modular-dev
* commit 'b5c5a0dc429d1d1944296bb9f1da403126fabcc5':
  Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE
2014-10-30 22:39:09 +00:00
Alan Viverette
e1f9f23110 am 685a8770: Merge "Fix inset check in ThreadedRenderer" into lmp-mr1-dev
* commit '685a8770c018d02080d29f18fcb9e50a182912aa':
  Fix inset check in ThreadedRenderer
2014-10-30 22:34:44 +00:00
Mark Renouf
b5c5a0dc42 am 7be03da0: (-s ours) Merge "Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE" into klp-modular-dev
* commit '7be03da0d4365346934c9d6672526119765d1047':
  Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE
2014-10-30 22:33:32 +00:00
Alan Viverette
685a8770c0 Merge "Fix inset check in ThreadedRenderer" into lmp-mr1-dev 2014-10-30 22:30:21 +00:00
Mark Renouf
7be03da0d4 Merge "Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE" into klp-modular-dev 2014-10-30 22:27:05 +00:00
Craig Mautner
3bfd2b7b8f am 159da3db: Merge "Add enter-animation-done callback for system windows" into lmp-mr1-dev
* commit '159da3dba8811017c683fcee26c795be1948b0c4':
  Add enter-animation-done callback for system windows
2014-10-30 22:15:57 +00:00
Craig Mautner
159da3dba8 Merge "Add enter-animation-done callback for system windows" into lmp-mr1-dev 2014-10-30 22:12:31 +00:00
Craig Mautner
9c79504225 Add enter-animation-done callback for system windows
Existing hidden methods allow activities to be notified when their
windows have completed animating in. This change adds that capability
to system windows using a ViewTreeObserver callback since system
windows lack an activity token.

The first subsystem to use this is the UserSwitchingDialog which was
previously using a 250 msec timeout to dismiss the dialog. That
deadline was often missed leaving the user with no dialog on the
screen during the transition.

Fixes bug 16661752.

Change-Id: I70789e0d9c07112f275e76fb82850926305f290d
2014-10-30 14:43:18 -07:00
Alex Klyubin
8e93f0c3bc Mention ECDHE_PSK bug in Javadoc of PskKeyManager.
Bug: 18144779
Change-Id: I50e1bb18456295170ef288ad089a0edad7f00ecf
2014-10-30 21:39:03 +00:00
Tyler Gunn
4a57b9b59b Creating connections for conference event package participants.
- Add "addExistingConnection" method to connection service which provides
a way for a connection service to notify telecom of a pre-existing
connection (connections are normally created through telecom).
- Modify TelephonyConferenceController to retrieve its state from a
multiparty connection in the conference (in the case of IMS calls, this
would be the ImsCall that manages the conference) instead of just taking
the first one.

Bug: 18057361
Change-Id: I26993aec54ecb0ce90ae6983fd3eed9d8d0a5773
2014-10-30 14:27:48 -07:00
Alan Viverette
d93421b143 am afffc5c2: Merge "Remove scroll view from correct parent in AlertController" into lmp-mr1-dev
* commit 'afffc5c29adafc6a4c0b33834b2e016be02ee7bd':
  Remove scroll view from correct parent in AlertController
2014-10-30 21:13:17 +00:00
Alan Viverette
afffc5c29a Merge "Remove scroll view from correct parent in AlertController" into lmp-mr1-dev 2014-10-30 21:09:19 +00:00
Mark Renouf
e69bebd5aa Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE
BUG: 18130296
Change-Id: Iaee21a45e8e84c6bf8d99b04382e43ec12606ce6
2014-10-30 21:03:25 +00:00
Guang Zhu
3a68e1811f am 4ba4e03e: Merge "also add backtraces of CPUs before watchdog kills system server" into lmp-mr1-dev
* commit '4ba4e03e6b8dcb556774b323429f8904676cd615':
  also add backtraces of CPUs before watchdog kills system server
2014-10-30 21:00:34 +00:00
Guang Zhu
4ba4e03e6b Merge "also add backtraces of CPUs before watchdog kills system server" into lmp-mr1-dev 2014-10-30 20:56:40 +00:00
Alan Viverette
35c3cb6a59 Remove scroll view from correct parent in AlertController
BUG: 18191700
Change-Id: I37602fc26d103b76021f00c58f03bc32d7a978fe
2014-10-30 13:51:21 -07:00
Santos Cordon
52e34e6a62 am c1c86151: Merge "More updates to javadocs for Telecom APIs." into lmp-mr1-dev
* commit 'c1c86151b033a2c866c10970553b567dfb359ba9':
  More updates to javadocs for Telecom APIs.
2014-10-30 20:05:30 +00:00
Santos Cordon
c1c86151b0 Merge "More updates to javadocs for Telecom APIs." into lmp-mr1-dev 2014-10-30 20:01:40 +00:00
David Friedman
62b532c7f4 am d2d8c553: am e91c37de: Fixes wrongly nested braces. Bug: 17499985
* commit 'd2d8c55304438accd9589eaa0cb49fcaae3e54cd':
  Fixes wrongly nested braces. Bug: 17499985
2014-10-30 20:01:13 +00:00
David Friedman
d2d8c55304 am e91c37de: Fixes wrongly nested braces. Bug: 17499985
* commit 'e91c37de784babbe879c78c83817b99d54b61d2f':
  Fixes wrongly nested braces. Bug: 17499985
2014-10-30 19:56:37 +00:00
George Mount
1fb941dd4f Ensure views are attached prior to starting enter transition.
Bug 17964119

Change-Id: Ic4ecd5aa9a3bbe5565381b8d9b3c79dd47720e5d
2014-10-30 12:30:12 -07:00
Santos Cordon
3ae9505f67 am 9acb9598: Merge "Even more javadocs for telecom." into lmp-mr1-dev
* commit '9acb9598b7bd18003ee3abe656818972dad03a29':
  Even more javadocs for telecom.
2014-10-30 19:29:07 +00:00
Santos Cordon
9acb9598b7 Merge "Even more javadocs for telecom." into lmp-mr1-dev 2014-10-30 19:25:40 +00:00
Alan Viverette
3aa1ffbc75 Fix inset check in ThreadedRenderer
BUG: 17729606
Change-Id: I9303a788968b424fd8ca27fe4bb99bab51ec34a7
2014-10-30 12:22:08 -07:00
George Mount
ca5094a05c Fix NPE when snapshot ImageView uses ScaleType.MATRIX.
Bug 18170774

Change-Id: I28497f569f8a40242191196f059d8f40d17d52d6
2014-10-30 12:21:00 -07:00
David Friedman
e91c37de78 Fixes wrongly nested braces.
Bug: 17499985

Change-Id: I6dc7abb14c06462a3eb9be3cb15d8baf11115323
2014-10-30 11:55:53 -07:00
Selim Cinek
db885e22bd am a68da938: Merge "Fixed a bug with notification clipping" into lmp-mr1-dev
* commit 'a68da9382996132bb41d6f60b87a3bd5f8028b45':
  Fixed a bug with notification clipping
2014-10-30 18:40:00 +00:00
Selim Cinek
a68da93829 Merge "Fixed a bug with notification clipping" into lmp-mr1-dev 2014-10-30 18:33:14 +00:00
Alan Viverette
f7dee54b62 Only draw AbsListView selector when focused or pressed
BUG: 18176135
Change-Id: Ibd9d9c0f439e5daa8eba606abc5ff055a3d8ff0c
2014-10-30 11:26:29 -07:00
Guang Zhu
0620c451da also add backtraces of CPUs before watchdog kills system server
Bug: 18003452
Change-Id: I052fe0b2948ea036c3f1b842ea6270b6f11eadef
2014-10-30 18:25:05 +00:00
John Spurlock
a0adb0bd46 am fc2b9039: Merge "Unhide Settings.ACTION_BATTERY_SAVER_SETTINGS." into lmp-mr1-dev
* commit 'fc2b9039b87afd3067f563a9bf59504a8bdf8a87':
  Unhide Settings.ACTION_BATTERY_SAVER_SETTINGS.
2014-10-30 18:19:48 +00:00
Selim Cinek
c5baa3eb08 Fixed a bug with notification clipping
The clip rect was not correctly set for a view which
was fading out leading to some overdraw.
It also fixes a bug where the alpha was not applied when
made invisible.

Bug: 16077953
Change-Id: I4c26aee88c5c87147df31ec7fb413bc63cd2625c
2014-10-30 19:19:26 +01:00