drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
153,012 Commits 1 Branch 0 Tags
Commit Graph

153012 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
RoboErik
77c8179427 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:42 +00:00
Nick Kralevich
60888dbad1 am 0988daaa: Merge "Add testing api to SELinuxMMAC code." 
* commit '0988daaa23b469b3021ad93f819736160e21391f':
  Add testing api to SELinuxMMAC code.
 2014-09-02 17:03:32 +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
Nick Kralevich
0988daaa23 Merge "Add testing api to SELinuxMMAC code." 2014-09-02 16:52:13 +00:00
Robert Craig
99891156fc Add testing api to SELinuxMMAC code. 
Added needed api for local unit testing.

Change-Id: If52555ecb4f0e6bc06e153b6a17e2c706b11253e
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
 2014-09-02 12:50:29 -04:00
Jae Seo
16fd9afe29 am 88a6ada7: am 746a550b: Merge "TIF: Allow ISO 639-1 code for Channels.COLUMN_AUDIO_LANGUAGE" into lmp-dev 
* commit '88a6ada7ae19ebbed6419d4e60afac5162f744fa':
  TIF: Allow ISO 639-1 code for Channels.COLUMN_AUDIO_LANGUAGE
 2014-09-02 16:38:27 +00:00
Jae Seo
bfb54de468 am 057043e7: am e42eaea7: Merge "TIF: Fix the Singapore content ratings" into lmp-dev 
* commit '057043e767aa3131158ef290e21f9f06faa04c55':
  TIF: Fix the Singapore content ratings
 2014-09-02 16:38:23 +00:00
George Mount
94d23608eb am 8e95e5f7: am 8fd72d49: Merge "Update window always on convertTo/FromTranslucent" into lmp-dev 
* commit '8e95e5f75073aa7a43fba25ae9fc257ddc6159e6':
  Update window always on convertTo/FromTranslucent
 2014-09-02 16:38:18 +00:00
ztenghui
e358dd6ac0 am f431aeab: am bb63ef12: Merge "Fix the (0,0) vector case for extra vertices computation" into lmp-dev 
* commit 'f431aeab0db82bc7fdd0c50446990c4b7496609b':
  Fix the (0,0) vector case for extra vertices computation
 2014-09-02 16:38:12 +00:00
Sungsoo Lim
5401502602 am 9586eaa4: am d15591a7: Merge "Do not show the input icon when it\'s not available." into lmp-dev 
* commit '9586eaa4a6add78595589539754531bb8ec623fc':
  Do not show the input icon when it's not available.
 2014-09-02 16:38:07 +00:00
Jae Seo
f6c03553dd 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:22 +00:00
Jae Seo
d1b0d4b2a1 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:18 +00:00
George Mount
d32dd2e349 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:13 +00:00
ztenghui
e0a07bed0c 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:08 +00:00
Sungsoo Lim
880a0ef539 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:03 +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
948e21ad54 am e57fb4b6: am 8d5246ed: Merge "Delete locksettings files for toplevel users only" into lmp-dev 
* commit 'e57fb4b6c26cd2dbeb0571dfcd607de6a722eb7a':
  Delete locksettings files for toplevel users only
 2014-09-02 16:13:42 +00:00
Selim Cinek
3a1b7eb4a6 am 6fa4e34d: am d4fbac6e: Merge "Fixed a bug in the notification touch selection." into lmp-dev 
* commit '6fa4e34dc1c050b0607b85f32a3ccf43d4385861':
  Fixed a bug in the notification touch selection.
 2014-09-02 15:59:20 +00:00
Robin Lee
e5c21c3d84 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:58:39 +00:00
Robin Lee
89369b29db Merge "Delete locksettings files for toplevel users only" into lmp-dev 2014-09-02 15:51:51 +00:00
Christoph Studer
21c76a7df0 am 01132a46: am f7363473: Merge "SysUI: Ignore group children when summary is present" into lmp-dev 
* commit '01132a46d0c47c6fba58216e0f90c03fb302b2cd':
  SysUI: Ignore group children when summary is present
 2014-09-02 15:46:20 +00:00
Selim Cinek
2e22d7ae42 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:19 +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
Selim Cinek
b2da91b14f Notifications are now selectable by the Keyboard 
Also adapted the ripple colors a bit to be more visible.

Bug: 17203303
Change-Id: I7d0446d2641bcabb1e09b3af9535d88c4142e216
 2014-09-02 17:35:20 +02:00
Christoph Studer
1f7e0f0da1 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:34:02 +00:00
Jorim Jaggi
39e5bf0937 am 64e5cc2f: am c7bdf1ab: Merge "Fix expanded notifications on lockscreen" into lmp-dev 
* commit '64e5cc2f5ed92b3d8f5ec535da61e14c6ed52b01':
  Fix expanded notifications on lockscreen
 2014-09-02 15:28:35 +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
a86944db09 am c7bdf1ab: Merge "Fix expanded notifications on lockscreen" into lmp-dev 
* commit 'c7bdf1ab11f2c66b8db6023ac817b142b2ec15f1':
  Fix expanded notifications on lockscreen
 2014-09-02 15:16:05 +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
76252eea75 am 6fadaae8: am cb2356fc: Merge "Fixed crash with notification guts" into lmp-dev 
* commit '6fadaae8b106a6b1e20c18968c3e1798e48228f1':
  Fixed crash with notification guts
 2014-09-02 12:08:04 +00:00
Selim Cinek
88483b72c8 am 1a3d4729: am 509c03d2: Merge "Fixed LTR and RTL naming confusion in navigation bar" into lmp-dev 
* commit '1a3d47291ae394c4d1c79fa2ddc142dcdc031a25':
  Fixed LTR and RTL naming confusion in navigation bar
 2014-09-02 12:07:59 +00:00
Selim Cinek
c6c5b1bee1 am cb2356fc: Merge "Fixed crash with notification guts" into lmp-dev 
* commit 'cb2356fc97fc1912d40840edeb1b2a7729a6903d':
  Fixed crash with notification guts
 2014-09-02 11:55:42 +00:00
Selim Cinek
a0d61a2a63 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:55:38 +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
Michael Wright
75ee9fcde4 VirtualDisplay.Callbacks -> Callback 
Also, rename methods to be onPaused instead of onDisplayPaused, etc.

Bug: 17008630
Change-Id: Id9ead22a42d36ac338309f0f021ba341ed991144
 2014-09-01 23:49:57 -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
d5b5a00e7d am 4cfd049b: am c24ad043: Disable the debug flag in HdmiLogger. 
* commit '4cfd049be7e773f37454b8e981f2ac27db30f01c':
  Disable the debug flag in HdmiLogger.
 2014-09-02 06:45:17 +00:00