Doug Zongker
e2e18a3484
am a9c87471: am 2b13359a: Merge "@hide RECOVERY permission" into lmp-dev
...
* commit 'a9c874719b05430458ed523138a4a46aa0901bff':
@hide RECOVERY permission
2014-08-14 23:34:38 +00:00
Adrian Roos
c0d9817dfa
am c4f3392f: am af71a2db: Merge "Add content description for brightness slider" into lmp-dev
...
* commit 'c4f3392ff43a292e537da2065a929b04965bd16a':
Add content description for brightness slider
2014-08-14 23:34:31 +00:00
Jorim Jaggi
6fe410cf2f
am e3d0b697: am c0082f67: Make string consistent with Android writing guidelines
...
* commit 'e3d0b697ede2295cce7f23dcb2d303c9d3651a50':
Make string consistent with Android writing guidelines
2014-08-14 23:34:24 +00:00
Jorim Jaggi
4d3c5752aa
am 096f28d0: am 8b778c13: Make clock larger on tablets
...
* commit '096f28d0900798910a7c57378ce0aec8fc0e3f39':
Make clock larger on tablets
2014-08-14 23:34:14 +00:00
Jorim Jaggi
8f188d32b0
am ddf03adb: am 8cadb460: Use different unlock animation when going to full shade
...
* commit 'ddf03adb2e4150168dfe6e27338ca18e264f5f8d':
Use different unlock animation when going to full shade
2014-08-14 23:34:08 +00:00
Yuncheol Heo
1f929c9db8
am 944c7083: am d335bbe9: Merge "Implement MHL RAP transmission." into lmp-dev
...
* commit '944c7083d4714f14bdab4843cae6dbf01dd5b3c9':
Implement MHL RAP transmission.
2014-08-14 18:03:23 +00:00
Selim Cinek
e42d681ca7
am 993e6448: am f266d3b3: Fixed unnecessary layouting on wifi signal changes
...
* commit '993e6448bfd3ff26f29992d16f5d079e67e54eca':
Fixed unnecessary layouting on wifi signal changes
2014-08-14 18:03:16 +00:00
Lajos Molnar
a33e9ed91a
am 4f1245eb: am 266abcaf: Merge "media: release allocated strings on error" into lmp-dev
...
* commit '4f1245eb237d1fd6c78a98b4a984a5ee178348de':
media: release allocated strings on error
2014-08-14 18:03:06 +00:00
Prerepa Viswanadham
b8035fda5d
am 66e02987: am d58dee86: Protect from malformed advt with invalid manf_id/data combo
...
* commit '66e02987b45cb9d04c6bca790dcb3da612e81529':
Protect from malformed advt with invalid manf_id/data combo
2014-08-14 18:02:58 +00:00
Prerepa Viswanadham
2a2da65137
am 5550c2b1: am 011101fe: Prevent crash in Gatt service due to null pointer in BluetoothGattCharacteristic from framework
...
* commit '5550c2b101541300c8fa52989e4a98949319bd2a':
Prevent crash in Gatt service due to null pointer in BluetoothGattCharacteristic from framework
2014-08-14 18:02:51 +00:00
Wei Wang
b54b014dd3
am f7dfa984: am b5d9d07e: Merge "Clean up advertise and scan clients upon bluetooth down." into lmp-dev
...
* commit 'f7dfa984b57be7ed39b07f26cf9c74a2501a62a2':
Clean up advertise and scan clients upon bluetooth down.
2014-08-14 17:47:41 +00:00
Dongwon Kang
86bf8fffec
am 9b46af77: am b2e06223: TIF: resolve SecurityException on loadCustomLabel().
...
* commit '9b46af775ca4ed3880311c110fe8a22f37bc7d75':
TIF: resolve SecurityException on loadCustomLabel().
2014-08-14 17:47:34 +00:00
Sungsoo Lim
b270f5fcee
am 052d64a2: am 19e3564c: Merge "Update Java doc for TV Rating system" into lmp-dev
...
* commit '052d64a25ea5feafb69ff6857bcf2e2451e81f5f':
Update Java doc for TV Rating system
2014-08-14 17:47:29 +00:00
Jose Lima
95f3c34848
am 06804518: am d361d4f9: Made AlarmClockInfo a nested class in AlarmManager
...
* commit '068045187ef2b6011633b3a0bf273030ecb6d664':
Made AlarmClockInfo a nested class in AlarmManager
2014-08-14 17:47:08 +00:00
Jose Lima
f082842f2b
am b991fd6e: am ec8834a3: Renamed "media playing" APIs to "visible behind"
...
* commit 'b991fd6ec57b0f59e20f85a9cb9c63ac9d0ab98a':
Renamed "media playing" APIs to "visible behind"
2014-08-14 17:47:02 +00:00
Jeff Brown
d1ee11da70
am f281eea3: am 79bdc4d1: Log who is calling goToSleep().
...
* commit 'f281eea327ed9020333746cc77e48636662231b6':
Log who is calling goToSleep().
2014-08-14 17:46:57 +00:00
Jaewan Kim
68a7930468
am aa0b328f: am 640ec96b: TIF: Change data type of custom labels and hide inputs
...
* commit 'aa0b328f2d85042c12c91e9958437dbd47c2a79c':
TIF: Change data type of custom labels and hide inputs
2014-08-14 17:46:51 +00:00
Dianne Hackborn
fc9eebe397
am 9f886b5d: am b344c188: Merge "Fix singleInstance usage when singleTop intended" into lmp-dev
...
* commit '9f886b5d24b02978f56abe777819665d4eea4fbc':
Fix singleInstance usage when singleTop intended
2014-08-14 17:46:46 +00:00
Dianne Hackborn
ab843022e2
am 0bfe8aea: am b60a62ca: Merge "Fix issue #16794553 : Duplicate ArrayMap entries in Bundle..." into lmp-dev
...
* commit '0bfe8aea12144bfdcc34673c5b14309f141d4de7':
Fix issue #16794553 : Duplicate ArrayMap entries in Bundle...
2014-08-14 17:46:42 +00:00
Wonsik Kim
2c8d0d15fb
am a4f76c98: am 21cdf598: Merge "TIF: handle HDMI CEC power status change" into lmp-dev
...
* commit 'a4f76c98e66b1d1d45a57f88fffc75e63c3774c3':
TIF: handle HDMI CEC power status change
2014-08-14 17:46:37 +00:00
Deepanshu Gupta
de7f01641b
am 7e1ba550: am 848c83b2: Merge "Update intelliJ copyright profile" into lmp-dev
...
* commit '7e1ba55013c0f43941c0e53328f8b17cc113d03c':
Update intelliJ copyright profile
2014-08-14 17:46:07 +00:00
Deepanshu Gupta
e5817295e9
am 87267e4a: am 40748a08: Merge "Add KitKat wifi and battery icons." into lmp-dev
...
* commit '87267e4a427ee85f125618925ed3e108a73d41a5':
Add KitKat wifi and battery icons.
2014-08-14 17:45:59 +00:00
Deepanshu Gupta
afef9a7413
am da1101ec: am 6f5604a6: Merge "Whitelist fonts instead of blacklist." into lmp-dev
...
* commit 'da1101ec538c6d3999d2f4517258aecdf561c003':
Whitelist fonts instead of blacklist.
2014-08-14 17:45:54 +00:00
Robert Greenwalt
2f0faca669
am 9249840f: am eb2f9858: Merge "Don\'t send NetworkMonitor bcast until systemReady" into lmp-dev
...
* commit '9249840f7f5939d7f5efa233c1ef9f8ee57a57f7':
Don't send NetworkMonitor bcast until systemReady
2014-08-14 17:45:31 +00:00
Winson Chung
110d2ccdb8
am e53ad496: am 11d62d14: Merge "Adding scrim to task views. (Bug 15704955)" into lmp-dev
...
* commit 'e53ad496018d28cfb625eaec8c7ccbc1edae0581':
Adding scrim to task views. (Bug 15704955)
2014-08-14 17:45:23 +00:00
Doug Zongker
5b101a7c45
am 2b13359a: Merge "@hide RECOVERY permission" into lmp-dev
...
* commit '2b13359aa8b7deb2cf4c46f0673159fe4d8bfa22':
@hide RECOVERY permission
2014-08-14 14:29:58 +00:00
Adrian Roos
b870d1f433
am af71a2db: Merge "Add content description for brightness slider" into lmp-dev
...
* commit 'af71a2db633fac49228b613c5c1b1c4101bb9f36':
Add content description for brightness slider
2014-08-14 14:17:51 +00:00
Jorim Jaggi
32bf48856e
am c0082f67: Make string consistent with Android writing guidelines
...
* commit 'c0082f6742ece8f0f8bf3c0f696c5db68b8afb4e':
Make string consistent with Android writing guidelines
2014-08-14 14:05:58 +00:00
Jorim Jaggi
011c2723a0
am 8b778c13: Make clock larger on tablets
...
* commit '8b778c138b7c7f0644e9d2f76b01c0676099cba5':
Make clock larger on tablets
2014-08-14 12:33:46 +00:00
Jorim Jaggi
57647c1603
Make string consistent with Android writing guidelines
...
Bug: 17018250
Change-Id: I1ab736bddc81e4741995175db62a7d0ff459a940
2014-08-14 12:33:45 +00:00
Jorim Jaggi
bcd5613f41
am 8cadb460: Use different unlock animation when going to full shade
...
* commit '8cadb460875509c578e3d86d77046af9e0d299a9':
Use different unlock animation when going to full shade
2014-08-14 12:33:41 +00:00
Jorim Jaggi
e210cc8e94
Make clock larger on tablets
...
Also fixes "Large text" option on lockscreen and fixes Keyguard
layout on smaller devies. In addition, make sure that landscape
layout for phones isn't terrible broken (it's not pretty but
it works).
Bug: 14994495
Bug: 15589636
Bug: 16799035
Change-Id: I9ab76af41cbecd1a727d019e422765efbbd3276d
2014-08-14 12:30:14 +00:00
Jorim Jaggi
84a3e7aacf
Use different unlock animation when going to full shade
...
Also fixes a bug that the notify flag was not reset, and fix the
transition for the phone/camera affordance (in these cases, no
animation is needed).
Bug: 15991916
Change-Id: Idbb4fa40f86bda597cd66cc38da838ef4f75514d
2014-08-14 12:29:25 +00:00
Yuncheol Heo
0344666857
am d335bbe9: Merge "Implement MHL RAP transmission." into lmp-dev
...
* commit 'd335bbe995e2e76fede68b99b3c9ddc89e152712':
Implement MHL RAP transmission.
2014-08-14 10:05:33 +00:00
Selim Cinek
fa456e8a40
am f266d3b3: Fixed unnecessary layouting on wifi signal changes
...
* commit 'f266d3b38fab70a48a0570028a5d3ffa0e13b58d':
Fixed unnecessary layouting on wifi signal changes
2014-08-14 09:29:13 +00:00
Selim Cinek
f645761f47
Fixed unnecessary layouting on wifi signal changes
...
This could cause a layout every few hundred ms, even
when the QS panel was closed.
Bug: 17001532
Change-Id: I3f2b9b9621dced7f5b6fff67d24efc7444b0a9ad
2014-08-14 09:24:21 +00:00
Lajos Molnar
4456ff52ec
am 266abcaf: Merge "media: release allocated strings on error" into lmp-dev
...
* commit '266abcaff74f10909412489951fe36bb13cd1ab4':
media: release allocated strings on error
2014-08-14 07:41:16 +00:00
Prerepa Viswanadham
29b2f540f2
am d58dee86: Protect from malformed advt with invalid manf_id/data combo
...
* commit 'd58dee869380ee89eb29555cdf8a52e4d165e770':
Protect from malformed advt with invalid manf_id/data combo
2014-08-14 05:49:53 +00:00
Prerepa Viswanadham
c521b4e999
am 011101fe: Prevent crash in Gatt service due to null pointer in BluetoothGattCharacteristic from framework
...
* commit '011101fef1351ba03e79eaca79d54bf8723d439b':
Prevent crash in Gatt service due to null pointer in BluetoothGattCharacteristic from framework
2014-08-14 05:37:00 +00:00
Prerepa Viswanadham
621085e50f
Protect from malformed advt with invalid manf_id/data combo
...
Bug: 16979645
Change-Id: Ie7ea00ed20cbad1120c7582bb2bafd44b4295052
2014-08-14 05:33:11 +00:00
Prerepa Viswanadham
ee3cc8bf17
Prevent crash in Gatt service due to null pointer in
...
BluetoothGattCharacteristic from framework
Bug 16899517
Change-Id: Ib30ddefee07c2953f9a7faeb4eaa823feeebdc8f
2014-08-14 05:32:06 +00:00
Wei Wang
9acc27e39c
am b5d9d07e: Merge "Clean up advertise and scan clients upon bluetooth down." into lmp-dev
...
* commit 'b5d9d07e771f51e95b8a75507e8d044dad8e8df5':
Clean up advertise and scan clients upon bluetooth down.
2014-08-14 04:59:31 +00:00
Glenn Kasten
032ec5a0f0
am 95ff26f9: am 1666a7c5: Merge "Move setting to disable automatic USB routing" into lmp-dev
...
* commit '95ff26f927a8fc0179a5f3a5012090b1568b58c6':
Move setting to disable automatic USB routing
2014-08-14 04:20:14 +00:00
Adrian Roos
df215c7f9a
am 129b6ef3: am 74deb86b: Fix detail header padding
...
* commit '129b6ef36920cb572ce4529eb5fab7f86c16aff7':
Fix detail header padding
2014-08-14 04:15:08 +00:00
Dongwon Kang
bcc8084098
am b2e06223: TIF: resolve SecurityException on loadCustomLabel().
...
* commit 'b2e06223ca1ef64f4c2313bae131f4be5b461f0f':
TIF: resolve SecurityException on loadCustomLabel().
2014-08-14 03:56:42 +00:00
Sungsoo Lim
906b8497dd
am 19e3564c: Merge "Update Java doc for TV Rating system" into lmp-dev
...
* commit '19e3564ce1db19b35d3843f5f349946ca0659e6b':
Update Java doc for TV Rating system
2014-08-14 03:49:18 +00:00
Dongwon Kang
d4eb10a88d
TIF: resolve SecurityException on loadCustomLabel().
...
Bug: 17001118
Change-Id: I357ac2506562c028116c3e4f6dd611ef2b744d28
2014-08-14 03:43:07 +00:00
Jose Lima
9c47f59c0d
am d361d4f9: Made AlarmClockInfo a nested class in AlarmManager
...
* commit 'd361d4f95e7d1cb7b59371bf19fa64fef35881b0':
Made AlarmClockInfo a nested class in AlarmManager
2014-08-14 03:16:50 +00:00
Jose Lima
da7f797de6
am ec8834a3: Renamed "media playing" APIs to "visible behind"
...
* commit 'ec8834a3da1848515ba016e15f1255a72dd7d3bc':
Renamed "media playing" APIs to "visible behind"
2014-08-14 03:16:37 +00:00
Jeff Brown
92c1d5670b
am 79bdc4d1: Log who is calling goToSleep().
...
* commit '79bdc4d16f2c0a8337065f39b6b66cb0889bcce9':
Log who is calling goToSleep().
2014-08-14 03:16:26 +00:00