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

829 Commits

Author SHA1 Message Date
Jorim Jaggi
2c65879866 am 731ede8e: am fea3c808: am 3dadb79a: Merge "Remove "forgot pattern" in pattern view" into lmp-dev 
* commit '731ede8e634d179dd9d3b00404881166a05f9efb':
  Remove "forgot pattern" in pattern view
 2014-09-05 17:18:42 +00:00
Jorim Jaggi
8fbe98981e am 3dadb79a: Merge "Remove "forgot pattern" in pattern view" into lmp-dev 
* commit '3dadb79a7fe90a727568aa76744f0d0c5ea44782':
  Remove "forgot pattern" in pattern view
 2014-09-05 16:20:49 +00:00
Jorim Jaggi
68e6fa72f2 Remove "forgot pattern" in pattern view 
Bug: 17184958
Change-Id: I7ebb35a1b734286ded99352b3fa2b891386c581d
 2014-09-05 15:41:07 +02:00
Yorke Lee
8644e9c1e7 am 028b9d04: am 42d221f3: am 002e85e1: Merge "Use TelecommManager APIs to detect if we are in a call" into lmp-dev 
* commit '028b9d04bfd120bdd514f64885ada2ed1aafea1f':
  Use TelecommManager APIs to detect if we are in a call
 2014-09-04 17:51:52 +00:00
Baligh Uddin
882459bae6 Merge "Import translations. DO NOT MERGE" 2014-09-04 17:49:49 +00:00
Baligh Uddin
6bed40eddc Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-04 17:49:32 +00:00
Yorke Lee
015fc93377 am 002e85e1: Merge "Use TelecommManager APIs to detect if we are in a call" into lmp-dev 
* commit '002e85e1a3ad030bf77f700d545f9a41d7214c74':
  Use TelecommManager APIs to detect if we are in a call
 2014-09-04 17:36:00 +00:00
Yorke Lee
cc5179f0e3 Use TelecommManager APIs to detect if we are in a call 
Bug: 17335666
Change-Id: I5f443c76041e51a2eca903db924fb26031dde055
 2014-09-03 17:04:54 -07:00
Baligh Uddin
5f59498619 Import translations. DO NOT MERGE 
Change-Id: Ief40ff3ac2bfc535d933af90ae1cc5af9ebf1370
Auto-generated-cl: translation import
 2014-09-03 12:27:37 -07:00
Baligh Uddin
03a25fe3a0 Import translations. DO NOT MERGE 
Change-Id: Ib0b5565412211bede23918b8f9987e7e2c0b1792
Auto-generated-cl: translation import
 2014-09-03 12:21:28 -07:00
Adrian Roos
c22cf7ac46 am 06d95492: am 3c5add9d: am 39dd16c8: Merge "Auto dismiss lockscreen when switching to guest" into lmp-dev 
* commit '06d95492e264f6dc8223ee4c53772f21dbba3d90':
  Auto dismiss lockscreen when switching to guest
 2014-09-03 17:55:11 +00:00
Adrian Roos
7ef28383be am 39dd16c8: Merge "Auto dismiss lockscreen when switching to guest" into lmp-dev 
* commit '39dd16c8f35d0fdd01c25bf51c01b71726819eae':
  Auto dismiss lockscreen when switching to guest
 2014-09-03 16:19:02 +00:00
Adrian Roos
053ff3c776 Merge "Auto dismiss lockscreen when switching to guest" into lmp-dev 2014-09-03 15:39:11 +00:00
Adrian Roos
be47b07bef Auto dismiss lockscreen when switching to guest 
Bug: 16659674
Change-Id: I8d24a3997ac7493cd8a8317f8a35532eaf5c3cfe
 2014-09-03 16:46:55 +02:00
Jorim Jaggi
49f053a727 am 3db799c7: am 4381bd8c: am d9a773e5: Merge "Fix outdated time when turning on screen" into lmp-dev 
* commit '3db799c7de5b5d036a028362df98debbeceb3490':
  Fix outdated time when turning on screen
 2014-09-03 05:03:40 +00:00
Jorim Jaggi
b752d0630c am 9e055e70: am 96cfaf50: am a6399288: Merge "Remove different layout for landscape in Keyguard" into lmp-dev 
* commit '9e055e701d326f1ab5689c5c117bb873a4eb11b2':
  Remove different layout for landscape in Keyguard
 2014-09-03 05:02:58 +00:00
Jorim Jaggi
29ff450cd6 am d9a773e5: Merge "Fix outdated time when turning on screen" into lmp-dev 
* commit 'd9a773e51e6fcf7abbbcfd2c145e7e4e16c1282d':
  Fix outdated time when turning on screen
 2014-09-02 20:36:04 +00:00
Jorim Jaggi
4dc653aaa2 Merge "Fix outdated time when turning on screen" into lmp-dev 2014-09-02 20:26:39 +00:00
Jorim Jaggi
57cc95bce3 am a6399288: Merge "Remove different layout for landscape in Keyguard" into lmp-dev 
* commit 'a63992888988017f664cc4c33ea1f0d546959b9d':
  Remove different layout for landscape in Keyguard
 2014-09-02 20:14:15 +00:00
Jorim Jaggi
d09def7511 Fix outdated time when turning on screen 
Force a synchronous update of the clock view when turning on the
screen. Also wait for the Keyguard window to be drawn when turning
on the screen.

Bug: 16904617
Change-Id: I38f78a38cfe35ccd067cd420d2bad626bd955ad6
 2014-09-02 22:05:42 +02:00
Jorim Jaggi
e82f90e72e Remove different layout for landscape in Keyguard 
Bug: 15422177
Change-Id: I8a643a8f6dcfed1530f17e8de6a5cc69533528b4
 2014-09-02 21:54:25 +02:00
Adrian Roos
934224326c am d821fbff: am 52ceb1e3: am 690611d2: Merge "Keyguard: Register user specific broadcasts correctly" into lmp-dev 
* commit 'd821fbff4f381930f0ab89fbf67e30c01891778f':
  Keyguard: Register user specific broadcasts correctly
 2014-09-02 17:38:39 +00:00
Baligh Uddin
ab76ad4f62 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-01 21:26:16 +00:00
Adrian Roos
5a0c37895b am 690611d2: Merge "Keyguard: Register user specific broadcasts correctly" into lmp-dev 
* commit '690611d2d92a800b56b0119c27b1cd661262e7b2':
  Keyguard: Register user specific broadcasts correctly
 2014-09-01 14:56:28 +00:00
Adrian Roos
48c796cad6 Keyguard: Register user specific broadcasts correctly 
Fixes the face unlock indicator only working for the
owner user. While we're at it, also fix other broadcasts
that should have been registered for all users and not just
the owner.

Bug: 17251445
Change-Id: I53cad656d7d1e1d312bff2eebfc0c23ea467e0b7
 2014-09-01 16:03:38 +02:00
Baligh Uddin
a1b349dda6 Import translations. DO NOT MERGE 
Change-Id: Iefc5dee5e276d96d2b99216963de6b64f8ea631e
Auto-generated-cl: translation import
 2014-08-31 12:44:08 -07:00
Baligh Uddin
0a14d1e569 Import translations. DO NOT MERGE 
Change-Id: I727035c5d02efd35eef5ed40f46daa167fe805f1
Auto-generated-cl: translation import
 2014-08-31 12:38:19 -07:00
Jeff Hao
d72790e900 am 92c7379c: am c4ef03d0: am 73fb1feb: Merge "Add sample profiling option to am." into lmp-dev 
* commit '92c7379cf75b6ddce98f03c223d14267227436d2':
  Add sample profiling option to am.
 2014-08-26 23:39:57 +00:00
Jeff Hao
71785ed7dd am 73fb1feb: Merge "Add sample profiling option to am." into lmp-dev 
* commit '73fb1feb93e56c7aadb2ce64e040b9ff3d0c0358':
  Add sample profiling option to am.
 2014-08-26 23:10:23 +00:00
Jeff Hao
1b012d302b Add sample profiling option to am. 
Also bundles all profiling options into a class.

Bug: 17040932
Change-Id: I85d675ee1494bdc7308caffdf94145d27c996e9d
 2014-08-26 15:54:25 -07:00
Baligh Uddin
f425b67838 Import translations. DO NOT MERGE 
Change-Id: I816554657548e769500ab2a392bb48d9bc7d83f8
Auto-generated-cl: translation import
 2014-08-26 10:53:52 -07:00
Baligh Uddin
1494447e35 Import translations. DO NOT MERGE 
Change-Id: I0787124e2a6bf24f406c9b89770bdbfb5b801325
Auto-generated-cl: translation import
 2014-08-26 10:48:38 -07:00
Jorim Jaggi
2c5bf235e3 am eb8b8589: am 9ffaf8a3: am cd051d74: Merge "Make date consistent with spec when alarm is set" into lmp-dev 
* commit 'eb8b85894a38b1b16904d37558dc3cad4b546036':
  Make date consistent with spec when alarm is set
 2014-08-26 11:39:22 +00:00
Jorim Jaggi
5a5d353953 am cd051d74: Merge "Make date consistent with spec when alarm is set" into lmp-dev 
* commit 'cd051d744b13f01e4dfe5b4c9e57d76b1a65fffa':
  Make date consistent with spec when alarm is set
 2014-08-26 11:18:17 +00:00
Jorim Jaggi
31e0ae0cad Merge "Make date consistent with spec when alarm is set" into lmp-dev 2014-08-26 10:35:41 +00:00
Jorim Jaggi
4a2bca3820 am 3db18409: am 72ca0ecb: am cfef67fc: Merge "Fix password unlock method" into lmp-dev 
* commit '3db18409a2eefebc1a4c6252e4c67571a3894a68':
  Fix password unlock method
 2014-08-25 16:47:40 +00:00
Jorim Jaggi
386040c437 am 5db4729d: am b557672c: am e43d288f: Merge "Fix invisible security method" into lmp-dev 
* commit '5db4729d14c33037b5c93ac45780bce86a08b1a0':
  Fix invisible security method
 2014-08-25 16:47:35 +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
0699cadcb4 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-08-25 16:16:06 +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
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
Jorim Jaggi
38a7c658c5 Make date consistent with spec when alarm is set 
Bug: 17162597
Change-Id: I7855d8f40af77cf4d91791c899e0b6147ee17071
 2014-08-25 15:37:06 +02: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
Jim Miller
ed741c0918 am 9cb8e236: am 752889a9: am 9af7f4f6: Merge "Update TrustAgentService API after review." into lmp-dev 
* commit '9cb8e236fcb386701f5be9f18465bc304bb46c19':
  Update TrustAgentService API after review.
 2014-08-22 23:37:41 +00:00
Jim Miller
7d95c50fd6 am 9af7f4f6: Merge "Update TrustAgentService API after review." into lmp-dev 
* commit '9af7f4f66652d659fb17f4bc502362f0e6faf175':
  Update TrustAgentService API after review.
 2014-08-22 23:18:16 +00:00
Jim Miller
d4efaac5d5 Update TrustAgentService API after review. 
Also documents timebase on related DevicePolicyManager API.

Fixes bugs 16401527 and 17046034

Change-Id: I8ee6d0055ab6f52ec71630344d3232f7875d9c1d
 2014-08-22 22:43:30 +00:00
Baligh Uddin
44fbbbed7e Merge "Import translations. DO NOT MERGE" 2014-08-22 16:41:31 +00:00