6609 Commits

Author SHA1 Message Date
Alan Viverette
f2ae40739a am 9a77c8a2: am 3c5cc234: am 674a3a21: Merge "Distinguish unspecified and explicit null values in resources" into lmp-mr1-dev
* commit '9a77c8a279bfe3293295ed77c775ea29b88b2916':
  Distinguish unspecified and explicit null values in resources
2014-10-31 00:25:37 +00:00
Alan Viverette
9b0ac44b41 am b50a6f39: am baed009e: am 2d3443fc: Merge "Add setters for window elevation and clipToOutline properties" into lmp-mr1-dev
* commit 'b50a6f39ca8bafee342852de50029077be47334f':
  Add setters for window elevation and clipToOutline properties
2014-10-31 00:01:21 +00:00
Tom Taylor
fe388319ab am d034f1a3: am b281c068: am de48e880: Merge "Add a missing mms_config constant to SmsManager" into lmp-mr1-dev
* commit 'd034f1a3d4add05970f7801abb4645d9f84abc16':
  Add a missing mms_config constant to SmsManager
2014-10-31 00:01:02 +00:00
Alan Viverette
571355d9f5 am 7d965566: am 73ab31f6: am 7a0ae7ed: Merge "Add content description to Toolbar collapse button" into lmp-mr1-dev
* commit '7d96556604046bb0c0f4e4c6e5ac4ca487cdbb06':
  Add content description to Toolbar collapse button
2014-10-30 23:59:43 +00: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
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
Chris Wren
e9b498fb41 am e52d0d68: am 402152d6: Merge "Reveal notification listener settings APIs." into lmp-mr1-dev automerge: b3239da
* commit 'e52d0d68c4c192340ef48a2c750babfd48c090e3':
  Reveal notification listener settings APIs.
2014-10-30 19:24:29 +00:00
Ihab Awad
07de9295f1 am ac2b7f75: am 6c37f374: Merge "PhoneAccounts include literal icon bitmap (1/4)" into lmp-mr1-dev automerge: 0ca329e
* commit 'ac2b7f75cc701722c7d41c0f2f79b2b3fcb66e9a':
  PhoneAccounts include literal icon bitmap (1/4)
2014-10-30 19:10:32 +00:00
John Spurlock
734666657f Unhide Settings.ACTION_BATTERY_SAVER_SETTINGS.
Bug: 18186862
Change-Id: I685934118a53ba2135eaf0872564e58069de2a30
2014-10-30 13:42:05 -04:00
Alan Viverette
f296940502 Distinguish unspecified and explicit null values in resources
BUG: 17919345
Change-Id: Ic4f04f7dd0f986f58a749b5950d80c1cfdb074ea
2014-10-29 17:09:36 -07:00
Alan Viverette
2d3443fc5a Merge "Add setters for window elevation and clipToOutline properties" into lmp-mr1-dev 2014-10-29 22:05:11 +00:00
Tom Taylor
4aa3684017 Add a missing mms_config constant to SmsManager
Bug 18079788

Change-Id: Ifb2040fb8f9e2a7390da74161539afcf3d6b03af
2014-10-29 14:30:37 -07:00
Alan Viverette
79c067c54a Add setters for window elevation and clipToOutline properties
These are available as XML attributes but were lacking setters. None
of the Window properties have getters, so just adding setters here.

BUG: 16847753
Change-Id: I9c032903e94b7f12125210bd73c911243612df69
2014-10-29 14:27:47 -07:00
Alan Viverette
7a0ae7ed31 Merge "Add content description to Toolbar collapse button" into lmp-mr1-dev 2014-10-29 18:00:12 +00:00
Chris Wren
402152d673 Merge "Reveal notification listener settings APIs." into lmp-mr1-dev 2014-10-29 14:54:18 +00:00
Alan Viverette
85085343b3 Add content description to Toolbar collapse button
BUG: 17722111
Change-Id: If6caa8bc61b0d178648952c419591380f4edf4ba
2014-10-28 16:42:24 -07:00
Ihab Awad
074bf104c8 PhoneAccounts include literal icon bitmap (1/4)
Change-Id: I9110d983c0ca6610075bd24975f1e90d123ef9c1
2014-10-28 15:56:29 -07:00
Wink Saville
78e652a5e4 Import translations. DO NOT MERGE
This is for lmp-sprout-dev only.

Hide SubscriptionManager and SubInfoRecord for lmp-sprout-dev branch

Change-Id: I5f299a7b200798ada9350bee2c1b26e6f74eaea1
2014-10-28 15:32:11 -07:00
Chris Wren
8326a8a945 Reveal notification listener settings APIs.
Fix the value of the ACTION_NOTIFICATION_LISTENER_SETTINGS constant
to be the actual value to which the settings app responds.

Bug: 10023397
Change-Id: I80a0ff76406a3b0b893793f9a63ffa563dae103b
2014-10-28 15:54:53 -04:00
Ying Wang
37b3e5f71b am 09c85903: Update current.txt with generics to field types. automerge: 80c9fbe automerge: bf43899
* commit '09c85903161e5e5d1606552f0a37fe64f981c8cf':
  Update current.txt with generics to field types.
2014-10-28 07:17:16 +00:00
Wink Saville
831296e84f am ae85478d: am 4dec130c: Merge "Change subId to int from long" into lmp-mr1-dev automerge: e5b4c12
* commit 'ae85478d3dbed145825293c307bde4213ff175f3':
  Change subId to int from long
2014-10-28 07:16:13 +00:00
Evan Charlton
b2dda69031 am 4d4b2cfd: am 2ad5eb53: Merge "Move telecom permission to the public API" into lmp-mr1-dev automerge: 8e25057
* commit '4d4b2cfd4c611800787b71d0896c6d8781875732':
  Move telecom permission to the public API
2014-10-28 07:16:08 +00:00
George Mount
5d0e36e692 am 8b92704f: am 03d5c6f5: Merge "Add resizeClip attribute to ChangeBounds." into lmp-mr1-dev automerge: 3437192
* commit '8b92704f021fa4f33fcac5a50442b2f5259d198b':
  Add resizeClip attribute to ChangeBounds.
2014-10-28 07:15:34 +00:00
Griff Hazen
732e4ecbee DO NOT MERGE Fix lmp-sprout-dev build for generics addition
Change-Id: I66f10264476df5504086a7fbc24d729798187d05
2014-10-27 19:19:22 -07:00
Ying Wang
80c9fbe36f Update current.txt with generics to field types.
Bug: 17014855
Change-Id: I14672092f79374f6c5b2362bd3c2aaac84e0c2ae
2014-10-27 17:42:04 -07:00
Ying Wang
475d7393bf Update current.txt with generics to field types.
automerge: 79775d4

* commit '79775d4bc4fa71994942dbd1d441aa62827c34be':
  Update current.txt with generics to field types.
2014-10-27 22:35:59 +00:00
Ying Wang
79775d4bc4 Update current.txt with generics to field types.
Bug: 17014855
Change-Id: I14672092f79374f6c5b2362bd3c2aaac84e0c2ae
2014-10-27 11:25:19 -07:00
Wink Saville
4dec130c39 Merge "Change subId to int from long" into lmp-mr1-dev 2014-10-27 17:34:47 +00:00
Evan Charlton
2ad5eb538d Merge "Move telecom permission to the public API" into lmp-mr1-dev 2014-10-27 17:08:33 +00:00
George Mount
b7573c2dba Add resizeClip attribute to ChangeBounds.
Bug 17765948

Added the XML attribute for the resizeClip property of
ChangeBounds. Also updated support for resizing a view
using its clip bounds and position to fix the TODO.

Change-Id: I358d07d6a28fed4b7f39f9ccb9d89b9325f64239
2014-10-24 16:21:01 -07:00
Evan Charlton
cef5a5404a Move telecom permission to the public API
Make REGISTER_PROVIDER_OR_SUBSCRIPTION and REGISTER_CONNECTION_MANAGER
part of the public API so that they can be used by third-party apps.

Bug: 18114695
Change-Id: I1b8578cbc82e95ea78b4a2166f4a23650a0c375f
2014-10-24 15:40:35 -07:00
Adrian Roos
8b70c1e29b am 621823e0: am 53f30ec2: am bcd07652: Add API for querying trusted state
* commit '621823e0641b883684e7f9e8c705f0dc69dd02ce':
  Add API for querying trusted state
2014-10-24 13:33:30 +00:00
Adrian Roos
bcd076525c Add API for querying trusted state
Bug: 18084166
Change-Id: Ic755461cc6978943aef4943def93a0e38a1c96c0
2014-10-24 13:59:45 +02:00
Narayan Kamath
9c7a0f59c4 am 0d50b5d0: am e572a77f: am fa36b36c: Merge "Deprecate more apache-http." into lmp-mr1-dev
* commit '0d50b5d0ee03ed6e71c105b519d3470dc173cda2':
  Deprecate more apache-http.
2014-10-24 10:46:03 +00:00
Narayan Kamath
5a00766055 am 8e5cf189: am 2f348393: am 7eafd944: Merge "Deprecate apache-http." into lmp-mr1-dev
* commit '8e5cf189f143e87c4bd0470f5709b2fd39c8a711':
  Deprecate apache-http.
2014-10-24 10:45:59 +00:00
Neil Fuller
4400f96d1f am a021e922: resolved conflicts for merge of 12260ad7 to lmp-mr1-dev-plus-aosp
* commit 'a021e922184ee16fc019e29c066719daa793dd2b':
  Deprecating FloatMath and Time
2014-10-24 10:41:46 +00:00
Narayan Kamath
fa36b36c8b Merge "Deprecate more apache-http." into lmp-mr1-dev 2014-10-24 08:58:45 +00:00
Narayan Kamath
7eafd944cd Merge "Deprecate apache-http." into lmp-mr1-dev 2014-10-24 08:56:56 +00:00
Neil Fuller
07ff2f72c8 Merge "Deprecating FloatMath and Time" into lmp-mr1-dev 2014-10-24 08:10:39 +00:00
Wink Saville
63f03dd94c Change subId to int from long
Change-Id: Idae6335e63e7b1e4e714bc17e71b1a4705e38474
2014-10-23 21:54:09 -07:00
Dongwon Kang
d53d07f6c4 am 27c7a7d0: Merge "TIF: Define more cannonical genres in TvContract" into lmp-mr1-dev automerge: f6df7bf automerge: d048789
* commit '27c7a7d06b488ad0b23ce02c88bc02b35ed8361e':
  TIF: Define more cannonical genres in TvContract
2014-10-24 03:28:29 +00:00
Dongwon Kang
f6df7bff53 Merge "TIF: Define more cannonical genres in TvContract" into lmp-mr1-dev 2014-10-24 02:24:18 +00:00
Svetoslav
8ec648c18f am eed63916: am bd6fabe2: Merge "APIs for an accessibility service to put interaction tracking overlays." into lmp-mr1-dev automerge: 89e7ffe
* commit 'eed63916a184b05fa8572c9a8151745d05777740':
  APIs for an accessibility service to put interaction tracking overlays.
2014-10-24 02:14:06 +00:00
Svetoslav
bd6fabe2ae Merge "APIs for an accessibility service to put interaction tracking overlays." into lmp-mr1-dev 2014-10-23 23:17:21 +00:00
Nancy Chen
a9224e074c am 225ace3b: am 1c3553b5: am c1d001c3: Merge "Fix build breakage because missing API methods." into lmp-mr1-dev
* commit '225ace3b2b39215c9264665d517c029a6dbf9e1f':
  Fix build breakage because missing API methods.
2014-10-23 22:44:32 +00:00
Yigit Boyar
ba4814a49c am ab43570f: am f3ab4410: am fa9ed8ca: Merge "Added a generic configuration and theme based cache" into lmp-mr1-dev
* commit 'ab43570f5db770e55a73ccff346b3e922443d126':
  Added a generic configuration and theme based cache
2014-10-23 22:18:17 +00:00
Nancy Chen
84300978a2 am 968c16ce: am 12be45d7: am 9016ecab: am 0145e17d: Merge "Add getter methods in SubInfoRecord for UI. Adapt PhoneAccount." into lmp-sprout-dev
* commit '968c16ce6dec72cb68618c28e6e4709bb0c5f8ca':
  Add getter methods in SubInfoRecord for UI. Adapt PhoneAccount.
2014-10-23 22:17:45 +00:00
Sreeram Ramachandran
6e0a3a4846 am 4573944e: am b9248a55: am b1df48e4: Merge "Add an API to select a network for a DatagramSocket." into lmp-mr1-dev
* commit '4573944e96cbe34de6bc549f8f313f070fcb7ace':
  Add an API to select a network for a DatagramSocket.
2014-10-23 22:17:28 +00:00
Nancy Chen
5fc3863655 Fix build breakage because missing API methods.
Add new API methods for PhoneAccount. This is because PhoneAccount
recently became public in mr1, but not in sprout.

Bug: 18078388
Change-Id: I0c74d13fa4eb274be499158c19891a5bc6c66464
2014-10-23 14:37:36 -07:00
Yigit Boyar
fa9ed8ca0a Merge "Added a generic configuration and theme based cache" into lmp-mr1-dev 2014-10-23 21:06:24 +00:00