RoboErik
5a97e61103
am cf7e33d3: Merge "Remove REMOTE_STREAM_MUSIC references from AudioService" into lmp-dev
...
* commit 'cf7e33d3c6cc800b11fc40b847db42bc34410b1d':
Remove REMOTE_STREAM_MUSIC references from AudioService
2014-08-14 17:39:14 +00:00
Selim Cinek
42c4f9269a
am b75adcf0: Merge "Fixed a NPE during setup wizard" into lmp-dev
...
* commit 'b75adcf03b56d8c81231cc9f1734661539bf912c':
Fixed a NPE during setup wizard
2014-08-14 17:34:51 +00:00
RoboErik
98085abc71
am 9d006c55: Merge "Post MediaSessionManager callbacks to the caller\'s thread" into lmp-dev
...
* commit '9d006c55a1d1750dba2f648aa680c3a8634a0bd8':
Post MediaSessionManager callbacks to the caller's thread
2014-08-14 17:16:46 +00:00
RoboErik
084bed4d73
am b11490fb: Merge "Add an onSessionDestroyed callback to MediaController.Callback" into lmp-dev
...
* commit 'b11490fb8f300e1f44223b03f20f7efa943d573b':
Add an onSessionDestroyed callback to MediaController.Callback
2014-08-14 17:09:01 +00:00
RoboErik
985ab5fbe5
am 098e4e09: Merge "Fix dates on copywrite in new test code" into lmp-dev
...
* commit '098e4e09a0a9320fb9121e6d5596efdbadd2ac0d':
Fix dates on copywrite in new test code
2014-08-14 17:08:56 +00:00
Jose Lima
406e4333f2
am bd2f1793: Make TranslucentConversionListener a SystemApi
...
* commit 'bd2f17932b96cad3f070a5078290f70cb1f387f4':
Make TranslucentConversionListener a SystemApi
2014-08-14 17:04:43 +00:00
RoboErik
5ca4a78e32
Merge "Post MediaSessionManager callbacks to the caller's thread" into lmp-dev
2014-08-14 16:46:52 +00:00
Torne (Richard Coles)
5ae4446993
am ca6c7cb1: Merge "Store the WebView\'s package info." into lmp-dev
...
* commit 'ca6c7cb19131de999bab89b524b0d09fdb8a6951':
Store the WebView's package info.
2014-08-14 16:17:15 +00:00
Jose Lima
14914858a0
Make TranslucentConversionListener a SystemApi
...
Change-Id: I59a93e1e040fdbaa9ef108b31e08e4553ba82ae1
2014-08-14 09:15:17 -07:00
RoboErik
b05ea7bb28
Merge "Add an onSessionDestroyed callback to MediaController.Callback" into lmp-dev
2014-08-14 16:10:21 +00:00
RoboErik
e7ba237ce4
Merge "Fix dates on copywrite in new test code" into lmp-dev
2014-08-14 16:10:21 +00:00
Jeff Sharkey
9da0bb60e4
am 67ec007c: Fix javadoc on PROTECTION_FLAG_APPOP.
...
* commit '67ec007c8e2fabe19ae1ad9bf369ccede4c96d54':
Fix javadoc on PROTECTION_FLAG_APPOP.
2014-08-14 16:08:45 +00:00
Jeff Sharkey
e9b78fdbbe
Fix javadoc on PROTECTION_FLAG_APPOP.
...
Change-Id: I36e339ac2c6e6842441fd2572b0b8cda24bd34ca
2014-08-14 16:01:37 +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
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
Jaewan Kim
6fe329bdbb
am 640ec96b: TIF: Change data type of custom labels and hide inputs
...
* commit '640ec96b078df5471e3041490bd8bb494836af75':
TIF: Change data type of custom labels and hide inputs
2014-08-14 03:15:58 +00:00
Dianne Hackborn
e5878600dc
am b344c188: Merge "Fix singleInstance usage when singleTop intended" into lmp-dev
...
* commit 'b344c188b3e97255fd35724200e356ed71229155':
Fix singleInstance usage when singleTop intended
2014-08-14 03:15:25 +00:00
Dianne Hackborn
dee0beefed
am b60a62ca: Merge "Fix issue #16794553 : Duplicate ArrayMap entries in Bundle..." into lmp-dev
...
* commit 'b60a62ca88eb73c7cdf45f75587db3cb68fbd978':
Fix issue #16794553 : Duplicate ArrayMap entries in Bundle...
2014-08-14 03:15:18 +00:00
Wonsik Kim
2fe0c2e098
am 21cdf598: Merge "TIF: handle HDMI CEC power status change" into lmp-dev
...
* commit '21cdf598ee5576592f7806053c5aea472caa04ef':
TIF: handle HDMI CEC power status change
2014-08-14 03:15:12 +00:00
Jose Lima
235510e672
Made AlarmClockInfo a nested class in AlarmManager
...
Bug: 16959028
Change-Id: I150eaaff765d1e214c3621c1bf50162ec0dac8ec
2014-08-14 02:10:41 +00:00
Jose Lima
4b6c6697da
Renamed "media playing" APIs to "visible behind"
...
- Request from API Review: rename the media playing APIs to a more
generic name, reflecting the background visibility feature these
methods actually control.
- Made the new isActivityVisibleBehind().
- Changed convertFromTranslucent() and convertToTranslucent() to be
SystemApi.
Bug: 16959028
Change-Id: I526eac22f44273b3254dd6201f89194d13e597e2
2014-08-14 02:00:04 +00:00
Jeff Brown
c12035cd40
Log who is calling goToSleep().
...
Change-Id: Ibae61c90ee115735835e878bb3bf79eedaa0ae44
2014-08-14 01:56:48 +00:00
Jaewan Kim
e2c83c97fb
TIF: Change data type of custom labels and hide inputs
...
Change-Id: I2783245671a2a2a5500c6f97acf6375f44db8bf4
2014-08-14 01:12:41 +00:00
Deepanshu Gupta
faf71d2002
am 848c83b2: Merge "Update intelliJ copyright profile" into lmp-dev
...
* commit '848c83b21bde4f1c0724f54411cf10935301868f':
Update intelliJ copyright profile
2014-08-14 00:37:18 +00:00
Deepanshu Gupta
09dc8f82ee
am 40748a08: Merge "Add KitKat wifi and battery icons." into lmp-dev
...
* commit '40748a0852d73a2d76140910ef66bfdb79691dc3':
Add KitKat wifi and battery icons.
2014-08-14 00:37:14 +00:00
Deepanshu Gupta
e19e540598
am 6f5604a6: Merge "Whitelist fonts instead of blacklist." into lmp-dev
...
* commit '6f5604a63a458addfdcfe4c5a3f0c1fb0a5899de':
Whitelist fonts instead of blacklist.
2014-08-14 00:37:09 +00:00
Dianne Hackborn
5b1500a7dc
Merge "Fix singleInstance usage when singleTop intended" into lmp-dev
2014-08-14 00:12:29 +00:00
Craig Mautner
ad400af809
Fix singleInstance usage when singleTop intended
...
In ag/499591 launchSingleInstance was mistakenly used to replace
r.launchMode==ActivityInfo.LAUNCH_SINGLE_TOP. This fixes that
and...
fixes bug 16898764.
Change-Id: I0c0cc3b67eda69276dbe1dd5da4f17556651b1ff
2014-08-13 17:17:21 -07:00
Deepanshu Gupta
a3a3775599
Merge "Update intelliJ copyright profile" into lmp-dev
2014-08-14 00:12:29 +00:00