Ricardo Cervera
c9af0dc4c4
am 8dd47a7e: am d7a3ae38: am 1f6a16f1: am cde64643: am d91deea5: Merge "docs: Fixed notification background bug. Bug: 16801684" into klp-modular-docs
...
* commit '8dd47a7eb7bfc989b337ac9a3ef667ce01a7c9b2':
docs: Fixed notification background bug. Bug: 16801684
2014-08-27 16:38:06 +00:00
Baligh Uddin
acbbaa6e29
am 3aa96926: (-s ours) am 7f74dffc: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '3aa969269fb281c5ad4f0327fb350128d49d194c':
Import translations. DO NOT MERGE
2014-08-27 16:38:00 +00:00
Baligh Uddin
bc985bd993
am 753fcdd4: (-s ours) am d87aa19b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '753fcdd48eca0ec38596ce7a9ca08df1430a64af':
Import translations. DO NOT MERGE
2014-08-27 16:37:56 +00:00
Baligh Uddin
bf8f4b807e
am 2dd99c5b: (-s ours) am 550578f5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '2dd99c5bad960a971023cca2bb453e4533c18f68':
Import translations. DO NOT MERGE
2014-08-27 16:37:51 +00:00
Ricardo Cervera
39ce6ba27e
am d7a3ae38: am 1f6a16f1: am cde64643: am d91deea5: Merge "docs: Fixed notification background bug. Bug: 16801684" into klp-modular-docs
...
* commit 'd7a3ae3835cb48289dfacb3215594550a9bd8969':
docs: Fixed notification background bug. Bug: 16801684
2014-08-27 16:22:14 +00:00
Baligh Uddin
8364cea60a
am 7f74dffc: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '7f74dffc181e4cd2d237d85ef29f2bd6a04964da':
Import translations. DO NOT MERGE
2014-08-27 16:22:08 +00:00
Baligh Uddin
26b0882a7d
am d87aa19b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit 'd87aa19b12056d5e9dafc0dd8d34204d9b1bfc05':
Import translations. DO NOT MERGE
2014-08-27 16:22:04 +00:00
Baligh Uddin
43d650b732
am 550578f5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '550578f574fc0988c43b0e19a8611f6eab2014db':
Import translations. DO NOT MERGE
2014-08-27 16:21:59 +00:00
Calin Juravle
97da4613a3
am 2f63f7ab: am 852debcc: Merge "Update the handling of the native bridge property."
...
* commit '2f63f7abd390dd2ee16889c047164caac308d101':
Update the handling of the native bridge property.
2014-08-27 16:18:31 +00:00
Calin Juravle
fa9f2d5445
am 9dcfcff9: (-s ours) am 3bec87c9: Merge "Pass vmSafeMode (manifest attribute) to installd."
...
* commit '9dcfcff9207b57e5bfa87b18f2383a5637f06bbb':
Pass vmSafeMode (manifest attribute) to installd.
2014-08-27 16:18:18 +00:00
Ricardo Cervera
20ce284f54
am 1f6a16f1: am cde64643: am d91deea5: Merge "docs: Fixed notification background bug. Bug: 16801684" into klp-modular-docs
...
* commit '1f6a16f1def5f09dbfa9a527ee2f33b182b5f0ef':
docs: Fixed notification background bug. Bug: 16801684
2014-08-27 16:05:04 +00:00
Baligh Uddin
878da52a8b
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-08-27 16:00:31 +00:00
Baligh Uddin
c733367f5a
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-08-27 16:00:03 +00:00
Baligh Uddin
04cb07bb6c
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-08-27 15:59:58 +00:00
Calin Juravle
2f63f7abd3
am 852debcc: Merge "Update the handling of the native bridge property."
...
* commit '852debcc906dbf850b09e7e2fc822fe78bc735e6':
Update the handling of the native bridge property.
2014-08-27 15:58:43 +00:00
Calin Juravle
9dcfcff920
am 3bec87c9: Merge "Pass vmSafeMode (manifest attribute) to installd."
...
* commit '3bec87c9fab49fc2cc7ad1909331f3978803bdd6':
Pass vmSafeMode (manifest attribute) to installd.
2014-08-27 15:58:39 +00:00
Ricardo Cervera
1f6a16f1de
am cde64643: am d91deea5: Merge "docs: Fixed notification background bug. Bug: 16801684" into klp-modular-docs
...
* commit 'cde64643f9ff0ba3de5757520bead74d4ac52a19':
docs: Fixed notification background bug. Bug: 16801684
2014-08-27 15:54:29 +00:00
Calin Juravle
852debcc90
Merge "Update the handling of the native bridge property."
2014-08-27 15:50:38 +00:00
Calin Juravle
3bec87c9fa
Merge "Pass vmSafeMode (manifest attribute) to installd."
2014-08-27 15:50:10 +00:00
Ricardo Cervera
cde64643f9
am d91deea5: Merge "docs: Fixed notification background bug. Bug: 16801684" into klp-modular-docs
...
* commit 'd91deea5ec151d53e3640db791948fbe2480f433':
docs: Fixed notification background bug. Bug: 16801684
2014-08-27 15:40:35 +00:00
Ricardo Cervera
d91deea5ec
Merge "docs: Fixed notification background bug. Bug: 16801684" into klp-modular-docs
2014-08-27 15:30:41 +00:00
Jorim Jaggi
339878e1a5
am 3d9509d3: am ddf411d6: Merge "Fix that Keyguard didn\'t always get onActivityDrawn call" into lmp-dev
...
* commit '3d9509d3bc6409a5600d23e1ded2eaa431c0cad9':
Fix that Keyguard didn't always get onActivityDrawn call
2014-08-27 15:28:28 +00:00
Jorim Jaggi
3609640963
am af168d78: am 0f72ddc2: Merge "Fix missing status bar icons" into lmp-dev
...
* commit 'af168d785e306e4c3c44d13ec6756e7dfd047d82':
Fix missing status bar icons
2014-08-27 15:28:23 +00:00
Jorim Jaggi
b55f17003b
am ddf411d6: Merge "Fix that Keyguard didn\'t always get onActivityDrawn call" into lmp-dev
...
* commit 'ddf411d6895feba8688f89c7c27112d2fa67d30f':
Fix that Keyguard didn't always get onActivityDrawn call
2014-08-27 15:18:23 +00:00
Jorim Jaggi
2207453807
am 0f72ddc2: Merge "Fix missing status bar icons" into lmp-dev
...
* commit '0f72ddc29dd2883a65b8adba9e74b41ff188c722':
Fix missing status bar icons
2014-08-27 15:18:18 +00:00
Jorim Jaggi
86c78f8941
Merge "Fix that Keyguard didn't always get onActivityDrawn call" into lmp-dev
2014-08-27 15:06:00 +00:00
John Spurlock
97b4ec0599
am de0bcb8e: am b916b16a: Merge "Doze: Better handling for non-default templates." into lmp-dev
...
* commit 'de0bcb8e298daaf2761e4f9d6d701d4f0abe5438':
Doze: Better handling for non-default templates.
2014-08-27 15:05:34 +00:00
Jorim Jaggi
567ce19951
Merge "Fix missing status bar icons" into lmp-dev
2014-08-27 15:05:30 +00:00
Jorim Jaggi
21e8f419a8
Fix missing status bar icons
...
Bug: 16481924
Change-Id: I7df734519d112e2b0240f87940f9350bef5ea9df
2014-08-27 16:56:49 +02:00
John Spurlock
84d29548f2
am b916b16a: Merge "Doze: Better handling for non-default templates." into lmp-dev
...
* commit 'b916b16a8d683720737278743bc8781fce4d7831':
Doze: Better handling for non-default templates.
2014-08-27 14:55:01 +00:00
Jorim Jaggi
4c499be0ed
Fix that Keyguard didn't always get onActivityDrawn call
...
Bug: 16481924
Change-Id: I299645c940c71820aa7dc70985e41da869f1368a
2014-08-27 16:50:49 +02:00
John Spurlock
03ada9901e
Merge "Doze: Better handling for non-default templates." into lmp-dev
2014-08-27 14:45:20 +00:00
Sander Alewijnse
c3b7c6693b
am 45fb047d: am eb3f4b1c: Merge "Provide lockdown of date/time device owners." into lmp-dev
...
* commit '45fb047dab5a96a9ec72c6cf6aa168f80b115d5c':
Provide lockdown of date/time device owners.
2014-08-27 14:43:10 +00:00
Sander Alewijnse
49a07d7b62
am eb3f4b1c: Merge "Provide lockdown of date/time device owners." into lmp-dev
...
* commit 'eb3f4b1ce11215458c3f231cc8fff0e8e823b6dc':
Provide lockdown of date/time device owners.
2014-08-27 14:34:27 +00:00
Sander Alewijnse
ebaf5c70e9
Merge "Provide lockdown of date/time device owners." into lmp-dev
2014-08-27 14:25:35 +00:00
John Spurlock
aa8a21aa16
am 1965bb24: am fa4e6f1d: Merge "StatusBar: Add new icon slot for cast status." into lmp-dev
...
* commit '1965bb24322707c9e2e34decfd746ce7981d8936':
StatusBar: Add new icon slot for cast status.
2014-08-27 14:11:25 +00:00
vandwalle
8c1f0b3faf
am f7c9ffc3: am 4c5d4e29: Merge "fix ScanResult read from parcel, this function was broken and causes wifi settings to crash" into lmp-dev
...
* commit 'f7c9ffc381b4f8001caacfdd82386f0b060e4dd1':
fix ScanResult read from parcel, this function was broken and causes wifi settings to crash
2014-08-27 14:11:21 +00:00
John Spurlock
48abdd1fb9
am fa4e6f1d: Merge "StatusBar: Add new icon slot for cast status." into lmp-dev
...
* commit 'fa4e6f1dd6522dea3c521686f7cc5bfbb850a137':
StatusBar: Add new icon slot for cast status.
2014-08-27 14:03:31 +00:00
vandwalle
567943bdcf
am 4c5d4e29: Merge "fix ScanResult read from parcel, this function was broken and causes wifi settings to crash" into lmp-dev
...
* commit '4c5d4e29e317167947392a5b6280fcb6f2d68b85':
fix ScanResult read from parcel, this function was broken and causes wifi settings to crash
2014-08-27 14:03:24 +00:00
John Spurlock
1bf47b9117
Doze: Better handling for non-default templates.
...
Only apply icon-specific filters if the views are found.
Bug:17289392
Change-Id: I23d1542f8e80d8efed2330fff3f86d0e58a54b7c
2014-08-27 10:02:23 -04:00
Jorim Jaggi
a99a47b004
am fc5665d1: am bb45000d: Merge "Content description for clear all notifications" into lmp-dev
...
* commit 'fc5665d1886504e837a2f03978a52b2252c4861f':
Content description for clear all notifications
2014-08-27 14:01:33 +00:00
Calin Juravle
d71de10c42
Update the handling of the native bridge property.
...
ro.dalvik.vm.native.bridge is expected to be always be set. A value of
"0" means that the native bridge is disabled and that no value should be
passed to the runtime.
Bug: 17104449
(cherry picked from commit 831bd75b2bbc126f02578a967e925271b9cac6d3)
Change-Id: Ib483ac8e96bdc66af2725815807d4deb36fb36ab
2014-08-27 15:00:55 +01:00
John Spurlock
98f8a04620
Merge "StatusBar: Add new icon slot for cast status." into lmp-dev
2014-08-27 13:58:14 +00:00
Jorim Jaggi
0275e5b037
am bb45000d: Merge "Content description for clear all notifications" into lmp-dev
...
* commit 'bb45000db1217466c18114a067a74741d068ebad':
Content description for clear all notifications
2014-08-27 13:54:18 +00:00
vandwalle
58ecda5915
Merge "fix ScanResult read from parcel, this function was broken and causes wifi settings to crash" into lmp-dev
2014-08-27 13:51:59 +00:00
Calin Juravle
e8d2ffd733
Pass vmSafeMode (manifest attribute) to installd.
...
The flag is used to enforce --interpret-only flag when running dex2oat.
Bug: 12457423
(cherry picked from commit 11e08c010a42390803b65eaa698ca0e768aed896)
Change-Id: I215339527e998b24e274c8df42a5024839e6a9fa
2014-08-27 14:49:11 +01:00
Calin Juravle
af8f2d3351
am 5aede5a2: (-s ours) am 9b5112c3: Merge "Make native bridge property read-only."
...
* commit '5aede5a226b181f602b208c99a4a10b959e967fd':
Make native bridge property read-only.
2014-08-27 13:48:54 +00:00
Jorim Jaggi
394ea9eafa
Merge "Content description for clear all notifications" into lmp-dev
2014-08-27 13:43:11 +00:00
Jorim Jaggi
ca3b1af1e3
Content description for clear all notifications
...
Bug: 17258095
Change-Id: Iafd92f9c1f0bb14ebf53a30b888f144866582925
2014-08-27 15:42:44 +02:00
John Spurlock
96fe98d0c0
StatusBar: Add new icon slot for cast status.
...
Bug:17275998
Change-Id: I7e80b3d76480fc2fdcb3aa5d445d895829d341d0
2014-08-27 09:36:02 -04:00