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
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
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
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
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
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
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
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
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
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
Junda Liu
ef6178a99c
Merge "Add hasMatchedTetherApnSetting to telmgr API." into lmp-mr1-dev
2014-12-02 18:18:24 +00:00
Craig Mautner
2d223d4e93
am b361f48b: am ca017a38: am 50f513c5: Merge "[ActivityManager] Invalidate last screenshot when activity relaunched"
...
* commit 'b361f48b38f89c029a4ea5548d876f34fd74a7fc':
[ActivityManager] Invalidate last screenshot when activity relaunched
2014-12-02 18:11:59 +00:00
Craig Mautner
8abe01aa80
am a370d9d1: am f54954f9: Merge "bug fix possible NPE while startProcessLocked()"
...
* commit 'a370d9d19af04c2a9f9d5c5b5794a6a5cd6fd774':
bug fix possible NPE while startProcessLocked()
2014-12-02 18:11:25 +00:00
Craig Mautner
b361f48b38
am ca017a38: am 50f513c5: Merge "[ActivityManager] Invalidate last screenshot when activity relaunched"
...
* commit 'ca017a38c9eb12fe92d24a72ad3ee4c33b00e5de':
[ActivityManager] Invalidate last screenshot when activity relaunched
2014-12-02 18:04:10 +00:00
Craig Mautner
a370d9d19a
am f54954f9: Merge "bug fix possible NPE while startProcessLocked()"
...
* commit 'f54954f97599f83584ab736d931b1fe1aff8890c':
bug fix possible NPE while startProcessLocked()
2014-12-02 18:03:46 +00:00
Craig Mautner
f54954f975
Merge "bug fix possible NPE while startProcessLocked()"
2014-12-02 17:57:14 +00:00
Craig Mautner
ca017a38c9
am 50f513c5: Merge "[ActivityManager] Invalidate last screenshot when activity relaunched"
...
* commit '50f513c56989337aa0a48304213dd1deee2a0ede':
[ActivityManager] Invalidate last screenshot when activity relaunched
2014-12-02 17:56:09 +00:00
Craig Mautner
50f513c569
Merge "[ActivityManager] Invalidate last screenshot when activity relaunched"
2014-12-02 17:50:31 +00:00
Luan Nguyen
c03fcb74f8
am 3a8d6c80: am a7ee1243: am dc1baa16: am 2711a539: am 16d0ab86: am 6cd78bb2: Merge "docs: Update getting started creating Wearable apps with proper prereqs and instructions." into lmp-docs
...
* commit '3a8d6c8086d63d6ad38e1af821c66d892a2e6759':
docs: Update getting started creating Wearable apps with proper prereqs and instructions.
2014-12-02 17:31:30 +00:00
Jean-Michel Trivi
2a1cdd4d4f
am 8e74a8a7: am 874e4502: am 57457b98: Merge "AudioMix address and type, rule exclusion API, dynamic source" into lmp-mr1-dev
...
* commit '8e74a8a77e06c93180a5b807c3d9865c89be3dc7':
AudioMix address and type, rule exclusion API, dynamic source
2014-12-02 17:31:25 +00:00
Luan Nguyen
3a8d6c8086
am a7ee1243: am dc1baa16: am 2711a539: am 16d0ab86: am 6cd78bb2: Merge "docs: Update getting started creating Wearable apps with proper prereqs and instructions." into lmp-docs
...
* commit 'a7ee124305de16fa3acecbb087c0b0cbb1bc649b':
docs: Update getting started creating Wearable apps with proper prereqs and instructions.
2014-12-02 17:25:31 +00:00
Jean-Michel Trivi
8e74a8a77e
am 874e4502: am 57457b98: Merge "AudioMix address and type, rule exclusion API, dynamic source" into lmp-mr1-dev
...
* commit '874e4502217aa48a06171a7d880b9ca571fd76b1':
AudioMix address and type, rule exclusion API, dynamic source
2014-12-02 17:25:24 +00:00
Chris Craik
f9550fa061
am faf4a61a: am 363f0d9f: am 81defc6a: Merge "Sync ViewOverlay size init with RenderNode" into lmp-mr1-dev
...
* commit 'faf4a61a88136d26935728e06b7916f1f31afdbd':
Sync ViewOverlay size init with RenderNode
2014-12-02 17:19:21 +00:00
Luan Nguyen
a7ee124305
am dc1baa16: am 2711a539: am 16d0ab86: am 6cd78bb2: Merge "docs: Update getting started creating Wearable apps with proper prereqs and instructions." into lmp-docs
...
* commit 'dc1baa16b1c559b07d392f7d899fcfe18fa7036c':
docs: Update getting started creating Wearable apps with proper prereqs and instructions.
2014-12-02 17:17:11 +00:00
Jean-Michel Trivi
874e450221
am 57457b98: Merge "AudioMix address and type, rule exclusion API, dynamic source" into lmp-mr1-dev
...
* commit '57457b98cfec197283c42585a3bc4abb1b21d05b':
AudioMix address and type, rule exclusion API, dynamic source
2014-12-02 17:17:06 +00:00
Chris Craik
faf4a61a88
am 363f0d9f: am 81defc6a: Merge "Sync ViewOverlay size init with RenderNode" into lmp-mr1-dev
...
* commit '363f0d9fd92129c07d769e43fbc9b46dacc01a3b':
Sync ViewOverlay size init with RenderNode
2014-12-02 17:13:08 +00:00
Luan Nguyen
dc1baa16b1
am 2711a539: am 16d0ab86: am 6cd78bb2: Merge "docs: Update getting started creating Wearable apps with proper prereqs and instructions." into lmp-docs
...
* commit '2711a5394950f2c61d2cd2ca7f9cfa141a96df34':
docs: Update getting started creating Wearable apps with proper prereqs and instructions.
2014-12-02 17:10:49 +00:00
Jean-Michel Trivi
57457b98cf
Merge "AudioMix address and type, rule exclusion API, dynamic source" into lmp-mr1-dev
2014-12-02 17:09:30 +00:00
Chris Craik
363f0d9fd9
am 81defc6a: Merge "Sync ViewOverlay size init with RenderNode" into lmp-mr1-dev
...
* commit '81defc6a840367dcf9591d14b827f2d8d756ef00':
Sync ViewOverlay size init with RenderNode
2014-12-02 17:04:34 +00:00
Luan Nguyen
2711a53949
am 16d0ab86: am 6cd78bb2: Merge "docs: Update getting started creating Wearable apps with proper prereqs and instructions." into lmp-docs
...
* commit '16d0ab86eba2e4f596ac1b96b53391dd0f146b57':
docs: Update getting started creating Wearable apps with proper prereqs and instructions.
2014-12-02 17:00:23 +00:00
Chris Craik
81defc6a84
Merge "Sync ViewOverlay size init with RenderNode" into lmp-mr1-dev
2014-12-02 16:59:21 +00:00
Luan Nguyen
16d0ab86eb
am 6cd78bb2: Merge "docs: Update getting started creating Wearable apps with proper prereqs and instructions." into lmp-docs
...
* commit '6cd78bb2613260b0eb8341748d5cebe4a46f10e5':
docs: Update getting started creating Wearable apps with proper prereqs and instructions.
2014-12-02 16:50:36 +00:00
Luan Nguyen
6cd78bb261
Merge "docs: Update getting started creating Wearable apps with proper prereqs and instructions." into lmp-docs
2014-12-02 16:42:56 +00:00
Leigh Anne
d0a6279af6
SysUI Tests: Added some tests for mobile icon.
...
Testing to verify correct mobile icon in edge cases such as no sim,
or no mobile data feature. Tests for updating the network name.
Change-Id: I0e4114d0c1e4109d4b2aae761181bedb841fe8b6
2014-12-02 11:21:53 -05:00
Jason Monk
311aa004c0
am 2b618bff: am 613c0555: am e47dc360: Merge "SysUI: Actual MSIM status bar support" into lmp-mr1-dev
...
* commit '2b618bff2d59cea767fb7ac0caa6036a6085c046':
SysUI: Actual MSIM status bar support
2014-12-02 16:06:58 +00:00
Jason Monk
2b618bff2d
am 613c0555: am e47dc360: Merge "SysUI: Actual MSIM status bar support" into lmp-mr1-dev
...
* commit '613c0555ae85a7b79669a4ea5f756f5bf04ac180':
SysUI: Actual MSIM status bar support
2014-12-02 16:00:03 +00:00
Christoph Studer
d3d9615db8
am bfecab14: am ef1073f7: am ff02faf8: Merge "NoMan: Optimize grouped notifications" into lmp-mr1-dev
...
* commit 'bfecab14f92067ee6104ab419bd8a4c7dcd5d03e':
NoMan: Optimize grouped notifications
2014-12-02 15:59:18 +00:00
Christoph Studer
bfecab14f9
am ef1073f7: am ff02faf8: Merge "NoMan: Optimize grouped notifications" into lmp-mr1-dev
...
* commit 'ef1073f7b45873b5fb87d772c0a5036a2b274917':
NoMan: Optimize grouped notifications
2014-12-02 15:52:20 +00:00
Jason Monk
613c0555ae
am e47dc360: Merge "SysUI: Actual MSIM status bar support" into lmp-mr1-dev
...
* commit 'e47dc36071884600c2b3c1dfe1ffe031fc9f0fde':
SysUI: Actual MSIM status bar support
2014-12-02 15:52:17 +00:00
Christoph Studer
1f32c65697
NoMan/SysUI: Clear LEDs only when entering the shade
...
Don't clear notification LEDs when seeing notifications on the
lockscreen.
Also fix a bug where the LED didn't continue flashing after
the screen turned off.
For devices with doze capability, ensure that the LED continuing
to flash after screen off doesn't cause an immediate pulses, but
delay the first pulse by 10s.
Bug: 15449039
Change-Id: Id34d51a2c91ceaf069e49add1ab690bb855f9638
2014-12-02 16:52:13 +01:00
Jason Monk
e47dc36071
Merge "SysUI: Actual MSIM status bar support" into lmp-mr1-dev
2014-12-02 15:47:36 +00:00
Christoph Studer
ef1073f7b4
am ff02faf8: Merge "NoMan: Optimize grouped notifications" into lmp-mr1-dev
...
* commit 'ff02faf8f3db791956a99ff0bb87eafb52f333d4':
NoMan: Optimize grouped notifications
2014-12-02 15:45:01 +00:00