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

14639 Commits

Author SHA1 Message Date
Michael Wright
70a4cb92f9 am 31572ede: am 5497e99c: am eec75faa: Merge "Clean up graphics resources." into lmp-mr1-dev 
* commit '31572ede1c85efccb8b876e4492f7a23a9b8e739':
  Clean up graphics resources.
 2015-01-15 03:44:59 +00:00
Christoph Studer
61e13698a8 am 4d5e761a: am a80da9d0: am b018399a: SysUI: Log lockscreen gestures 
* commit '4d5e761a34c73a700757ade349e9a05b3335f617':
  SysUI: Log lockscreen gestures
 2015-01-15 02:57:09 +00:00
Jorim Jaggi
568e54be71 resolve merge conflicts of 87f5369 to master. 
Change-Id: I5d1a7aaf48c4bf70f7181508aa46fbbcc2cf7086
 2015-01-15 00:12:18 +01:00
Adrian Roos
4bc5b2bce9 Merge "LockPatternUtils clean up continued" 2015-01-14 22:32:08 +00:00
Adrian Roos
9dd16ebcf2 LockPatternUtils clean up continued 
- Deprecate Settings.Secure.LOCK_PATTERN_ENABLED
- Remove unused permanent lock out
- Disallow empty/null arguments to saveLockPattern and saveLockPassword
- Refactor repeated quality checks

Change-Id: I6f369eb60f8f6bb1e33384cd06534c713ab52e79
 2015-01-14 22:51:31 +01:00
Michael Wright
31572ede1c am 5497e99c: am eec75faa: Merge "Clean up graphics resources." into lmp-mr1-dev 
* commit '5497e99c4a749a46b8e9f8312d01639987ba81a0':
  Clean up graphics resources.
 2015-01-14 21:32:37 +00:00
Michael Wright
5497e99c4a am eec75faa: Merge "Clean up graphics resources." into lmp-mr1-dev 
* commit 'eec75faaa25b5da3382cf0925a65e9e6bd90fdc9':
  Clean up graphics resources.
 2015-01-14 21:26:52 +00:00
Michael Wright
eec75faaa2 Merge "Clean up graphics resources." into lmp-mr1-dev 2015-01-14 21:21:40 +00:00
Adrian Roos
bb4bc22021 Merge "Directly dispatch USER_REMOVED to LockSettingsService" 2015-01-14 20:45:42 +00:00
Adrian Roos
0791e8fb30 Merge "Purge biometric weak and keyguard widgets" 2015-01-14 20:41:35 +00:00
Christoph Studer
4d5e761a34 am a80da9d0: am b018399a: SysUI: Log lockscreen gestures 
* commit 'a80da9d069ba3db60b9b43b4e10294a1700e9ca5':
  SysUI: Log lockscreen gestures
 2015-01-14 19:24:42 +00:00
Jorim Jaggi
87f536948c am c1691e3f: am 86e1788d: Merge "Only notify SIM state changes when it has actually changed" into lmp-mr1-dev 
* commit 'c1691e3f8b148bc0a986fa7d4c4bfaee56c6442c':
  Only notify SIM state changes when it has actually changed
 2015-01-14 19:24:36 +00:00
Christoph Studer
f4e943e8a6 am 2d26435f: am bd0db7b1: Merge "SysUI: Log lockscreen state to eventlog" into lmp-mr1-dev 
* commit '2d26435f0e8a46f3653fb6f25dbfd92d90b8d80e':
  SysUI: Log lockscreen state to eventlog
 2015-01-14 19:24:30 +00:00
Christoph Studer
a80da9d069 am b018399a: SysUI: Log lockscreen gestures 
* commit 'b018399a3a2762e95126acbe14397eca15bad772':
  SysUI: Log lockscreen gestures
 2015-01-14 15:27:02 +00:00
Jorim Jaggi
c1691e3f8b am 86e1788d: Merge "Only notify SIM state changes when it has actually changed" into lmp-mr1-dev 
* commit '86e1788db46cdbcc65331dd8d0b9e23241a534fe':
  Only notify SIM state changes when it has actually changed
 2015-01-14 15:16:12 +00:00
Christoph Studer
2d26435f0e am bd0db7b1: Merge "SysUI: Log lockscreen state to eventlog" into lmp-mr1-dev 
* commit 'bd0db7b18f2a78b2ac2ff13234bf5b3582c9aec4':
  SysUI: Log lockscreen state to eventlog
 2015-01-14 15:16:07 +00:00
Christoph Studer
b018399a3a SysUI: Log lockscreen gestures 
Log the following lockscreen gestures:
 * Swipe up to unlock
 * Swipe down to enter full shade
 * Tap in empty area (causing unlock hint)
 * Swipe to camera
 * Swipe to dialer
 * Tap on lock to lock device
 * Tap on notification, activating it

For swipe gestures, includes length and velocity where available.

Bug: 18767135
Change-Id: Ib2c535e3a9d2b378f5a2a0a00c2be3fd916554ac
 2015-01-14 15:15:58 +00:00
Jorim Jaggi
86e1788db4 Merge "Only notify SIM state changes when it has actually changed" into lmp-mr1-dev 2015-01-14 15:13:09 +00:00
Christoph Studer
bd0db7b18f Merge "SysUI: Log lockscreen state to eventlog" into lmp-mr1-dev 2015-01-14 15:10:53 +00:00
Lorenzo Colitti
51d281ee41 am 792fd3d1: am 2b52cad1: Merge "Switch the connectivity check to its own hostname." into lmp-mr1-dev 
* commit '792fd3d1eea0d4e1c69480684cf3be4e4c215ace':
  Switch the connectivity check to its own hostname.
 2015-01-14 12:06:31 +00:00
Lorenzo Colitti
792fd3d1ee am 2b52cad1: Merge "Switch the connectivity check to its own hostname." into lmp-mr1-dev 
* commit '2b52cad12e371a173b61257599824934b1a6c930':
  Switch the connectivity check to its own hostname.
 2015-01-14 11:59:46 +00:00
Lorenzo Colitti
2b52cad12e Merge "Switch the connectivity check to its own hostname." into lmp-mr1-dev 2015-01-14 10:28:26 +00:00
Lorenzo Colitti
cd29cb66f9 Switch the connectivity check to its own hostname. 
Bug: 18467482
Bug: 18869302
Bug: 18924197
Change-Id: I1de478e9c8a165faf6f1bf81e042d1de9e03c3d5
 2015-01-14 08:06:56 +09:00
Wink Saville
494601e39a am 6a903c31: am 84c5e8eb: Merge "Rename reg/unreg OnSubscriptionsChangedListener." into lmp-mr1-dev 
automerge: 9482799

* commit '948279954ac88ecfd0678713158175702d981c73':
  Rename reg/unreg OnSubscriptionsChangedListener.
 2015-01-13 21:09:10 +00:00
Jorim Jaggi
01ba98b856 Only notify SIM state changes when it has actually changed 
onSubscriptionInfoChanged gets called quite frequently whenever
something about the connectivity changes, which could lead that the
whole state of the Keyguard was reset. This change actually checks
whether the state has really changed and thus only resets Keyguard
when necessary.

Bug: 18821582
Change-Id: Ia70804d0337b11914c7d57aa4cdc47d585786f1d
 2015-01-13 21:46:43 +01:00
Jason Monk
44f397efcf am 2168062b: am 0a1eb640: Merge "Carrier text handle sim removal" into lmp-mr1-dev automerge: a50a668 
* commit '2168062b23c8c343330f9a7b074a51efc4780cde':
  Carrier text handle sim removal
 2015-01-13 20:31:32 +00:00
Wink Saville
948279954a am 6a903c31: am 84c5e8eb: Merge "Rename reg/unreg OnSubscriptionsChangedListener." into lmp-mr1-dev 
* commit '6a903c31fede2fabdbcda7b5fe0cddcf467f1eb7':
  Rename reg/unreg OnSubscriptionsChangedListener.
 2015-01-13 19:15:58 +00:00
Wink Saville
6a903c31fe am 84c5e8eb: Merge "Rename reg/unreg OnSubscriptionsChangedListener." into lmp-mr1-dev 
* commit '84c5e8ebf0185ca65d4bab148f6d72d71940aba8':
  Rename reg/unreg OnSubscriptionsChangedListener.
 2015-01-13 19:09:48 +00:00
Wink Saville
84c5e8ebf0 Merge "Rename reg/unreg OnSubscriptionsChangedListener." into lmp-mr1-dev 2015-01-13 19:02:07 +00:00
Winson Chung
7ce662ef87 Merge "DO NOT MERGE. Ensure screen pinning UI appears immediately after setting changes." into lmp-mr1-dev 2015-01-13 18:16:22 +00:00
Wink Saville
071743f0cb Rename reg/unreg OnSubscriptionsChangedListener. 
To addOnSubscriptionsChangedListener and
removeOnSubscriptionsChangedListener.

Bug: 18984103
Change-Id: I6636905093812af89c1c3702840e44c8c5ea891f
 2015-01-13 08:36:24 -08:00
Jason Monk
49accefb6f resolve merge conflicts of afeefb6 to master. 
Change-Id: I754a8439f77e4f9e2f636c5b7a04280a01721c95
 2015-01-13 09:15:17 -05:00
Winson Chung
98e8f7ac5e DO NOT MERGE. Ensure screen pinning UI appears immediately after setting changes. 
Fixes an issue where the screen pinning UI in the Overview space would
not appear on the first load after changing the setting, this was because
the updated flag was not read before the tasks were preloaded prior to
entering the Overview space.

Bug: 18986736
Change-Id: I50dc9ff6d369fb3f2593f2bf2c1dc4608878820f
 2015-01-12 17:36:47 -08:00
Michael Wright
2ed0513f20 Clean up graphics resources. 
Release SurfaceTexture after use in ColorFade and delete GL resources
in ImageWallpaper.

Bug: 17871993
Change-Id: I05bda03657ca502ba35b7187b6f361018f7ef687
 2015-01-12 15:31:02 -08:00
Jason Monk
2168062b23 am 0a1eb640: Merge "Carrier text handle sim removal" into lmp-mr1-dev 
automerge: a50a668

* commit 'a50a66824c3cb17bc618b4e2ca3166003b6ddc26':
  Carrier text handle sim removal
 2015-01-12 21:08:38 +00:00
Jason Monk
a50a66824c am 0a1eb640: Merge "Carrier text handle sim removal" into lmp-mr1-dev 
* commit '0a1eb640d29830813bb478b8635763a708b6310c':
  Carrier text handle sim removal
 2015-01-12 21:06:46 +00:00
Jason Monk
0a1eb640d2 Merge "Carrier text handle sim removal" into lmp-mr1-dev 2015-01-12 21:00:09 +00:00
Jason Monk
afeefb63c6 am d74a331a: Merge "Avoid showing emergency calls when not possible" into lmp-mr1-dev 
automerge: 3454612

* commit '3454612e2c0879ece4ac17c8b7ba93dce59b1907':
  Avoid showing emergency calls when not possible
 2015-01-12 16:28:02 +00:00
Jason Monk
3454612e2c am d74a331a: Merge "Avoid showing emergency calls when not possible" into lmp-mr1-dev 
* commit 'd74a331ae16b17cf1967186b5392676d2e3c427c':
  Avoid showing emergency calls when not possible
 2015-01-12 16:25:56 +00:00
Geoff Mendal
91a9bfc346 Merge "Import translations. DO NOT MERGE" 2015-01-12 15:10:53 +00:00
Geoff Mendal
07adc61c66 Import translations. DO NOT MERGE 
Change-Id: I819509b5730478b287816b9f6f8c09623bd12dd2
Auto-generated-cl: translation import
 2015-01-12 07:10:22 -08:00
Geoff Mendal
881f8d1ee3 Import translations. DO NOT MERGE 
Change-Id: Ic7e685a040aabf416658ed9d70fbbdef047f7cb9
Auto-generated-cl: translation import
 2015-01-12 06:49:42 -08:00
Jason Monk
d74a331ae1 Merge "Avoid showing emergency calls when not possible" into lmp-mr1-dev 2015-01-12 14:01:04 +00:00
Jason Monk
6c985dcc2d Carrier text handle sim removal 
Have KeyguardUpdateMonitor send the onRefreshCarrierInfo when the
subscription info changes, regardless of whether there are any
subscriptions (because there might be no sims).

Bug: 18752587
Change-Id: I8976c76aae9e3e633b6adace48dccb1e940dbc18
 2015-01-09 16:07:14 -05:00
Christopher Tate
0c3e78c93f am a97fe138: Merge "Exclude ephemeral networks from wifi backup" into lmp-mr1-dev automerge: 68dabad 
automerge: f3ac99f

* commit 'f3ac99f2e093f851ca52bcd5aefb251046db10fa':
  Exclude ephemeral networks from wifi backup
 2015-01-09 20:25:31 +00:00
Christopher Tate
f3ac99f2e0 am a97fe138: Merge "Exclude ephemeral networks from wifi backup" into lmp-mr1-dev 
automerge: 68dabad

* commit '68dabada9e6e380ec0c6dacbc2ce7a46aa663a07':
  Exclude ephemeral networks from wifi backup
 2015-01-09 20:20:01 +00:00
Christopher Tate
68dabada9e am a97fe138: Merge "Exclude ephemeral networks from wifi backup" into lmp-mr1-dev 
* commit 'a97fe1387df731ddbbdae7c75dfbdfa4f1eb0339':
  Exclude ephemeral networks from wifi backup
 2015-01-09 20:16:21 +00:00
Chet Haase
5058c38a31 Add backgroundColor getter to View 
Change-Id: I3a75169a2e91ec712fb1db4d130089a1261fc66b
 2015-01-09 10:00:22 -08:00
Jim Miller
83eb4443a9 Merge "Remove unused string from keyguard_presentation." 2015-01-09 03:10:54 +00:00
Christopher Tate
cab915a327 Exclude ephemeral networks from wifi backup 
We compare the set of networks defined in the supplicant with the
set of networks described as "configured" by the Wifi Manager.  The
latter excludes ephemeral networks, so any network definition we
find in the supplicant data that we do not also find in the
configured network set, we ignore for backup purposes.

Bug 18917753

Change-Id: I8e0f258d0cdb72d7bf9482fafe64dc921419fcb2
 2015-01-08 19:05:04 -08:00