Ihab Awad
8199d6c3db
am 6cacf44e: Merge "Telecom API updates (1/6)" into lmp-mr1-dev
...
* commit '6cacf44e7ecfe50097adc99dab97c3fb9770a1af':
Telecom API updates (1/6)
2014-12-01 16:29:35 +00:00
Ihab Awad
6cacf44e7e
Merge "Telecom API updates (1/6)" into lmp-mr1-dev
2014-12-01 16:24:18 +00:00
Chet Haase
8394e9fff3
am 21871444: Merge "Zero duration animations snap to end value when started" into lmp-mr1-dev
...
* commit '2187144408dbdb5322a2212fa2e68a5891ea60ca':
Zero duration animations snap to end value when started
2014-12-01 15:58:46 +00:00
Chet Haase
2187144408
Merge "Zero duration animations snap to end value when started" into lmp-mr1-dev
2014-12-01 15:52:59 +00:00
Geoff Mendal
552f355d45
Import translations. DO NOT MERGE
...
Change-Id: Idea8937903353be0a01f0213ef7f4b827e86dbf6
Auto-generated-cl: translation import
2014-12-01 07:16:21 -08:00
Geoff Mendal
9e8637411a
am 3fbf3b93: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit '3fbf3b939abbc681f6812a429e2b809358deb7c3':
Import translations. DO NOT MERGE
2014-12-01 15:11:25 +00:00
Geoff Mendal
11fe2dfd32
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
2014-12-01 15:10:36 +00:00
Geoff Mendal
7a2b09165b
Import translations. DO NOT MERGE
...
Change-Id: Ic5278b3f5da079c97f9aafd947fef96ae3248778
Auto-generated-cl: translation import
2014-12-01 07:09:47 -08:00
Geoff Mendal
3fbf3b939a
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
2014-12-01 15:07:56 +00:00
John Spurlock
64e034e351
am e3f8b314: Merge "Zen: Improve zen mode panel condition selection." into lmp-mr1-dev
...
* commit 'e3f8b31466f45eb4d5c9971049b71215a9f2c8a4':
Zen: Improve zen mode panel condition selection.
2014-12-01 15:04:02 +00:00
John Spurlock
c1e4d1554f
am 1a3af711: Merge "Doze: Break out proxcheck stats by pulse reason." into lmp-mr1-dev
...
* commit '1a3af711ab6f811a6bc4e9211cb255721fb1847d':
Doze: Break out proxcheck stats by pulse reason.
2014-12-01 15:03:57 +00:00
John Spurlock
fdc07dce37
am 26a695d9: Merge "Volume: Update remote volume icons." into lmp-mr1-dev
...
* commit '26a695d974f7ee3b32b8d65a44a42f804af8f01c':
Volume: Update remote volume icons.
2014-12-01 15:03:52 +00:00
Geoff Mendal
616a8e9438
Import translations. DO NOT MERGE
...
Change-Id: I1475c76eb44b69ef727a11f409e7d938552ee26d
Auto-generated-cl: translation import
2014-12-01 07:02:48 -08:00
John Spurlock
e3f8b31466
Merge "Zen: Improve zen mode panel condition selection." into lmp-mr1-dev
2014-12-01 14:59:05 +00:00
John Spurlock
1a3af711ab
Merge "Doze: Break out proxcheck stats by pulse reason." into lmp-mr1-dev
2014-12-01 14:58:38 +00:00
John Spurlock
26a695d974
Merge "Volume: Update remote volume icons." into lmp-mr1-dev
2014-12-01 14:58:18 +00:00
Chet Haase
5a25e5bae2
Zero duration animations snap to end value when started
...
A recent change to seeking behavior altered the logic of
setCurrentPlayTime() (which is called when animations are first
started) to set the current animated fraction to 0 for 0-duration
animations. This fix ensures that 0-duration animations snap to
their end value (fraction == 1) instead, matching the behavior
prior to the seeking fix.
Issue #18542543 Animations with 0 duration stay in initial state when calling setCurrentPlayTime(0)
Change-Id: I9916d962cf46453a9e3e1207f58baf16f4a5830a
2014-12-01 06:57:15 -08:00
Geoff Mendal
68137588d1
am 9cde3e1d: (-s ours) Import translations. DO NOT MERGE
...
* commit '9cde3e1d82f65eaf73ccf92f14b101e600ef8e18':
Import translations. DO NOT MERGE
2014-12-01 14:52:53 +00:00
Geoff Mendal
fceb7d652f
Import translations. DO NOT MERGE
...
Change-Id: I99666ee10f2ad6d4489d9ad554606ee22566b15a
Auto-generated-cl: translation import
2014-12-01 06:44:53 -08:00
Geoff Mendal
a990faec87
Import translations. DO NOT MERGE
...
Change-Id: I372891f089f72f814e92a63ac7f78a25cee9ebbf
Auto-generated-cl: translation import
2014-12-01 06:40:31 -08:00
Geoff Mendal
9cde3e1d82
Import translations. DO NOT MERGE
...
Change-Id: I2cb5a0bf876f8553710f0ed3882f7ef56da24557
Auto-generated-cl: translation import
2014-12-01 06:36:32 -08:00
Adrian Roos
844c92b444
Refresh user list a little more eagerly
...
Unfortunately, we don't get a signal when user restrictions such as
for adding new users change. That means the user switcher UI could get
out of sync and showed the add user option when in fact it couldn't add one.
Also cleans up an unused method.
Bug: 18292723
Change-Id: I56f6f848d967d9d1c11bd6262eacbdb11f90cfe2
2014-12-01 13:21:49 +00:00
Wally Yau
5b4e2e0274
am da392904: Set stream volume to max when userMasterVolume is set to true.
...
* commit 'da39290460b30e5080769f039d6dff352b3c7808':
Set stream volume to max when userMasterVolume is set to true.
2014-12-01 13:13:54 +00:00
Yohann Roussel
e92f62901b
am 8596021c: am 3e5223fd: am 6829daa4: Merge "Add tests about annotations and enum."
...
* commit '8596021c3b51c7e66ed54e7fd904534f3aa5e01c':
Add tests about annotations and enum.
2014-12-01 10:15:54 +00:00
Yohann Roussel
8596021c3b
am 3e5223fd: am 6829daa4: Merge "Add tests about annotations and enum."
...
* commit '3e5223fd02d0f096ca50c964378c717adbb2e3e9':
Add tests about annotations and enum.
2014-12-01 10:12:09 +00:00
Yohann Roussel
3e5223fd02
am 6829daa4: Merge "Add tests about annotations and enum."
...
* commit '6829daa44a66333ef869dbcd655eac220c34561b':
Add tests about annotations and enum.
2014-12-01 10:05:45 +00:00
Yohann Roussel
6829daa44a
Merge "Add tests about annotations and enum."
2014-12-01 09:30:59 +00:00
tingna_sung
e3ca048397
Avoid capture all black screenshot bitmap
...
Captured screenshot bitmap is all black one if none of windows is
surface shown.
Change-Id: I651b2ade1865926d61f945167d60219535fa8bf8
Signed-off-by: tingna_sung <tingna_sung@htc.com >
2014-12-01 15:22:43 +08:00
Jinsuk Kim
336cdb488f
audioservice: system audio control in master volume mode
...
Volume control in master mode should be transformed to
CEC commands if system audio is activated to delegate
the control to the connected AV receiver.
Refactored to use the interface to CEC service for
both master and stream type volume control.
Bug: 18560079
Change-Id: I2aefdc94a1bc3091c14fab849f899a0dc37c47bc
2014-12-01 07:17:17 +00:00
Michael Wright
6ae2986ad5
am 245da877: am fa910081: am 461eaf79: Merge "Add keylayout for Logitech RedHawk Gamepad"
...
* commit '245da877d1cb78f54ed98cc713da95c617ff1769':
Add keylayout for Logitech RedHawk Gamepad
2014-12-01 05:33:55 +00:00
Craig Mautner
1d027d6661
am bda8e419: am be342ef0: am c4cf78f4: Merge "[ActivityManager] Ensure provider external access count will be released."
...
* commit 'bda8e4192a26b5ab137ba3c22ea00b493a1b673e':
[ActivityManager] Ensure provider external access count will be released.
2014-12-01 05:33:49 +00:00
Craig Mautner
ad9c287add
am 10c40fc0: am a12ac54c: am 25596374: Merge "[ActivityManager] Prevent provider from been created twice."
...
* commit '10c40fc01d56ee17068cb61d5c19e6ab68f2ca48':
[ActivityManager] Prevent provider from been created twice.
2014-12-01 05:33:43 +00:00
Craig Mautner
8768672e78
am 62404e15: am 6151b118: am 94ac906b: Merge "Fix pointer index out of range exception"
...
* commit '62404e15f9d9935eb42b7cc559e95018b34bc307':
Fix pointer index out of range exception
2014-12-01 05:33:37 +00:00
Craig Mautner
8bbcd72c8b
am b97f7190: am fac55682: am 208bd91b: Merge "[ActivityManager] Avoid system server crash due to package removed"
...
* commit 'b97f719036b15c81aeb561ae0d2b4da68e7a06e8':
[ActivityManager] Avoid system server crash due to package removed
2014-12-01 05:33:32 +00:00
Craig Mautner
a675838a6c
am 5a6c1962: am 11c67c92: am 7db48ed0: Merge "Reset killedByAm flag at attachApplicationLocked"
...
* commit '5a6c1962590979d0722da0547a6ba3ae1a98dd04':
Reset killedByAm flag at attachApplicationLocked
2014-12-01 05:33:27 +00:00
Michael Wright
245da877d1
am fa910081: am 461eaf79: Merge "Add keylayout for Logitech RedHawk Gamepad"
...
* commit 'fa9100814a9139447e91edf9075a9fe55b044345':
Add keylayout for Logitech RedHawk Gamepad
2014-12-01 05:27:15 +00:00
Craig Mautner
bda8e4192a
am be342ef0: am c4cf78f4: Merge "[ActivityManager] Ensure provider external access count will be released."
...
* commit 'be342ef034f05c6864aaa85ab25c009148954552':
[ActivityManager] Ensure provider external access count will be released.
2014-12-01 05:27:08 +00:00
Craig Mautner
10c40fc01d
am a12ac54c: am 25596374: Merge "[ActivityManager] Prevent provider from been created twice."
...
* commit 'a12ac54cf69c0c8cfec6fa7c14176b714cae7107':
[ActivityManager] Prevent provider from been created twice.
2014-12-01 05:27:00 +00:00
Craig Mautner
62404e15f9
am 6151b118: am 94ac906b: Merge "Fix pointer index out of range exception"
...
* commit '6151b118b663b0620fee4fb87d9d143c6fd050b8':
Fix pointer index out of range exception
2014-12-01 05:26:53 +00:00
Craig Mautner
b97f719036
am fac55682: am 208bd91b: Merge "[ActivityManager] Avoid system server crash due to package removed"
...
* commit 'fac55682148e6d9c6b4e24769369e2b76ab018ac':
[ActivityManager] Avoid system server crash due to package removed
2014-12-01 05:26:47 +00:00
Craig Mautner
5a6c196259
am 11c67c92: am 7db48ed0: Merge "Reset killedByAm flag at attachApplicationLocked"
...
* commit '11c67c92de3522a50b9994eb83e34c152902ad18':
Reset killedByAm flag at attachApplicationLocked
2014-12-01 05:26:37 +00:00
Craig Mautner
3395e39c5d
am 0124980e: resolved conflicts for merge of 082c0540 to lmp-mr1-dev-plus-aosp
...
* commit '0124980e9fe2f5d21748254441229820cca6b601':
Prevent showing immersive confirmation unexpectedly
2014-12-01 05:21:48 +00:00
Craig Mautner
0124980e9f
resolved conflicts for merge of 082c0540 to lmp-mr1-dev-plus-aosp
...
Change-Id: I93543a420eba5c6ae860a81a9afd9a2189d88903
2014-11-30 21:16:39 -08:00
Michael Wright
fa9100814a
am 461eaf79: Merge "Add keylayout for Logitech RedHawk Gamepad"
...
* commit '461eaf79a726f5a754f467d7f3dd163aaa463857':
Add keylayout for Logitech RedHawk Gamepad
2014-12-01 04:43:34 +00:00
Michael Wright
461eaf79a7
Merge "Add keylayout for Logitech RedHawk Gamepad"
2014-12-01 04:36:25 +00:00
Craig Mautner
be342ef034
am c4cf78f4: Merge "[ActivityManager] Ensure provider external access count will be released."
...
* commit 'c4cf78f4d3154af317e686c9ef702a26cf28f8f2':
[ActivityManager] Ensure provider external access count will be released.
2014-12-01 00:26:11 +00:00
Craig Mautner
a12ac54cf6
am 25596374: Merge "[ActivityManager] Prevent provider from been created twice."
...
* commit '255963742982daf46eb665a2934bd61e7ed95c81':
[ActivityManager] Prevent provider from been created twice.
2014-12-01 00:22:10 +00:00
Craig Mautner
c4cf78f4d3
Merge "[ActivityManager] Ensure provider external access count will be released."
2014-12-01 00:20:33 +00:00
Craig Mautner
6151b118b6
am 94ac906b: Merge "Fix pointer index out of range exception"
...
* commit '94ac906b103b0f03eca2000815bf306209f33109':
Fix pointer index out of range exception
2014-12-01 00:16:57 +00:00
Craig Mautner
fac5568214
am 208bd91b: Merge "[ActivityManager] Avoid system server crash due to package removed"
...
* commit '208bd91b2467dd5d4c41d5ada5c2bfa15c1b48c4':
[ActivityManager] Avoid system server crash due to package removed
2014-12-01 00:16:52 +00:00