Tyler Gunn
a94ae5e7e3
Remove TODO in TelecomManager.
...
Bug: 18095076
Change-Id: I6509d295e9e25973040e06be96cf1046edc619ff
2014-10-23 09:04:19 -07:00
Ricardo Cervera
ce3d72e4ad
am 8755d9a5: Merge "docs: Updating dependency vers nums for support libs." into lmp-dev
...
* commit '8755d9a5361d716433505e883986e8bf5f28d041':
docs: Updating dependency vers nums for support libs.
2014-10-23 15:43:48 +00:00
Ricardo Cervera
92ddea1894
am 30d0b242: Merge "docs: Support lib dependency fix. Bug: 18029377" into lmp-dev
...
* commit '30d0b24280abe4b2c5e1e20819d87f60d34964de':
docs: Support lib dependency fix. Bug: 18029377
2014-10-23 15:43:44 +00: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
Ricardo Cervera
8755d9a536
Merge "docs: Updating dependency vers nums for support libs." into lmp-dev
2014-10-23 15:10:09 +00:00
Ricardo Cervera
30d0b24280
Merge "docs: Support lib dependency fix. Bug: 18029377" into lmp-dev
2014-10-23 15:09:42 +00: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
Joe Fernandez
f6e297398b
am 3bd3a9c1: am 7c2bfa2e: Merge "docs: Add Wear App Quality checklist" into lmp-dev
...
* commit '3bd3a9c105301f1d7585479e4222807cdee521ab':
docs: Add Wear App Quality checklist
2014-10-23 08:02:56 +00:00
Trevor Johns
3ee2aa0fa3
am 5111993f: am fdb02fcf: Merge "Docs: Update /samples/new/index.html for Clockwork Beryl release" into lmp-dev
...
* commit '5111993f839a68519aa8ba39a2ed05d8dbe13f63':
Docs: Update /samples/new/index.html for Clockwork Beryl release
2014-10-23 08:02:53 +00:00
Joe Fernandez
e562ce35c9
am e30fdb59: am 16350261: Merge "docs: Add article describing Location API for Android Wear." into lmp-dev
...
* commit 'e30fdb596a5670a90482d8535352a33081784a8b':
docs: Add article describing Location API for Android Wear.
2014-10-23 08:02:49 +00:00
Joe Fernandez
3f16106c51
am ac0e00db: am eaee4693: Merge "docs:Build tools revisions 21.01 and 21.02" into lmp-dev
...
* commit 'ac0e00dbdf272595fe6032e0d7d52d2097850300':
docs:Build tools revisions 21.01 and 21.02
2014-10-23 08:02:45 +00:00
Eric Rowe
46ca296c53
am d2983ced: am 34766d9c: Merge "Add delay in ping connectivity test retry" into lmp-dev
...
* commit 'd2983ced58254f52d199981149c42a59642e59b2':
Add delay in ping connectivity test retry
2014-10-23 08:02:41 +00:00
smain@google.com
0c57361f3e
am 3e2502cb: am 32c820fa: update android workplace screenshot bug: 18038081
...
* commit '3e2502cbee68a4aa583227ea5328069275e6e192':
update android workplace screenshot bug: 18038081
2014-10-23 08:02:37 +00:00
Ye Wen
e6ac3c7119
am 4e0ba198: am 9d28487e: Merge "Disable Content-Disposition header for 53005 and 310120" into lmp-dev
...
* commit '4e0ba1988a66ed731b0100554dc17ff44a07d164':
Disable Content-Disposition header for 53005 and 310120
2014-10-23 08:02:34 +00:00
smain@google.com
b3cd9e8607
am b7db4ed0: am 9f987e0a: fix a few of the tags for helpouts compatibility
...
* commit 'b7db4ed08d8d03e317288a4739249b903b9d19a6':
fix a few of the tags for helpouts compatibility
2014-10-23 08:02:30 +00:00
smain@google.com
78e9926405
am 20e6a369: am 54504966: Merge "some fixes to TV App quality and TV games doc. add section to TV Games doc about controller instructions w/ template download. clarify use of <meta-data> tag and standardize headings per Training conventions." into lmp-dev
...
* commit '20e6a369da29877a5adb77b77a754eda9b7ac054':
some fixes to TV App quality and TV games doc. add section to TV Games doc about controller instructions w/ template download. clarify use of <meta-data> tag and standardize headings per Training conventions.
2014-10-23 08:02:26 +00:00
Nancy Chen
2ff9572992
am df0ace26: Merge "Add an option to set the selected phone account as the default. (1/3)" into lmp-sprout-dev
...
* commit 'df0ace26279f16beacdf9206cb2a8ecc126aecb7':
Add an option to set the selected phone account as the default. (1/3)
2014-10-23 08:02:23 +00:00
smain@google.com
6837b6afca
am c5c029e9: am 13eb86a1: Merge "add helpouts widget to first round of pages" into lmp-dev
...
* commit 'c5c029e91d2b4300ec39dde1b4511cd9bc59cfb8':
add helpouts widget to first round of pages
2014-10-23 08:02:19 +00:00
Joe Fernandez
3bd3a9c105
am 7c2bfa2e: Merge "docs: Add Wear App Quality checklist" into lmp-dev
...
* commit '7c2bfa2eae3d59b0a876e54c4c6b4f21ea997e89':
docs: Add Wear App Quality checklist
2014-10-23 07:55:41 +00:00
Trevor Johns
5111993f83
am fdb02fcf: Merge "Docs: Update /samples/new/index.html for Clockwork Beryl release" into lmp-dev
...
* commit 'fdb02fcf9c8b55252f4375c2f3e8b4872432cbc8':
Docs: Update /samples/new/index.html for Clockwork Beryl release
2014-10-23 07:55:38 +00:00
Joe Fernandez
e30fdb596a
am 16350261: Merge "docs: Add article describing Location API for Android Wear." into lmp-dev
...
* commit '16350261e0c491880be42a26bf53965c32e8dd0a':
docs: Add article describing Location API for Android Wear.
2014-10-23 07:55:34 +00:00
Joe Fernandez
ac0e00dbdf
am eaee4693: Merge "docs:Build tools revisions 21.01 and 21.02" into lmp-dev
...
* commit 'eaee4693814a1c3fbde06474a85570bbf228fc19':
docs:Build tools revisions 21.01 and 21.02
2014-10-23 07:55:31 +00:00
Eric Rowe
d2983ced58
am 34766d9c: Merge "Add delay in ping connectivity test retry" into lmp-dev
...
* commit '34766d9c3f88e864d37b5c2ece6218e83cd0fe7c':
Add delay in ping connectivity test retry
2014-10-23 07:55:27 +00:00
smain@google.com
3e2502cbee
am 32c820fa: update android workplace screenshot bug: 18038081
...
* commit '32c820fac0575b406acef688ce365d9c390fd93e':
update android workplace screenshot bug: 18038081
2014-10-23 07:55:23 +00:00
Ye Wen
4e0ba1988a
am 9d28487e: Merge "Disable Content-Disposition header for 53005 and 310120" into lmp-dev
...
* commit '9d28487e05b6f5b2c4d464467f932060de463067':
Disable Content-Disposition header for 53005 and 310120
2014-10-23 07:55:19 +00:00
smain@google.com
b7db4ed08d
am 9f987e0a: fix a few of the tags for helpouts compatibility
...
* commit '9f987e0ac7a410a38a57a69dad1a721324bce766':
fix a few of the tags for helpouts compatibility
2014-10-23 07:55:15 +00:00
smain@google.com
20e6a369da
am 54504966: Merge "some fixes to TV App quality and TV games doc. add section to TV Games doc about controller instructions w/ template download. clarify use of <meta-data> tag and standardize headings per Training conventions." into lmp-dev
...
* commit '545049665ce3b1cd5a8da44963f849e23aca4412':
some fixes to TV App quality and TV games doc. add section to TV Games doc about controller instructions w/ template download. clarify use of <meta-data> tag and standardize headings per Training conventions.
2014-10-23 07:55:12 +00:00
Takayuki Hoshi
b254ab6add
Fix a bug where LocationManager's addGpsStatusListener does not throw a
...
SecurityException if LocationManagerService.mGpsStatusProvider is null
even when ACCESS_FINE_LOCATION permission is not present.
Tested under Nexus 5 and Molly with lmp-mr1-dev build with
android.location2.cts.LocationManagerTest#testGpsStatusListener CTS
test case such that it has been modified to expect SecurityException
only from .addGpsStatusListener.
Bug: 18095673
Change-Id: I09f9e7224a3b0eab91001f5092f0ef6e0ada7b08
2014-10-23 16:46:02 +09:00
Joe Fernandez
7c2bfa2eae
Merge "docs: Add Wear App Quality checklist" into lmp-dev
2014-10-23 07:03:16 +00:00
Luan Nguyen
9aec78cafa
docs: Add Wear App Quality checklist
...
Change-Id: I81ef6b3283ffb4d924836a84b52bb04acb301649
2014-10-22 23:59:40 -07:00
Jae Seo
6c9b08478b
Merge "Update documentation for notifyTracksChanged() and notifyTrackSelected()" into lmp-mr1-dev
2014-10-23 06:51:09 +00:00
Jae Seo
8ddb01ec7b
Update documentation for notifyTracksChanged() and notifyTrackSelected()
...
Bug: 18090857
Change-Id: I339a222454612e0111e79725de596a73f4d406b8
2014-10-23 06:50:48 +00:00
Trevor Johns
fdb02fcf9c
Merge "Docs: Update /samples/new/index.html for Clockwork Beryl release" into lmp-dev
2014-10-23 06:15:33 +00: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
Joe Fernandez
16350261e0
Merge "docs: Add article describing Location API for Android Wear." into lmp-dev
2014-10-23 04:39:25 +00:00
Luan Nguyen
5aad2c9fb0
docs: Add article describing Location API for Android Wear.
...
Change-Id: I1956be7df8cc875270d45652d1b0d414b6395982
2014-10-22 21:36:02 -07:00
Trevor Johns
87cb043f5d
Docs: Update /samples/new/index.html for Clockwork Beryl release
...
Added SpeedTracker sample to list of new samples.
Change-Id: I88094149ab21b9a24f19bb7693bbce1187b625eb
2014-10-22 21:14:25 -07:00
Joe Fernandez
eaee469381
Merge "docs:Build tools revisions 21.01 and 21.02" into lmp-dev
2014-10-23 03:14:34 +00:00
Svet Ganov
d8bc6677e5
Merge "Optimize text rendering in accessibility mode." into lmp-mr1-dev
2014-10-23 01:55:44 +00:00
Eric Rowe
34766d9c3f
Merge "Add delay in ping connectivity test retry" into lmp-dev
2014-10-23 01:41:19 +00:00
Eric Rowe
58a3ddf5aa
Add delay in ping connectivity test retry
...
Change-Id: Id6e36f42b2a2d84605185780fb7a3f2144e7a9b9
2014-10-22 18:34:43 -07:00
Alan Viverette
e8f676c0e5
Merge "Use correct smooth scroll default duration" into lmp-mr1-dev
2014-10-23 01:29:06 +00:00
Alan Viverette
e1201e87f4
Merge "Lighten action bar on light theme, use secondary color for subtitle" into lmp-mr1-dev
2014-10-23 01:28:50 +00:00
smain@google.com
32c820fac0
update android workplace screenshot
...
bug: 18038081
Change-Id: I6cc59cf002000ee2c938e634ef3662fbba2c70cc
2014-10-22 17:58:50 -07:00
Nancy Chen
df0ace2627
Merge "Add an option to set the selected phone account as the default. (1/3)" into lmp-sprout-dev
2014-10-23 00:42:24 +00:00
Rich Slogar
b3ae31ac1f
docs:Build tools revisions 21.01 and 21.02
...
Change-Id: I220f35541e88bf3b5dba1981d7375ecece525e2b
2014-10-22 17:30:07 -07:00
Craig Mautner
105e8f3e9b
Merge "Fix dumpsys display apptoken ordering." into lmp-mr1-dev
2014-10-23 00:26:06 +00:00
Ye Wen
9d28487e05
Merge "Disable Content-Disposition header for 53005 and 310120" into lmp-dev
2014-10-23 00:23:28 +00:00
Alan Viverette
bd266fef81
Lighten action bar on light theme, use secondary color for subtitle
...
Also cleans up some code in ActionBarView.
BUG: 17987639
Change-Id: I7dcdf18748d6da5792900ab9a78775a0511f982a
2014-10-22 17:20:17 -07:00