drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
180,898 Commits 1 Branch 0 Tags
Commit Graph

9637 Commits

Author SHA1 Message Date
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
Nancy Chen
9016ecab3b am 0145e17d: Merge "Add getter methods in SubInfoRecord for UI. Adapt PhoneAccount." into lmp-sprout-dev 
* commit '0145e17db742dff963ea581bc944f99358d2dace':
  Add getter methods in SubInfoRecord for UI. Adapt PhoneAccount.
 2014-10-23 19:49:25 +00:00
Sreeram Ramachandran
b1df48e469 Merge "Add an API to select a network for a DatagramSocket." into lmp-mr1-dev 2014-10-23 19:10:24 +00:00
Yigit Boyar
d422dc358f Added a generic configuration and theme based cache 
For now, only animators use it but we can consider migrating
drawable cache to it as well.

Bug: 17456416
Change-Id: I571b96856805edb171f0fc52e6bff5a365f46b70
 2014-10-23 11:46:01 -07:00
Narayan Kamath
823675fdbb Deprecate more apache-http. 
bug: 18067888

Change-Id: I50511d53dfc9ae236dfb1646c55a5dd7fa15d7b2
 2014-10-23 17:43:05 +01:00
Sreeram Ramachandran
e15db7c23d Add an API to select a network for a DatagramSocket. 
Mirrors the API that does this for Sockets.

Bug: 18076907
Change-Id: Ifa27b39e23797558546aab751fbfb3aed3b7dbcb
 2014-10-23 08:37:33 -07:00
Neil Fuller
bbf8871e1c Deprecating FloatMath and Time 
Bug: https://code.google.com/p/android/issues/detail?id=36199
Bug: https://code.google.com/p/android/issues/detail?id=37653
Bug: https://code.google.com/p/android/issues/detail?id=42750
Bug: https://code.google.com/p/android/issues/detail?id=61137
Bug: https://code.google.com/p/android/issues/detail?id=74754
Bug: https://code.google.com/p/android/issues/detail?id=76386
Bug: https://code.google.com/p/android/issues/detail?id=76439
Bug: https://code.google.com/p/android/issues/detail?id=77836
Change-Id: Ic9b57d8a575f93b2258a5481df0ed6b3a952f636
 2014-10-23 13:13:05 +01:00
Narayan Kamath
2acb2b1076 Deprecate apache-http. 
bug: 18067888
Change-Id: Ic066527b070cd662c618c8417431919f0850d57a
 2014-10-23 13:07:39 +01:00
Nancy Chen
3ace54b895 Add getter methods in SubInfoRecord for UI. Adapt PhoneAccount. 
Settings and Dialer need label, icon, and color for UI display of
subscriptions/SIMs. Add getters for these methods in SubInfoRecord. Sets
up for the following changes:
+ getIcon will return a drawable instead of a resource ID
+ getColor will return a color value instead of an index
PhoneAccount will also be adding these changes which will be adopted
from SubInfoRecord. Adds changes that were reverted from ag/563976.

Bug: 17971273
Change-Id: Ie2beedf8475c6deb48a6ab83bc9656c1142cc004
 2014-10-22 21:44:45 -07:00
Wale Ogunwale
8c5304a95d am cbe7f818: am 1546422e: am d0aae5a2: Merge "Fix issue #17789629: PopupWindow overlaps with navigation bar." into lmp-mr1-dev 
* commit 'cbe7f81819ca4ffb4da53e29121911fc35be0eee':
  Fix issue #17789629: PopupWindow overlaps with navigation bar.
 2014-10-22 22:51:40 +00:00
Wale Ogunwale
d0aae5a222 Merge "Fix issue #17789629: PopupWindow overlaps with navigation bar." into lmp-mr1-dev 2014-10-22 22:17:19 +00:00
Ye Wen
f44d5e84e2 am 3356b478: am 9921a1db: am 91590bae: Merge "Send HTTP status code back in case of MMS HTTP failure (1/3)" into lmp-mr1-dev 
* commit '3356b4780ca177b9824b1bcebfc9ede6a5cf2640':
  Send HTTP status code back in case of MMS HTTP failure (1/3)
 2014-10-22 18:20:24 +00:00