Kweku Adams
9b489990fe
am 51de927f: am fa99c345: am d537987b: Changing AUDIO_TURNED_ON constant.
...
* commit '51de927f5ae9b754c4b3927eb8c109ee4dfc602d':
Changing AUDIO_TURNED_ON constant.
2014-12-02 19:45:29 +00:00
Jorim Jaggi
5c1459f5e4
am dad13577: Merge "Update dark mode on notifications when content is updated" into lmp-mr1-dev
...
* commit 'dad13577e5c699ab34e4243204cf767de4a0f0cd':
Update dark mode on notifications when content is updated
2014-12-02 19:41:43 +00:00
Ricardo Cervera
affe473213
am aa59bf2d: am a107b515: am 64f49162: docs: Layout fixes for the Custom UI on Wear class
...
* commit 'aa59bf2dd81e974c37eff8be3b529ed48b0b59c3':
docs: Layout fixes for the Custom UI on Wear class
2014-12-02 19:41:30 +00:00
Ricardo Cervera-Navarro
262d6d3b00
am ab5a0c05: am b359f4a8: am fcae79f6: am d5412e35: am 0ac703fc: am 1108b845: Merge "Sensor documentation fixes." into lmp-docs
...
* commit 'ab5a0c05e651779792aca7713c04113963a4694e':
Sensor documentation fixes.
2014-12-02 19:40:26 +00:00
Dianne Hackborn
1c2f6ca136
am 2f58bab7: am 221b545c: Merge "Fix issue #18510117 : Returning from an activity started with..." into lmp-mr1-dev
...
* commit '2f58bab7b026fbe010aad8ae777f3abda295dc66':
Fix issue #18510117 : Returning from an activity started with...
2014-12-02 19:40:10 +00:00
Kweku Adams
51de927f5a
am fa99c345: am d537987b: Changing AUDIO_TURNED_ON constant.
...
* commit 'fa99c345c440a37ae0cc74cba6ffd6e88ab9ddb2':
Changing AUDIO_TURNED_ON constant.
2014-12-02 19:40:04 +00:00
Alan Viverette
850cdbe58c
am 71c5d62d: Merge "Consider RTL layout in DPAD navigation in AbsSeekBar"
...
* commit '71c5d62d9680207c4d3d25ac3f590f3667b250eb':
Consider RTL layout in DPAD navigation in AbsSeekBar
2014-12-02 19:36:03 +00:00
Jorim Jaggi
dad13577e5
Merge "Update dark mode on notifications when content is updated" into lmp-mr1-dev
2014-12-02 19:35:42 +00:00
Craig Mautner
afcb1d6561
am 240602f4: am 877d8939: am f6be7d17: Merge "[ActivityManager] Fix race condition in pss collection"
...
* commit '240602f43184b820ecff064d61e99017f849c0cf':
[ActivityManager] Fix race condition in pss collection
2014-12-02 19:35:02 +00:00
Dianne Hackborn
2f58bab7b0
am 221b545c: Merge "Fix issue #18510117 : Returning from an activity started with..." into lmp-mr1-dev
...
* commit '221b545cdaba2522fbb299428ac048641410c284':
Fix issue #18510117 : Returning from an activity started with...
2014-12-02 19:33:28 +00:00
Kweku Adams
fa99c345c4
am d537987b: Changing AUDIO_TURNED_ON constant.
...
* commit 'd537987b173f6b48f5196a2ae7d445af1a49e2bb':
Changing AUDIO_TURNED_ON constant.
2014-12-02 19:33:23 +00:00
Ricardo Cervera
aa59bf2dd8
am a107b515: am 64f49162: docs: Layout fixes for the Custom UI on Wear class
...
* commit 'a107b5150b38a8c6585631b1773d6c10f682f42b':
docs: Layout fixes for the Custom UI on Wear class
2014-12-02 19:32:49 +00:00
Ricardo Cervera-Navarro
ab5a0c05e6
am b359f4a8: am fcae79f6: am d5412e35: am 0ac703fc: am 1108b845: Merge "Sensor documentation fixes." into lmp-docs
...
* commit 'b359f4a871cbbeecafb3c9b310695ffb6e5280bd':
Sensor documentation fixes.
2014-12-02 19:31:32 +00:00
Dianne Hackborn
221b545cda
Merge "Fix issue #18510117 : Returning from an activity started with..." into lmp-mr1-dev
2014-12-02 19:22:07 +00:00
Alan Viverette
71c5d62d96
Merge "Consider RTL layout in DPAD navigation in AbsSeekBar"
2014-12-02 19:21:22 +00:00
Kweku Adams
d537987b17
Changing AUDIO_TURNED_ON constant.
...
Changed so that it's set to a different value from WIFI_MULTICAST_ENABLED.
Change-Id: Ied3a2c2bf891f887ec3c7b5249453af4524c099a
2014-12-02 19:18:13 +00:00
Andrew Lee
535f33c327
am b4501f03: am 4cd124cf: am 4ef369fc: Merge "Rename VoLTE capability to HD audio." into lmp-mr1-dev
...
* commit 'b4501f03277b6bef3621d46d8360d057c905775a':
Rename VoLTE capability to HD audio.
2014-12-02 19:14:34 +00:00
Christoph Studer
cf9727b928
am 4b1cbaaf: am cd9eb9be: am 27ef0188: Merge "NoMan/SysUI: Clear LEDs only when entering the shade" into lmp-mr1-dev
...
* commit '4b1cbaaf4ec9f3f58a389496faacf77ee46fa2ed':
NoMan/SysUI: Clear LEDs only when entering the shade
2014-12-02 19:14:29 +00:00
Craig Mautner
240602f431
am 877d8939: am f6be7d17: Merge "[ActivityManager] Fix race condition in pss collection"
...
* commit '877d89399af77a98dd940c034aa631029ed313cc':
[ActivityManager] Fix race condition in pss collection
2014-12-02 19:14:07 +00:00
Ricardo Cervera
a107b5150b
am 64f49162: docs: Layout fixes for the Custom UI on Wear class
...
* commit '64f49162460eaddf49f9d56c5dc6a01f472e790c':
docs: Layout fixes for the Custom UI on Wear class
2014-12-02 19:13:54 +00:00
Ricardo Cervera-Navarro
b359f4a871
am fcae79f6: am d5412e35: am 0ac703fc: am 1108b845: Merge "Sensor documentation fixes." into lmp-docs
...
* commit 'fcae79f65d60069f75c4db92a68d56c9eb8b5213':
Sensor documentation fixes.
2014-12-02 19:12:24 +00:00
Svet Ganov
fc00c9e6c9
am 66a12001: am f9c93ba2: am eaaf0512: Crash in print spooler when back pressed before content update complted.
...
* commit '66a1200156aa0d7b003ce6d7dacfa5c1a54dd0d7':
Crash in print spooler when back pressed before content update complted.
2014-12-02 19:10:15 +00:00
Andrew Lee
b4501f0327
am 4cd124cf: am 4ef369fc: Merge "Rename VoLTE capability to HD audio." into lmp-mr1-dev
...
* commit '4cd124cfcb9427465ad2bf206a66c0e10e4e330b':
Rename VoLTE capability to HD audio.
2014-12-02 19:08:19 +00:00
Christoph Studer
4b1cbaaf4e
am cd9eb9be: am 27ef0188: Merge "NoMan/SysUI: Clear LEDs only when entering the shade" into lmp-mr1-dev
...
* commit 'cd9eb9bee788252cd6d6bcdb7fcdc5a5d0dcfe5c':
NoMan/SysUI: Clear LEDs only when entering the shade
2014-12-02 19:08:13 +00:00
Marvin Paul
baecfda4d5
am e67cf731: am 364a8fe9: am 5aeed158: Merge "Added explicit sort order when fetching accounts." into lmp-mr1-dev
...
* commit 'e67cf73146cecce5be22264ca7c596b454ded08d':
Added explicit sort order when fetching accounts.
2014-12-02 19:05:25 +00:00
Ricardo Cervera
64f4916246
docs: Layout fixes for the Custom UI on Wear class
...
Change-Id: I7e499374b5903fb3412c9c42a44c75f7a0bf28f0
2014-12-02 11:05:22 -08:00
Craig Mautner
877d89399a
am f6be7d17: Merge "[ActivityManager] Fix race condition in pss collection"
...
* commit 'f6be7d177a740f86a4ae3b8685cc9e2f31506352':
[ActivityManager] Fix race condition in pss collection
2014-12-02 19:05:01 +00:00
Svet Ganov
66a1200156
am f9c93ba2: am eaaf0512: Crash in print spooler when back pressed before content update complted.
...
* commit 'f9c93ba26790cf26df40d21d7e8b6e1e83391dd1':
Crash in print spooler when back pressed before content update complted.
2014-12-02 19:03:54 +00:00
Ricardo Cervera-Navarro
fcae79f65d
am d5412e35: am 0ac703fc: am 1108b845: Merge "Sensor documentation fixes." into lmp-docs
...
* commit 'd5412e35801243e14123f2a0f03759073eb20fb6':
Sensor documentation fixes.
2014-12-02 19:01:22 +00:00
Andrew Lee
4cd124cfcb
am 4ef369fc: Merge "Rename VoLTE capability to HD audio." into lmp-mr1-dev
...
* commit '4ef369fce92d0e140189f305783855d8ae27067d':
Rename VoLTE capability to HD audio.
2014-12-02 18:59:32 +00:00
Christoph Studer
cd9eb9bee7
am 27ef0188: Merge "NoMan/SysUI: Clear LEDs only when entering the shade" into lmp-mr1-dev
...
* commit '27ef018846fc88122bcb2c30ba86e99a5b3039d6':
NoMan/SysUI: Clear LEDs only when entering the shade
2014-12-02 18:59:26 +00:00
Craig Mautner
f6be7d177a
Merge "[ActivityManager] Fix race condition in pss collection"
2014-12-02 18:57:36 +00:00
Christopher Tate
f6f8cca782
Midnight should mean midnight
...
...not noon-or-midnight. Fix the initial fstrim delay to properly refer
to midnight rather than ambiguous 12-hour "zero" so that fstrim job
consideration always starts overnight rather than possibly at the following
day's noon, depending on when the device was booted.
Bug 18076397
Change-Id: Ife3cd5bdeb14c7832b6e2a2de88dcfd1ba731b67
2014-12-02 10:55:09 -08:00
Marvin Paul
e67cf73146
am 364a8fe9: am 5aeed158: Merge "Added explicit sort order when fetching accounts." into lmp-mr1-dev
...
* commit '364a8fe9a250093f46581ece2792a3bc7cc06446':
Added explicit sort order when fetching accounts.
2014-12-02 18:54:29 +00:00
Ricardo Cervera-Navarro
d5412e3580
am 0ac703fc: am 1108b845: Merge "Sensor documentation fixes." into lmp-docs
...
* commit '0ac703fc8f4569338acc823221089c62480f0d7c':
Sensor documentation fixes.
2014-12-02 18:53:20 +00:00
Junda Liu
b27dbd2151
am 92205a33: am 50e2d6c2: am ef6178a9: Merge "Add hasMatchedTetherApnSetting to telmgr API." into lmp-mr1-dev
...
* commit '92205a33655f8a4f487e8d85a9d6d151d0db21a1':
Add hasMatchedTetherApnSetting to telmgr API.
2014-12-02 18:52:28 +00:00
Andrew Lee
4ef369fce9
Merge "Rename VoLTE capability to HD audio." into lmp-mr1-dev
2014-12-02 18:51:01 +00:00
Svet Ganov
f9c93ba267
am eaaf0512: Crash in print spooler when back pressed before content update complted.
...
* commit 'eaaf0512fcbf03b926cdbbbb7f54df474ecf861a':
Crash in print spooler when back pressed before content update complted.
2014-12-02 18:50:41 +00:00
Christoph Studer
27ef018846
Merge "NoMan/SysUI: Clear LEDs only when entering the shade" into lmp-mr1-dev
2014-12-02 18:49:51 +00:00
Ricardo Cervera-Navarro
0ac703fc8f
am 1108b845: Merge "Sensor documentation fixes." into lmp-docs
...
* commit '1108b845f940debde0c1959a9293cafdc264afcc':
Sensor documentation fixes.
2014-12-02 18:46:30 +00:00
Marvin Paul
364a8fe9a2
am 5aeed158: Merge "Added explicit sort order when fetching accounts." into lmp-mr1-dev
...
* commit '5aeed158df65847edac69761630dcd66b8f66eaa':
Added explicit sort order when fetching accounts.
2014-12-02 18:45:53 +00:00
Junda Liu
92205a3365
am 50e2d6c2: am ef6178a9: Merge "Add hasMatchedTetherApnSetting to telmgr API." into lmp-mr1-dev
...
* commit '50e2d6c2ce079c00531ecbcf112593cb0263e47a':
Add hasMatchedTetherApnSetting to telmgr API.
2014-12-02 18:45:41 +00:00
Svet Ganov
eaaf0512fc
Crash in print spooler when back pressed before content update complted.
...
We are updating the printed content asynchronously. If the user cancels
printing before the first update is complete the spooler components are
in a destroyed state but we attempt to handle the completed update resulting
in a crash. Now if printing is cancelled we ignore the update result.
bug:18525491
Change-Id: I1ef47a17de19896cba2c7a1dd2bfc205065e0a5a
2014-12-02 18:43:05 +00:00
Leigh Anne
421033d6c1
Merge "SysUI Tests: Added some tests for mobile icon."
2014-12-02 18:39:54 +00:00
Marvin Paul
5aeed158df
Merge "Added explicit sort order when fetching accounts." into lmp-mr1-dev
2014-12-02 18:36:32 +00:00
Ricardo Cervera-Navarro
1108b845f9
Merge "Sensor documentation fixes." into lmp-docs
2014-12-02 18:33:50 +00:00
Dianne Hackborn
a01a0faebf
Fix issue #18510117 : Returning from an activity started with...
...
...startActivityForResult causes SecurityExpcetion
The ReferrerIntent hack was becoming visible to apps, which caused
a mismatch between marshalling/unmarshalling of the IPC call.
Change-Id: Ibcb788327b5bae4426efc826551799fa87d1cbaa
2014-12-02 10:33:14 -08:00
Marvin Paul
48fcd4e175
Added explicit sort order when fetching accounts.
...
In SQLite, if a sort order is not specified then the ordering is
undefined. In pre-L, SQLite would order accounts by the primary key.
But in L, the newer SQLite version appears to be ordering accounts by
the name.
Bug 18453759
Change-Id: I6bf2b0de59eca4c69472b4279b9e4194c3d3471e
2014-12-02 18:30:57 +00:00
Junda Liu
50e2d6c2ce
am ef6178a9: Merge "Add hasMatchedTetherApnSetting to telmgr API." into lmp-mr1-dev
...
* commit 'ef6178a99c57b6de3dc02455e570f932b154b8e1':
Add hasMatchedTetherApnSetting to telmgr API.
2014-12-02 18:23:49 +00:00
Craig Mautner
4bc4974374
am 8abe01aa: am a370d9d1: am f54954f9: Merge "bug fix possible NPE while startProcessLocked()"
...
* commit '8abe01aa80a0697d21103322ac500dce31058b50':
bug fix possible NPE while startProcessLocked()
2014-12-02 18:19:45 +00:00