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

10438 Commits

Author SHA1 Message Date
Brian Colonna
ad2aad4f6e am 24374512: am 92a8d65b: Merge "Bug 17250075: Turned off debugging for launching secure camera" into lmp-dev 
* commit '24374512946d07b8bd890eea09377ea3ca9c3aef':
  Bug 17250075: Turned off debugging for launching secure camera
 2014-08-26 04:16:56 +00:00
Brian Colonna
3e76354243 am 92a8d65b: Merge "Bug 17250075: Turned off debugging for launching secure camera" into lmp-dev 
* commit '92a8d65bdce1487002ce8aa5225ad89d1942b24e':
  Bug 17250075: Turned off debugging for launching secure camera
 2014-08-25 18:52:24 +00:00
Brian Colonna
bdeb225b61 Merge "Bug 17250075: Turned off debugging for launching secure camera" into lmp-dev 2014-08-25 18:30:03 +00:00
Brian Colonna
124b775802 Bug 17250075: Turned off debugging for launching secure camera 
Reduces log spam.

Change-Id: Icdf2e0154ec337ed4fad915ec7f404d94d522ea1
 2014-08-25 13:54:39 -04:00
Jorim Jaggi
05f17b2fce am 72ca0ecb: am cfef67fc: Merge "Fix password unlock method" into lmp-dev 
* commit '72ca0ecb133b38f7caa4737461e49d12a123e914':
  Fix password unlock method
 2014-08-25 16:38:52 +00:00
Jorim Jaggi
dc09d346df am b557672c: am e43d288f: Merge "Fix invisible security method" into lmp-dev 
* commit 'b557672c45d15ea81456d451bf8a9ac70d98fffe':
  Fix invisible security method
 2014-08-25 16:38:47 +00:00
Jorim Jaggi
d120520c4c am cfef67fc: Merge "Fix password unlock method" into lmp-dev 
* commit 'cfef67fc9ab05d59910b467409a6d82e918f91cd':
  Fix password unlock method
 2014-08-25 16:22:45 +00:00
Jorim Jaggi
8fa3ab173f am e43d288f: Merge "Fix invisible security method" into lmp-dev 
* commit 'e43d288f0e8aa96a704b0b98ab7061b479e309a9':
  Fix invisible security method
 2014-08-25 16:22:40 +00:00
Baligh Uddin
73e6ae949c Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-08-25 16:16:25 +00:00
Baligh Uddin
1c3a3bcadf Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-08-25 16:16:07 +00:00
Baligh Uddin
0699cadcb4 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-08-25 16:16:06 +00:00
Baligh Uddin
e477bc561f Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-08-25 16:16:01 +00:00
Baligh Uddin
aaee5b22d0 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-08-25 16:16:01 +00:00
Baligh Uddin
a33054584d Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-08-25 16:15:56 +00:00
Baligh Uddin
98e6a6822f Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-08-25 16:15:56 +00:00
Baligh Uddin
22c567f44e Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-08-25 16:15:51 +00:00
Jorim Jaggi
20060091e2 Merge "Fix password unlock method" into lmp-dev 2014-08-25 16:09:23 +00:00
Jorim Jaggi
e60982f536 Merge "Fix invisible security method" into lmp-dev 2014-08-25 16:09:12 +00:00
Jorim Jaggi
99cd0a89b5 am 73727402: am f0e52545: Merge "Fix QS header animation for RTL" into lmp-dev 
* commit '73727402b7ec9aa2f76fd1f7c2135bf6f34e5e9b':
  Fix QS header animation for RTL
 2014-08-25 15:38:54 +00:00
Jorim Jaggi
ec7404adce am f0e52545: Merge "Fix QS header animation for RTL" into lmp-dev 
* commit 'f0e52545ad1efad0197289aeca2c8145ebb50c58':
  Fix QS header animation for RTL
 2014-08-25 15:30:06 +00:00
Jorim Jaggi
7af40415dc Merge "Fix QS header animation for RTL" into lmp-dev 2014-08-25 15:22:43 +00:00
Jorim Jaggi
e070018b3e Fix password unlock method 
- Update layouts/assets to material
- Fix that the virtual keyboard didn't always come up
- Fix window layout of status bar window, so it's above the IME when
  on Keyguard

Bug: 16957208
Change-Id: I1785af9ac73103abe6cd9968ed27582fbfc9a1d9
 2014-08-25 17:21:05 +02:00
Jorim Jaggi
fb28c0e129 Fix invisible security method 
Also fixes a bug where notification guts couldn't be launched from
Keyguard.

Bug: 17162095
Change-Id: I50395065e568ca01e837b0540d5edfd8bbd5797a
 2014-08-25 17:20:43 +02:00
Selim Cinek
afd64214fe am 0f4100e0: am c672f6ac: Merge "Fixed a bug where animations were generated when closed." into lmp-dev 
* commit '0f4100e07c8942cc67c5db5ccec4df5744998884':
  Fixed a bug where animations were generated when closed.
 2014-08-25 14:34:29 +00:00
Selim Cinek
6af423f2c5 am c672f6ac: Merge "Fixed a bug where animations were generated when closed." into lmp-dev 
* commit 'c672f6ac4fae5f8dc4a9cbd8d9f1eb0a924465d0':
  Fixed a bug where animations were generated when closed.
 2014-08-25 14:25:28 +00:00
Selim Cinek
0db4f35e0b Merge "Fixed a bug where animations were generated when closed." into lmp-dev 2014-08-25 14:17:13 +00:00
Jorim Jaggi
a8c97b3a63 Fix QS header animation for RTL 
Bug: 17201391
Change-Id: I88a94df82ee23e4e5fe0b85c6be56e6014e66c1c
 2014-08-25 16:03:22 +02:00
Selim Cinek
a24d070c6a am 9415a4ba: am 6f31760b: Merge "Fixed a ltr bug where the buttons disappeared" into lmp-dev 
* commit '9415a4ba9e8d7b43b3c3cb999750b88243da8ec6':
  Fixed a ltr bug where the buttons disappeared
 2014-08-25 12:06:05 +00:00
Selim Cinek
6304e68160 am 6f31760b: Merge "Fixed a ltr bug where the buttons disappeared" into lmp-dev 
* commit '6f31760b25dd216b8bc0e7de170ab31cfda61367':
  Fixed a ltr bug where the buttons disappeared
 2014-08-25 11:56:26 +00:00
Selim Cinek
0e41dea0b3 Fixed a bug where animations were generated when closed. 
Bug: 17248206
Change-Id: I4376e1eede125ade71c09b2c1cd6ae64ad617230
 2014-08-25 13:55:06 +02:00
Selim Cinek
6e3de6d98f Merge "Fixed a ltr bug where the buttons disappeared" into lmp-dev 2014-08-25 11:50:25 +00:00
Jeff Sharkey
daa88714a1 am 9f3ddd55: am e3218d35: Merge "Installing splits into ASECs!" into lmp-dev 
* commit '9f3ddd551393b4fbc421156b8f700cae7dbd6a3b':
  Installing splits into ASECs!
 2014-08-24 19:04:07 +00:00
Jeff Sharkey
1b54ede9de am e3218d35: Merge "Installing splits into ASECs!" into lmp-dev 
* commit 'e3218d357101b948641ce361ed0b21ebc97e44be':
  Installing splits into ASECs!
 2014-08-24 18:55:47 +00:00
Jeff Sharkey
37cf9907d2 Merge "Installing splits into ASECs!" into lmp-dev 2014-08-24 18:45:55 +00:00
Baligh Uddin
bf474ad6d7 Import translations. DO NOT MERGE 
Change-Id: I27c8c543212829794bec781cb543af3d7169ca7f
Auto-generated-cl: translation import
 2014-08-24 11:28:43 -07:00
Baligh Uddin
116bf58304 Import translations. DO NOT MERGE 
Change-Id: I1e857f9c9f889e1ea6649abef8ee2446341a4631
Auto-generated-cl: translation import
 2014-08-24 11:27:13 -07:00
Baligh Uddin
3e5044d3ca Import translations. DO NOT MERGE 
Change-Id: Ica37ab94e0e2158a111b50bff6022d180ef45e27
Auto-generated-cl: translation import
 2014-08-24 11:22:55 -07:00
Baligh Uddin
53f1b008df Import translations. DO NOT MERGE 
Change-Id: I0d2a27a5cfa2fab7ee6d35c01de947a252f68672
Auto-generated-cl: translation import
 2014-08-24 11:13:41 -07:00
Baligh Uddin
e3505d6fc7 Import translations. DO NOT MERGE 
Change-Id: I6aa82acaaecb2e2484c357c30b252a0aa116a017
Auto-generated-cl: translation import
 2014-08-24 11:10:56 -07:00
Baligh Uddin
e77eec8867 Import translations. DO NOT MERGE 
Change-Id: Ie520695726af475fa6c263df03943c9435e599b6
Auto-generated-cl: translation import
 2014-08-24 09:27:39 -07:00
Baligh Uddin
28ff7d715c Import translations. DO NOT MERGE 
Change-Id: If7ded66957dff5714f58db7fbf5fc6bdcaa37040
Auto-generated-cl: translation import
 2014-08-24 09:23:19 -07:00
Baligh Uddin
4879a5c9e2 Import translations. DO NOT MERGE 
Change-Id: Ic42db2aebb4777ec9a7107851b5479d0b25e048f
Auto-generated-cl: translation import
 2014-08-24 09:21:39 -07:00
Paul Lawrence
d70c21d616 am f1b2348d: am b34de6be: Merge "Fix adb backup for encrypted case" into lmp-dev 
* commit 'f1b2348d6afb43b400b98846fda74ca3520287f4':
  Fix adb backup for encrypted case
 2014-08-23 20:59:22 +00:00
Paul Lawrence
b8f7ecf9e4 am b34de6be: Merge "Fix adb backup for encrypted case" into lmp-dev 
* commit 'b34de6be2ede2e31a79958d6a2e6c53761c92d04':
  Fix adb backup for encrypted case
 2014-08-23 20:50:23 +00:00
Paul Lawrence
b8e6838583 Merge "Fix adb backup for encrypted case" into lmp-dev 2014-08-23 20:44:30 +00:00
Jeff Davidson
c52b5b1fc1 am 9f207f97: am 78595786: Merge "Restore legacy VPN stats dialog." into lmp-dev 
* commit '9f207f97d7b04465f3ed86af1ce855f1a84c40d9':
  Restore legacy VPN stats dialog.
 2014-08-23 02:48:48 +00:00
Jeff Davidson
445c45ecf2 am 78595786: Merge "Restore legacy VPN stats dialog." into lmp-dev 
* commit '785957866a3a2978929ad2c79865575204c7216a':
  Restore legacy VPN stats dialog.
 2014-08-23 01:12:43 +00:00
Jeff Davidson
1fb7dc0c00 am e00e0e4e: am daf54483: Merge "Restore legacy VPN stats dialog strings." into lmp-dev 
* commit 'e00e0e4e0d2b1b2620649c46d483fac38f541b56':
  Restore legacy VPN stats dialog strings.
 2014-08-23 00:20:51 +00:00
Jeff Davidson
577bf51765 am daf54483: Merge "Restore legacy VPN stats dialog strings." into lmp-dev 
* commit 'daf5448383a02017bb761841d675c3630ec94cac':
  Restore legacy VPN stats dialog strings.
 2014-08-23 00:12:49 +00:00
Jeff Davidson
90b1b9f985 Restore legacy VPN stats dialog. 
Was originally removed in ag/522961, but restoring to keep legacy VPN
behavior the same from within VpnSettings. This dialog is only
accesible from VpnSettings and so should only ever be shown for legacy
VPNs.

Bug: 17164793
Change-Id: I06c4e136e1023b8f84edfd15a15264d2e41d325b
 2014-08-22 17:06:37 -07:00