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

180897 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Derek Sollenberger
b3d50e0075 Rename Canvas::getSkCanvas to Canvas::asSkCanvas 
Change-Id: I967a45698d382e54eaa5ff64fa8909ff00908650
 2015-01-29 11:25:55 -05:00
Brian Attwell
7ba4751e91 Merge "Add Insert.EXTRA_{ACCOUNT,DATA_SET} to API. P #1/2" 2015-01-27 00:50:01 +00:00
Brian Attwell
63f859b2b7 Add Insert.EXTRA_{ACCOUNT,DATA_SET} to API. P #1/2 
Names are based on recent suggestions from the API council, such as
implemented inside ag/540453.

Bug: 18777272
Change-Id: I17a5b7cb4d4c5a0ba48936a6fc829acaab73f31d
 2015-01-27 00:05:07 +00:00
Lorenzo Colitti
cd4c8525fa am 3d992507: am 09dff843: Merge "Only try to fetch time from NTP if there is a network connection." into lmp-mr1-dev 
automerge: 583dec8

* commit '583dec84d95b69216b4f91dd31397dc5f32f4e95':
  Only try to fetch time from NTP if there is a network connection.
 2015-01-26 22:24:23 +00:00
Lorenzo Colitti
583dec84d9 am 3d992507: am 09dff843: Merge "Only try to fetch time from NTP if there is a network connection." into lmp-mr1-dev 
* commit '3d992507a09b4d32c1e961a99d77027db050f01b':
  Only try to fetch time from NTP if there is a network connection.
 2015-01-26 22:22:27 +00:00
Lorenzo Colitti
3d992507a0 am 09dff843: Merge "Only try to fetch time from NTP if there is a network connection." into lmp-mr1-dev 
* commit '09dff843b8ed402564c4c89d7e1cabceb715e458':
  Only try to fetch time from NTP if there is a network connection.
 2015-01-26 22:16:03 +00:00
Lorenzo Colitti
09dff843b8 Merge "Only try to fetch time from NTP if there is a network connection." into lmp-mr1-dev 2015-01-26 22:08:19 +00:00
Yorke Lee
3d62078498 am 6d4a6845: Merge "Update system-api for new getLine1Number() method." into lmp-mr1-dev automerge: 8df7f43 
automerge: bfe3c35

* commit 'bfe3c357043badac546fbf84d28ee8a81ccc1208':
  Update system-api for new getLine1Number() method.
 2015-01-26 21:59:12 +00:00
Yorke Lee
bfe3c35704 am 6d4a6845: Merge "Update system-api for new getLine1Number() method." into lmp-mr1-dev automerge: 8df7f43 
* commit '6d4a68457c957e2c35940dbf630ea47900700e03':
  Update system-api for new getLine1Number() method.
 2015-01-26 21:57:35 +00:00
Sarah Maddox
5b53481a86 am 83f40802: am 95226c98: am 912cacde: Merge "docs: Adds new geocoding sample to Location API training. Uses GoogleApiClient to connect to Play services. Uses the latest Fused Location Provider API." into lmp-docs automerge: f31eb13 automerge: 1c10480 
automerge: 77a7fea

* commit '77a7feac6c8832f8162d2339925a12434186eac2':
  docs: Adds new geocoding sample to Location API training. Uses GoogleApiClient to connect to Play services. Uses the latest Fused Location Provider API.
 2015-01-26 21:54:35 +00:00
Yorke Lee
6d4a68457c Merge "Update system-api for new getLine1Number() method." into lmp-mr1-dev 
automerge: 8df7f43

* commit '8df7f4368425f24f46bb8605dd3d1e3d3b97e6ad':
  Update system-api for new getLine1Number() method.
 2015-01-26 21:52:24 +00:00
Yorke Lee
8df7f43684 Merge "Update system-api for new getLine1Number() method." into lmp-mr1-dev 2015-01-26 21:47:56 +00:00
Craig Mautner
1de57d883e resolve merge conflicts of 2322ea5 to master. 
Change-Id: I1570e633bf0d552a32d7fa9a2e0ebd81953f632b
 2015-01-26 13:45:12 -08:00
Sarah Maddox
77a7feac6c am 83f40802: am 95226c98: am 912cacde: Merge "docs: Adds new geocoding sample to Location API training. Uses GoogleApiClient to connect to Play services. Uses the latest Fused Location Provider API." into lmp-docs automerge: f31eb13 
automerge: 1c10480

* commit '1c104802f9295afa565e0d62edac5f26b21b9916':
  docs: Adds new geocoding sample to Location API training. Uses GoogleApiClient to connect to Play services. Uses the latest Fused Location Provider API.
 2015-01-26 20:42:57 +00:00
Sarah Maddox
1c104802f9 am 83f40802: am 95226c98: am 912cacde: Merge "docs: Adds new geocoding sample to Location API training. Uses GoogleApiClient to connect to Play services. Uses the latest Fused Location Provider API." into lmp-docs 
automerge: f31eb13

* commit 'f31eb13b8ef5dbdf82955ca52eb74cd6fc5cff47':
  docs: Adds new geocoding sample to Location API training. Uses GoogleApiClient to connect to Play services. Uses the latest Fused Location Provider API.
 2015-01-26 20:39:27 +00:00
Nancy Chen
c059271ca4 Update system-api for new getLine1Number() method. 
Add new method in TelecomManager to system-current.txt.

Bug: 19087382
Change-Id: Id6db61fed45301cc1a15ded6e362d7858f24a273
 2015-01-26 12:35:35 -08:00
Sarah Maddox
f31eb13b8e am 83f40802: am 95226c98: am 912cacde: Merge "docs: Adds new geocoding sample to Location API training. Uses GoogleApiClient to connect to Play services. Uses the latest Fused Location Provider API." into lmp-docs 
* commit '83f40802148e922d78222ffc56377534b8ee92be':
  docs: Adds new geocoding sample to Location API training. Uses GoogleApiClient to connect to Play services. Uses the latest Fused Location Provider API.
 2015-01-26 20:35:06 +00:00
Sarah Maddox
83f4080214 am 95226c98: am 912cacde: Merge "docs: Adds new geocoding sample to Location API training. Uses GoogleApiClient to connect to Play services. Uses the latest Fused Location Provider API." into lmp-docs 
* commit '95226c981b4e14a900f7c4224534d370aeb1ca60':
  docs: Adds new geocoding sample to Location API training. Uses GoogleApiClient to connect to Play services. Uses the latest Fused Location Provider API.
 2015-01-26 20:30:14 +00:00
Sarah Maddox
95226c981b am 912cacde: Merge "docs: Adds new geocoding sample to Location API training. Uses GoogleApiClient to connect to Play services. Uses the latest Fused Location Provider API." into lmp-docs 
* commit '912cacde8619d28ea1d4a3f6ebf30be1c8a5d47a':
  docs: Adds new geocoding sample to Location API training. Uses GoogleApiClient to connect to Play services. Uses the latest Fused Location Provider API.
 2015-01-26 20:23:25 +00:00
Sarah Maddox
912cacde86 Merge "docs: Adds new geocoding sample to Location API training. Uses GoogleApiClient to connect to Play services. Uses the latest Fused Location Provider API." into lmp-docs 2015-01-26 20:16:37 +00:00
Craig Mautner
2322ea558e am 8995e140: Merge "Add reason string for bringing stack to front" into lmp-mr1-dev 
automerge: afc6d33

* commit 'afc6d332790166943302f051d32ec0874d9280aa':
  Add reason string for bringing stack to front
 2015-01-26 20:11:58 +00:00
Craig Mautner
afc6d33279 am 8995e140: Merge "Add reason string for bringing stack to front" into lmp-mr1-dev 
* commit '8995e140ad557c9f3f4667becbaaf0ba4c667638':
  Add reason string for bringing stack to front
 2015-01-26 20:09:48 +00:00
Ricardo Cervera
e20b9941ae am ba70d548: am 9c9dc80a: am df07000e: am d064ce7e: am edb7a442: Merge "docs: Wear DataItem listener improvements" into lmp-docs 
automerge: 16325bd

* commit '16325bda7f8afd70a2a1c8444fcc578f451fa00c':
  docs: Wear DataItem listener improvements
 2015-01-26 20:07:14 +00:00
Craig Mautner
8995e140ad Merge "Add reason string for bringing stack to front" into lmp-mr1-dev 2015-01-26 20:05:45 +00:00
Ricardo Cervera
16325bda7f am ba70d548: am 9c9dc80a: am df07000e: am d064ce7e: am edb7a442: Merge "docs: Wear DataItem listener improvements" into lmp-docs 
* commit 'ba70d548cb3fa700e5d11c4afae7d0e9a5f45bd9':
  docs: Wear DataItem listener improvements
 2015-01-26 20:04:03 +00:00
Nancy Chen
792d576e77 am 42d45bb1: Merge "Add method in TelecomManager to return line1Number for a PhoneAccount." into lmp-mr1-dev automerge: f55d132 
automerge: 885c856

* commit '885c856e6babfe88be1d6a029f185329bb3dfcc7':
  Add method in TelecomManager to return line1Number for a PhoneAccount.
 2015-01-26 19:59:58 +00:00
Ricardo Cervera
ba70d548cb am 9c9dc80a: am df07000e: am d064ce7e: am edb7a442: Merge "docs: Wear DataItem listener improvements" into lmp-docs 
* commit '9c9dc80a08d7a9c9f8b6619b7b856c113a94b938':
  docs: Wear DataItem listener improvements
 2015-01-26 19:57:37 +00:00
Nancy Chen
885c856e6b am 42d45bb1: Merge "Add method in TelecomManager to return line1Number for a PhoneAccount." into lmp-mr1-dev 
automerge: f55d132

* commit 'f55d132ae02529afe962544a1200a91bc3440e12':
  Add method in TelecomManager to return line1Number for a PhoneAccount.
 2015-01-26 19:54:32 +00:00
Ricardo Cervera
9c9dc80a08 am df07000e: am d064ce7e: am edb7a442: Merge "docs: Wear DataItem listener improvements" into lmp-docs 
* commit 'df07000e356dee84de9f4dcdd22a15e26e32f684':
  docs: Wear DataItem listener improvements
 2015-01-26 19:51:53 +00:00
Nancy Chen
f55d132ae0 am 42d45bb1: Merge "Add method in TelecomManager to return line1Number for a PhoneAccount." into lmp-mr1-dev 
* commit '42d45bb1e3e71c19cd977b799ab0fd983e40647f':
  Add method in TelecomManager to return line1Number for a PhoneAccount.
 2015-01-26 19:51:14 +00:00
Ricardo Cervera
df07000e35 am d064ce7e: am edb7a442: Merge "docs: Wear DataItem listener improvements" into lmp-docs 
* commit 'd064ce7e8b4ef75c07b99d466c85ea55ef2f4163':
  docs: Wear DataItem listener improvements
 2015-01-26 19:45:33 +00:00
Nancy Chen
42d45bb1e3 Merge "Add method in TelecomManager to return line1Number for a PhoneAccount." into lmp-mr1-dev 2015-01-26 19:44:54 +00:00
Ricardo Cervera
d064ce7e8b am edb7a442: Merge "docs: Wear DataItem listener improvements" into lmp-docs 
* commit 'edb7a4420bfbf3e7f9efc06718b45c56bbd3dc2d':
  docs: Wear DataItem listener improvements
 2015-01-26 19:39:48 +00:00
Alan Viverette
d5f35c2022 am a6b93909: am e1eff7aa: am de8d2840: Merge "Prevent drag-to-open from cycling pressed state, propagate hotspot" into lmp-mr1-dev 
* commit 'a6b9390949c4aa6f7de09fd0f44bb35ed7aabbc7':
  Prevent drag-to-open from cycling pressed state, propagate hotspot
 2015-01-26 19:35:44 +00:00
Brian Attwell
361d45e67a Merge "Unhide getOrCreateThreadId" 2015-01-26 19:32:36 +00:00
Ricardo Cervera
edb7a4420b Merge "docs: Wear DataItem listener improvements" into lmp-docs 2015-01-26 19:32:13 +00:00
Alan Viverette
a6b9390949 am e1eff7aa: am de8d2840: Merge "Prevent drag-to-open from cycling pressed state, propagate hotspot" into lmp-mr1-dev 
* commit 'e1eff7aadeb0c9f6cc51f07166accd63710ea2c5':
  Prevent drag-to-open from cycling pressed state, propagate hotspot
 2015-01-26 19:29:31 +00:00
Alan Viverette
e1eff7aade am de8d2840: Merge "Prevent drag-to-open from cycling pressed state, propagate hotspot" into lmp-mr1-dev 
* commit 'de8d28405538128fad55e34dc7c74fd49a909ae6':
  Prevent drag-to-open from cycling pressed state, propagate hotspot
 2015-01-26 19:23:27 +00:00
Mike Lockwood
c26f67051e am 2d1e078a: am 5ac22aa6: am 2b144a16: Merge "MTP: Fix partial implementation of 5 new audio specific properties" into lmp-mr1-dev 
* commit '2d1e078ac45a646ee55bb9aca022dafd143ff95b':
  MTP: Fix partial implementation of 5 new audio specific properties
 2015-01-26 19:17:30 +00:00
Alan Viverette
de8d284055 Merge "Prevent drag-to-open from cycling pressed state, propagate hotspot" into lmp-mr1-dev 2015-01-26 19:16:46 +00:00
Mike Lockwood
2d1e078ac4 am 5ac22aa6: am 2b144a16: Merge "MTP: Fix partial implementation of 5 new audio specific properties" into lmp-mr1-dev 
* commit '5ac22aa60f773917981f42e64fbc28615871fd3e':
  MTP: Fix partial implementation of 5 new audio specific properties
 2015-01-26 19:10:44 +00:00
Sarah Maddox
ed91b0dd7e docs: Adds new geocoding sample to Location API training. 
Uses GoogleApiClient to connect to Play services.
Uses the latest Fused Location Provider API.

Bug: 17109822
Change-Id: I96dbf348e9ae41dbbeb075e6540620afc304d3b6
 2015-01-26 11:06:55 -08:00
RoboErik
be2c3ee52c Merge "Persist safe MediaSession intents across reboots" 2015-01-26 19:05:47 +00:00
Mike Lockwood
5ac22aa60f am 2b144a16: Merge "MTP: Fix partial implementation of 5 new audio specific properties" into lmp-mr1-dev 
* commit '2b144a16f6ecb054f35a4836e92be39365688fe0':
  MTP: Fix partial implementation of 5 new audio specific properties
 2015-01-26 18:59:46 +00:00
Craig Mautner
299f960e5e Add reason string for bringing stack to front 
Additional debug and useful information.
Also removed am_resume_activity verbosity and refactored method to
eliminate unused parameter.

For bug 17721767.

Change-Id: Ie1c0652a38a0c6ae6db27a52a9e5da29e252e300
 2015-01-26 10:57:11 -08:00
Mike Lockwood
2b144a16f6 Merge "MTP: Fix partial implementation of 5 new audio specific properties" into lmp-mr1-dev 2015-01-26 18:52:40 +00:00
Brian Attwell
c73ae3aaf4 Unhide getOrCreateThreadId 
Part 2/2 of exposing getOrCreateThreadId. Add to
current.txt and system-current.txt.

Bug: 18777272
Change-Id: Id3bb1e3f73c4826154096057a778ac97ee86abc6
 2015-01-26 10:37:26 -08:00
Alan Viverette
2563095d2d Prevent drag-to-open from cycling pressed state, propagate hotspot 
Avoids unnecessary changes to pressed state. Ensures hotspot propagates
to both the list view and the list item view since both receive the
pressed state.

Bug: 19134424
Change-Id: If2496ce2042e43fe1c1efd527eeca10dc53e1f4a
 2015-01-26 10:24:08 -08:00
Geoff Mendal
6c67474dd4 am 3d8f4191: (-s ours) am 3ec4af9f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '3d8f41913c43b3c82b20aef1572fc5a0f7126589':
  Import translations. DO NOT MERGE
 2015-01-26 16:55:20 +00:00
Geoff Mendal
3d8f41913c am 3ec4af9f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '3ec4af9ff66b2a25e08916726486583f0c36b485':
  Import translations. DO NOT MERGE
 2015-01-26 16:50:02 +00:00