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

163096 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Craig Mautner
603d30b1cf Merge "Stop logging service starts and stops." into lmp-mr1-dev 
automerge: 49880ee

* commit '49880eeb00c71a2287db65717fd8a7ff5e87279d':
  Stop logging service starts and stops.
 2015-01-27 01:41:15 +00:00
Wonsik Kim
b3c06e49c8 Merge "TIF: fix loud volume after input switch when volume is 0" into lmp-mr1-dev 
automerge: cd8a80c

* commit 'cd8a80c7077ee1ef14888e1a735b20c7119c1aac':
  TIF: fix loud volume after input switch when volume is 0
 2015-01-27 01:39:56 +00:00
Jose Lima
7a22fc62d3 Allow disabling the Options Pannel feature for TVs 
- Added a config entry in velues-television to disable the options panel
feature for TVs.
- Fixed parts of the code in PhoneWindow that assumed this feature is supposed
to always be available, which was causing exceptions when it was turned off.

Bug: 18780696
Change-Id: I923bd4b5019d634e5352a6e893005133edb475f6
 2015-01-26 17:39:49 -08:00
Craig Mautner
49880eeb00 Merge "Stop logging service starts and stops." into lmp-mr1-dev 2015-01-27 01:15:35 +00:00
Chris Craik
00c53d66dd am cdd8b7f8: Merge "Invalidate outline on padding update" into lmp-mr1-dev 
* commit 'cdd8b7f8199eb94ca133c8cebddf86adb0f9bb11':
  Invalidate outline on padding update
 2015-01-27 01:13:00 +00:00
Alan Viverette
8648dfe5f5 am 5229be05: Merge "Convert getHourForDegrees result to 12-hour format when needed" into lmp-mr1-dev 
* commit '5229be05b439cf24b7028adbb64d05ecc23184ac':
  Convert getHourForDegrees result to 12-hour format when needed
 2015-01-27 01:12:56 +00:00
Wonsik Kim
cd8a80c707 Merge "TIF: fix loud volume after input switch when volume is 0" into lmp-mr1-dev 2015-01-27 01:12:33 +00:00
Chris Craik
cdd8b7f819 Merge "Invalidate outline on padding update" into lmp-mr1-dev 2015-01-27 01:08:54 +00:00
Wonsik Kim
485e7e13f4 TIF: fix loud volume after input switch when volume is 0 
Bug: 19134440
Change-Id: I6291f299a27315e79b505ea36bf96c79437e6b53
 2015-01-27 01:06:37 +00:00
Alan Viverette
5229be05b4 Merge "Convert getHourForDegrees result to 12-hour format when needed" into lmp-mr1-dev 2015-01-27 01:02:00 +00:00
George Mount
fbd459642f Activity Transition: fix quick back after enter. 
Bug 19105460

When an Activity Transition was receiving an exit call
immediately after the enter, the transition for the enter
was still in progress. TransitionManager does not allow
multiple transitions to work at once, so the enter transition
would run, but the exit did not. This CL detects when the
enter transition is still pending and tells the
ActivityTransitionState to delay one frame so that the
enter can finish its required work prior to starting the
exit transition.

Change-Id: I1b40f1e41d61a67da3fd672419ea321e7d0496da
 2015-01-26 15:59:42 -08:00
John Spurlock
b9fe4e1713 Default "pickup peforms proximity check" to false. 
Don't assume the pickup sensor will perform a proximity check before
starting to pulse.  This will add some latency, but necessary if
we can't trust the sensor.

Bug: 19083596
Change-Id: I51b7daf5ed76b2780ec5c949a75cc1fca247ddad
 2015-01-26 18:55:29 -05:00
Alan Viverette
5efe0d199e Convert getHourForDegrees result to 12-hour format when needed 
Also prevents the selector from jumping between the inner and outer
circle during touch exploration in 24-hour mode.

Bug: 19101918
Change-Id: If342056b378927397f8651dad5e8d806bcda03a6
 2015-01-26 15:34:56 -08:00
Chris Craik
c43a820945 Invalidate outline on padding update 
bug:19113359

Ensures that ViewOutlineProvider#PADDED_BOUNDS is always kept up to
date with the view's padding.

Change-Id: I5e090bd8272e89d6b8b9055dbe95ef3d45333fcb
 2015-01-26 14:40:29 -08:00
Craig Mautner
9851d03819 Stop logging service starts and stops. 
Completes work on bug 18201239.

Change-Id: I80686351ac91e48bf113976a000b351b423d8dd2
 2015-01-26 14:33:39 -08: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
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
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
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
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
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
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
Ricardo Cervera
edb7a4420b Merge "docs: Wear DataItem listener improvements" into lmp-docs 2015-01-26 19:32:13 +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
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
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
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
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
3ec4af9ff6 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2015-01-26 16:43:18 +00:00
Bryce Lee
35dafda1b0 Make THEATER_MODE_ON setting a system api. 
This will allow an unbundled home to continue accessing this property.

Bug: 19043538
Change-Id: I845a8726e617ca7b6f7f7347a0ac5aa0620d6658
 2015-01-26 08:21:10 -08:00
Geoff Mendal
29fa12b5d4 Import translations. DO NOT MERGE 
Change-Id: I7aa8aacfd6c1e583c5a9404cdb4900a1a6ab7b74
Auto-generated-cl: translation import
 2015-01-26 08:16:08 -08:00
Geoff Mendal
ca922bb455 am d57adbbc: (-s ours) Import translations. DO NOT MERGE 
* commit 'd57adbbc4f2f8ccd8fc4a4de0508a8243ace3866':
  Import translations. DO NOT MERGE
 2015-01-26 14:23:11 +00:00
Geoff Mendal
d57adbbc4f Import translations. DO NOT MERGE 
Change-Id: If6bad1c33638d232a6f320637ac0e13c8a67adfb
Auto-generated-cl: translation import
 2015-01-26 08:16:38 -06:00
Alexandra Gherghina
1a4802b931 am abaf69dd: Merge "Update badge assets" into lmp-mr1-dev 
* commit 'abaf69dd195aa55c151ab16730e9511539ed46e5':
  Update badge assets
 2015-01-26 12:05:36 +00:00
Alexandra Gherghina
abaf69dd19 Merge "Update badge assets" into lmp-mr1-dev 2015-01-26 11:59:22 +00:00
Benjamin Franz
2805669954 am 6d16b861: Merge "Avoid NullPointerException if createUser returns null" into lmp-mr1-dev 
* commit '6d16b8614ac4c5aa44304e6fdcb9ed8aeec675fd':
  Avoid NullPointerException if createUser returns null
 2015-01-26 10:55:14 +00:00
Benjamin Franz
6d16b8614a Merge "Avoid NullPointerException if createUser returns null" into lmp-mr1-dev 2015-01-26 10:49:48 +00:00