Svet Ganov
1ec1227826
am 5906bbfb: Merge "Magnification bounds not always animated on a looper thread." into lmp-dev
...
* commit '5906bbfbed44245a917a9b88cf51aa88c17de993':
Magnification bounds not always animated on a looper thread.
2014-09-02 18:02:16 +00:00
Jorim Jaggi
198e5500bf
am 9ffdc3bd: Merge "Use separate icon group for signal/battery in QS header" into lmp-dev
...
* commit '9ffdc3bd05cf7c3835014ac755ab023bf1d0367d':
Use separate icon group for signal/battery in QS header
2014-09-02 18:02:12 +00:00
Svet Ganov
6906771d76
Merge "Magnification bounds not always animated on a looper thread." into lmp-dev
2014-09-02 17:43:18 +00:00
Jorim Jaggi
210052e7c7
Merge "Use separate icon group for signal/battery in QS header" into lmp-dev
2014-09-02 17:43:11 +00:00
Jorim Jaggi
06d551ac62
Use separate icon group for signal/battery in QS header
...
This reverts the terrible hack that reattaches the system icons when
expanding QS. This primarily fixes that the alpha of the icons was
wrong when closing the shade, but also fixes flickering when expanding
the shade.
Bug: 17338013
Change-Id: Ifcbe03eca43ed7639059734e23d740c1b8a7a9de
2014-09-02 17:42:25 +00:00
Tyler Gunn
bd4ca2b4b4
am 78c0d4ab: Merge "Remove "ask each time" SIP call setting. (1/2)" into lmp-dev
...
* commit '78c0d4ab75c61efc48af1a698fd7d36620523866':
Remove "ask each time" SIP call setting. (1/2)
2014-09-02 17:42:11 +00:00
Dianne Hackborn
8bce896373
am 4b9a934c: Merge "Hide the interaction part of VoiceInteractionService." into lmp-dev
...
* commit '4b9a934cef4de4985c0e316ef89ca41b3e720135':
Hide the interaction part of VoiceInteractionService.
2014-09-02 17:42:08 +00:00
Tyler Gunn
4b7498d81f
Merge "Remove "ask each time" SIP call setting. (1/2)" into lmp-dev
2014-09-02 17:31:39 +00:00
Ronghua Wu
4f932886aa
am e4999af8: Merge "API: Document android-allow-cross-domain-redirect in MediaPlayer and VideoView" into lmp-dev
...
* commit 'e4999af808ac0e48932e3ac843df9bb9e6a45c46':
API: Document android-allow-cross-domain-redirect in MediaPlayer and VideoView
2014-09-02 17:31:11 +00:00
Yorke Lee
82eebbe6b1
am 38a10cd4: Merge "Add lookup key to callerInfo" into lmp-dev
...
* commit '38a10cd4bbe74c4d815810a759860e8da7c5e3a8':
Add lookup key to callerInfo
2014-09-02 17:31:08 +00:00
Amith Yamasani
f1541722e4
am 9bdf3963: Merge "Make it possible to remove current user" into lmp-dev
...
* commit '9bdf3963a64d8eb0b66705da3922c464badaa539':
Make it possible to remove current user
2014-09-02 17:31:04 +00:00
Dianne Hackborn
76a65d5f00
Merge "Hide the interaction part of VoiceInteractionService." into lmp-dev
2014-09-02 17:30:49 +00:00
Dianne Hackborn
d7c0395d26
Hide the interaction part of VoiceInteractionService.
...
Also the ability to start voice activities is turned off,
though for testing purposes it can be turned back on with a system
property.
Change-Id: I867704d32c53beeb851ceea9b45c28bf5c01ef61
2014-09-02 10:29:28 -07:00
Ronghua Wu
a7118c9bb2
Merge "API: Document android-allow-cross-domain-redirect in MediaPlayer and VideoView" into lmp-dev
2014-09-02 17:27:26 +00:00
Yorke Lee
9dfea28fa8
Merge "Add lookup key to callerInfo" into lmp-dev
2014-09-02 17:24:55 +00:00
Amith Yamasani
2cdcc7d360
Merge "Make it possible to remove current user" into lmp-dev
2014-09-02 17:21:58 +00:00
RoboErik
68ec10eacf
am b7d24c75: Merge "Update MediaBrowser to use String ids instead of Uris" into lmp-dev
...
* commit 'b7d24c7539ba40159a34ad1b7bcb173e3c066dc5':
Update MediaBrowser to use String ids instead of Uris
2014-09-02 17:09:47 +00:00
RoboErik
17a1b48629
Merge "Update MediaBrowser to use String ids instead of Uris" into lmp-dev
2014-09-02 16:58:30 +00:00
Jae Seo
686bcd5809
am 746a550b: Merge "TIF: Allow ISO 639-1 code for Channels.COLUMN_AUDIO_LANGUAGE" into lmp-dev
...
* commit '746a550b31627e3d40c416d7ef35ae351898b938':
TIF: Allow ISO 639-1 code for Channels.COLUMN_AUDIO_LANGUAGE
2014-09-02 16:25:23 +00:00
Jae Seo
a900a88b0c
am e42eaea7: Merge "TIF: Fix the Singapore content ratings" into lmp-dev
...
* commit 'e42eaea72d69c26b338d4783e4ff30e4f86b952b':
TIF: Fix the Singapore content ratings
2014-09-02 16:25:20 +00:00
George Mount
226cc30fbb
am 8fd72d49: Merge "Update window always on convertTo/FromTranslucent" into lmp-dev
...
* commit '8fd72d49213971e8a2ef84831c0035692a877870':
Update window always on convertTo/FromTranslucent
2014-09-02 16:25:16 +00:00
ztenghui
70e2541724
am bb63ef12: Merge "Fix the (0,0) vector case for extra vertices computation" into lmp-dev
...
* commit 'bb63ef1298cf4505cfb44000d00c97e34fa975cb':
Fix the (0,0) vector case for extra vertices computation
2014-09-02 16:25:11 +00:00
Sungsoo Lim
3bd1621461
am d15591a7: Merge "Do not show the input icon when it\'s not available." into lmp-dev
...
* commit 'd15591a70faf8890aab69c5e6bb51138e8241aea':
Do not show the input icon when it's not available.
2014-09-02 16:25:07 +00:00
Jae Seo
65899b1092
Merge "TIF: Allow ISO 639-1 code for Channels.COLUMN_AUDIO_LANGUAGE" into lmp-dev
2014-09-02 16:20:28 +00:00
Jae Seo
9e85408f12
Merge "TIF: Fix the Singapore content ratings" into lmp-dev
2014-09-02 16:20:10 +00:00
George Mount
b4558e7e5f
Merge "Update window always on convertTo/FromTranslucent" into lmp-dev
2014-09-02 16:20:06 +00:00
ztenghui
6a08b8f9b4
Merge "Fix the (0,0) vector case for extra vertices computation" into lmp-dev
2014-09-02 16:17:01 +00:00
Sungsoo Lim
75f903e123
Merge "Do not show the input icon when it's not available." into lmp-dev
2014-09-02 16:16:02 +00:00
Sungsoo Lim
3633832063
Do not show the input icon when it's not available.
...
Bug: 17335230
Change-Id: Icb84949ed55f22bb384df9ed4bbfe3d86949c301
2014-09-02 09:13:43 -07:00
Robin Lee
e0ee3bc2eb
am 8d5246ed: Merge "Delete locksettings files for toplevel users only" into lmp-dev
...
* commit '8d5246eda35272bacf861e0ecc4f006b9fa9720b':
Delete locksettings files for toplevel users only
2014-09-02 15:59:30 +00:00
Robin Lee
89369b29db
Merge "Delete locksettings files for toplevel users only" into lmp-dev
2014-09-02 15:51:51 +00:00
Selim Cinek
2be3a8420e
am d4fbac6e: Merge "Fixed a bug in the notification touch selection." into lmp-dev
...
* commit 'd4fbac6e8304baf0c08254d6778a79ab6cc0a429':
Fixed a bug in the notification touch selection.
2014-09-02 15:46:16 +00:00
Tyler Gunn
2c830a2905
Remove "ask each time" SIP call setting. (1/2)
...
1. Removed setting from Settings.System class.
2. Added settings database migration step to change "SIP_ASK_ME_EACH_TIME"
to "SIP_ADDRESS_ONLY" as the "ask me each time" option no longer makes
sense given the new phone accounts settings.
Bug: 17321422
Change-Id: I3df1be4fcda44f2097c49af44508ac1fce72a24b
2014-09-02 08:39:35 -07:00
Selim Cinek
9547fd4a2e
Merge "Fixed a bug in the notification touch selection." into lmp-dev
2014-09-02 15:37:06 +00:00
Christoph Studer
4ae82270f2
am f7363473: Merge "SysUI: Ignore group children when summary is present" into lmp-dev
...
* commit 'f736347370ef485e9bd3c138e2d02d0db033a295':
SysUI: Ignore group children when summary is present
2014-09-02 15:33:54 +00:00
Christoph Studer
e0320054a7
Merge "SysUI: Ignore group children when summary is present" into lmp-dev
2014-09-02 15:22:17 +00:00
Jorim Jaggi
1d13866614
am c7bdf1ab: Merge "Fix expanded notifications on lockscreen" into lmp-dev
...
* commit 'c7bdf1ab11f2c66b8db6023ac817b142b2ec15f1':
Fix expanded notifications on lockscreen
2014-09-02 15:16:26 +00:00
Robin Lee
1096cf8664
Delete locksettings files for toplevel users only
...
Fixes an issue created by change:
I7941707ca66ac25bd122fd22e5e0f639e7af697e
Bug: 16233206
Change-Id: Ia905d153e94303acd611178333adc77c68933711
2014-09-02 16:12:06 +01:00
Jorim Jaggi
2debc99efa
Merge "Fix expanded notifications on lockscreen" into lmp-dev
2014-09-02 15:07:37 +00:00
Jorim Jaggi
e62d589bea
Fix expanded notifications on lockscreen
...
Bug: 17340086
Change-Id: I388f859cea1ad5daf195590512ee684e88b9299c
2014-09-02 16:32:23 +02:00
Selim Cinek
abdc5a0782
Fixed a bug in the notification touch selection.
...
This lead to the wrong notification being selected and
therefore the longpress listener would not be triggered.
Also added some logging for cases where the longpress
listener would not fire.
Bug: 17332879
Change-Id: I9a5cd9bfe3108ca3e366711d34d1e218f1d520cf
2014-09-02 14:42:10 +02:00
Selim Cinek
7dcea1d440
am cb2356fc: Merge "Fixed crash with notification guts" into lmp-dev
...
* commit 'cb2356fc97fc1912d40840edeb1b2a7729a6903d':
Fixed crash with notification guts
2014-09-02 11:56:32 +00:00
Selim Cinek
42b7e54c68
am 509c03d2: Merge "Fixed LTR and RTL naming confusion in navigation bar" into lmp-dev
...
* commit '509c03d288be0e60966f5157eea919ba0f627669':
Fixed LTR and RTL naming confusion in navigation bar
2014-09-02 11:56:28 +00:00
Selim Cinek
56d3cb3013
Merge "Fixed crash with notification guts" into lmp-dev
2014-09-02 11:48:28 +00:00
Selim Cinek
6301c555dc
Merge "Fixed LTR and RTL naming confusion in navigation bar" into lmp-dev
2014-09-02 11:47:47 +00:00
Selim Cinek
edb893bae6
Fixed crash with notification guts
...
Bug: 17350166
Change-Id: I4b5eb19b30e57486f48fa8c397e7450426f36464
2014-09-02 12:51:31 +02:00
Christoph Studer
d722f27323
SysUI: Ignore group children when summary is present
...
This is an optimization to avoid inflating Views for notifications
we're not going to show and free up memory ASAP. No behavioral changes
expected.
Bug: 16302692
Change-Id: I5fa03dcc9ad9cae4afc7cd6102d7ea8bfbdcbfd5
2014-09-02 11:49:19 +02:00
Jae Seo
3652e1d8b8
TIF: Fix the Singapore content ratings
...
It is not that Singapore has two different rating systems. There is just one
rating system from Board of Film Censors but each broadcaster uses a different
subset of ratings. For example, Free-To-Air uses PG and PG13 while Pay TV uses
NC16 and M18 ratings in addition to the PG and PG13.
Bug: 17330613
Change-Id: I5a5e47706e7415f13a5e7dc9c00cc2c3c3763965
2014-09-02 00:30:01 -07:00
Jae Seo
d6ae33bd6a
TIF: Allow ISO 639-1 code for Channels.COLUMN_AUDIO_LANGUAGE
...
Bug: 17331873
Change-Id: Idabeb056ae2105125174d7392dbe4fae614752fc
2014-09-01 23:49:00 -07:00
Yuncheol Heo
90e7cebeb7
am c24ad043: Disable the debug flag in HdmiLogger.
...
* commit 'c24ad043772e5b2b36ee18560fc22ff0391bb80c':
Disable the debug flag in HdmiLogger.
2014-09-02 06:34:33 +00:00