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

648 Commits

Author SHA1 Message Date
Jorim Jaggi
acb4eb8e29 Merge "Position clock and notifications dynamically." 2014-05-17 02:30:40 +00:00
Adrian Roos
cb9fbc3a30 Enforce that trust agents declare the BIND_TRUST_AGENT permission 
Change-Id: Iba10b6fb140362c368fb12b7d3c6be550897de40
 2014-05-17 03:19:56 +02:00
Jorim Jaggi
069cd03740 Position clock and notifications dynamically. 
The positioning is dependant on how many notifications are currently
showing. This makes sure that the lockscreen always looks balanced
and harmonic.

Bug: 14592994
Change-Id: Ic647b887dd23e6cc5ecd07d70f279ff2f218f4ca
 2014-05-17 02:01:41 +02:00
Adrian Roos
7e03dfcb79 Apply revised TrustAgent API 
Bug: 14997466
Change-Id: I81042e058a20f28603a11471882f3dcfc4f8b13c
 2014-05-16 16:06:28 +02:00
Ed Heyl
2cf184233b merge master nova by hand, skipped translations 
Change-Id: I4bea0bb9e375361f21d995bf4698d5eb6300ecfb
 2014-05-14 13:24:53 -07:00
Adrian Roos
b601162a60 Fix visibility and add bouncer event in KeyguardUpdateMonitor 
Bug: 14087751
Change-Id: I45bc2213dfcce751180762d18ead0382f68cac74
 2014-05-14 16:51:18 +02:00
Jorim Jaggi
67c26cba21 Merge "Handle media key events correctly on Keyguard." 2014-05-14 12:35:46 +00:00
Jorim Jaggi
df993513fb Handle media key events correctly on Keyguard. 
Bug: 14490267
Change-Id: Ib8f8ee3ee7f1fbec70f1dd8b6fb04cd7c242bdce
 2014-05-14 14:32:50 +02:00
Jim Miller
228d46541f Merge "Don't clear the pattern when window focus changes." 2014-05-14 00:33:36 +00:00
Jim Miller
2e648e1ed2 Don't clear the pattern when window focus changes. 
This is no longer required since we now clear the pattern field
when showing the bouncer.

Fixes bug 14622312

Change-Id: I476bbc95449cd31e56aeac579b3c94f859cd020b
 2014-05-13 16:51:23 -07:00
Jim Miller
50a2fb9ea7 Merge "Don't clear the password field when window focus changes." 2014-05-13 20:05:18 +00:00
Jim Miller
aef7cc77a8 Don't clear the password field when window focus changes. 
This is no longer required since we now clear the password field
when showing the bouncer.  The code used to clear it because
keyguard was relatively static and we didn't want to keep the
password around through an interruption like a phone call or
launching the camera.

Fixes bug 14622312

Change-Id: I4808d51198ba0e6b1e03e26fee22bb08c752e613
 2014-05-12 20:05:24 -07:00
Baligh Uddin
7975a7c82b Import translations. DO NOT MERGE 
Change-Id: If9d65605b00a0e5b183f4b7345c2f1102df12b1b
Auto-generated-cl: translation import
 2014-05-12 08:29:32 -07:00
Jorim Jaggi
9d8e968789 am c1c89ade: Merge "Move Carrier label into universal status bar header." 
* commit 'c1c89ade63dd2252c77a553c92f77b3d74cebde2':
  Move Carrier label into universal status bar header.
 2014-05-09 22:26:09 +00:00
Jorim Jaggi
9054d94cba Move Carrier label into universal status bar header. 
Also introduces a different height for the header area on keyguard,
as it looks better with less padding when no background is here (and
is closer to the mocks).

Change-Id: Ie9b94dcf823c3e4af83a22f5fae15d9033e146fd
 2014-05-09 22:47:28 +02:00
Jorim Jaggi
dc4d3c37fd am a2e10038: Merge "Never close Keyguard automatically." 
* commit 'a2e10038fce80323c86ac90dff8d5d7216cde00f':
  Never close Keyguard automatically.
 2014-05-06 20:06:21 +00:00
Jorim Jaggi
ef3b18b101 Merge "Never close Keyguard automatically." 2014-05-06 20:01:43 +00:00
Jorim Jaggi
c1cf1aec53 Never close Keyguard automatically. 
Also make the bouncer less translucent, so it looks better when
a user double-clicks on a notification (because it is now shown
behind, so we need more background protection).

Bug: 14059777
Change-Id: I2538b0e04ddc25c25a03c65c8a5bd7855720bbf2
 2014-05-02 23:25:21 +02:00
Jorim Jaggi
341cff8155 am 61700e82: Merge "Fix padding for SIM pin entry." 
* commit '61700e8200781b89eb99747c52c7661d70be2bd2':
  Fix padding for SIM pin entry.
 2014-05-02 20:06:01 +00:00
Jorim Jaggi
412cc7049f Fix padding for SIM pin entry. 
Bug: 14224920
Change-Id: Icd8bf48a5946adeef9bfc6b00e4522c7fa3e56c3
 2014-05-02 21:10:13 +02:00
Jeff Brown
f347bc39fc am 06dec565: Merge "resolved conflicts for merge of 4f8cd188 to master" 
* commit '06dec5656d75345566fd31a2cfc6bd5c84bf41de':
  Clean up some terminology related to interactive state.
 2014-05-02 01:26:29 +00:00
Jeff Brown
fb0448ab4b resolved conflicts for merge of 4f8cd188 to master 
Change-Id: I148cd616cd14d834915978aa2dc3f9e27188dbd3
 2014-05-01 18:19:31 -07:00
Jeff Brown
4f8cd18880 am 7f6ab17d: Merge "Clean up some terminology related to interactive state." into klp-modular-dev 
* commit '7f6ab17d414726868563105cd995b37dd519320b':
  Clean up some terminology related to interactive state.
 2014-05-01 23:29:13 +00:00
Jeff Brown
140ffc783c Clean up some terminology related to interactive state. 
Change-Id: Ife4445685a5314dea64332a3490fa8dd3ffd89a2
 2014-05-01 15:22:27 -07:00
Jorim Jaggi
65e4a4ee30 am ed8b4ca0: Merge "Layout notifications on top and introduce artifical margin" 
* commit 'ed8b4ca093d8aba40d29ef7ad701b28f8c313d97':
  Layout notifications on top and introduce artifical margin
 2014-04-30 13:31:27 +00:00
Jorim Jaggi
8c1a44b62f Layout notifications on top and introduce artifical margin 
This allows for animating the notifications between the different
states. So we can nicely switch between Keyguard and full shade,
and make the stack smaller when going to quick settings.

Change-Id: I768dc7cd8f4dc0197365a5befebad24086816a8d
 2014-04-30 15:25:56 +02:00
Jorim Jaggi
46da668b13 am 3daa96f4: Merge "Add carrier text on lockscreen in top left corner." 
* commit '3daa96f406d2cb46b55d71c696ce81656a7a2682':
  Add carrier text on lockscreen in top left corner.
 2014-04-28 12:21:57 +00:00
Jorim Jaggi
b039603867 Merge "Add carrier text on lockscreen in top left corner." 2014-04-28 12:18:44 +00:00
Jim Miller
953c4e04fa am 427b7fb5: Merge "Add new DevicePolicyManager disable flags for keyguard." 
* commit '427b7fb50b5c2c8f38612a74a7c46ff056e22e68':
  Add new DevicePolicyManager disable flags for keyguard.
 2014-04-26 00:35:45 +00:00
Jim Miller
66fbe3dc81 Merge "Add new DevicePolicyManager disable flags for keyguard." 2014-04-26 00:28:44 +00:00
Jim Miller
50e62183d4 Add new DevicePolicyManager disable flags for keyguard. 
- KEYGUARD_DISABLE_SECURE_NOTIFICATIONS
- KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS
- KEYGUARD_DISABLE_TRUST_AGENTS

Change-Id: I4ed2b9cef78b497d87bb719c57fabdad94c18e82
 2014-04-25 13:27:10 -07:00
Elliott Hughes
6a885ba4a0 am ccec5f0d: resolved conflicts for merge of 02e85744 to master 
* commit 'ccec5f0def723baa6c4c80bd7ff1971a32c9d8c3':
  Use the suggested public API instead of libcore.os.
 2014-04-25 16:08:43 +00:00
Jorim Jaggi
25807936e8 Add carrier text on lockscreen in top left corner. 
Change-Id: I88c96eabc4b97295da5c1094db3fd22fcc637390
 2014-04-25 14:18:07 +02:00
Elliott Hughes
ccec5f0def resolved conflicts for merge of 02e85744 to master 
Change-Id: Id4c0ecfedc7ec4ff4b76331be025817445a652e9
 2014-04-24 17:18:10 -07:00
Elliott Hughes
02e857441f am 5f5ca3bc: am 31a1dd2a: Merge "Use the suggested public API instead of libcore.os." 
* commit '5f5ca3bc98fb773ee905289300595ad95d5ffabe':
  Use the suggested public API instead of libcore.os.
 2014-04-24 23:59:05 +00:00
Elliott Hughes
cacbe1b1ef Use the suggested public API instead of libcore.os. 
Change-Id: Id392e4c36c5721ca609d88d9ec6b9340ce05274c
 2014-04-24 16:19:27 -07:00
Baligh Uddin
473a973054 Import translations. DO NOT MERGE 
Change-Id: I486facdbdbfdc4cafe23f0412e7b548a11792480
Auto-generated-cl: translation import
 2014-04-23 11:21:37 -07:00
Baligh Uddin
e5a1728e2f Import translations. DO NOT MERGE 
Change-Id: Ib7d1feda99c656bcea0c0efc41e9f04bda7049b9
Auto-generated-cl: translation import
 2014-04-22 16:39:03 -07:00
Jorim Jaggi
fdc79a8e9a am bf19fa4f: Merge "Move bouncer to the bottom, but only on phones." 
* commit 'bf19fa4fe653fbba9bed5d3a13f52e043ac44dab':
  Move bouncer to the bottom, but only on phones.
 2014-04-17 20:03:24 +00:00
Jorim Jaggi
9a6eba3ce7 Move bouncer to the bottom, but only on phones. 
Change-Id: Ibe03964a10a8cab9e179ff0618a6ed312c8b1b4a
 2014-04-17 21:44:53 +02:00
Jorim Jaggi
d838997209 am b91dfd95: Merge "Fix not being able to unlock SIM PIN." 
* commit 'b91dfd95b19f13be5497ea521ed14df8471b0e2e':
  Fix not being able to unlock SIM PIN.
 2014-04-17 18:29:48 +00:00
Jorim Jaggi
b91dfd95b1 Merge "Fix not being able to unlock SIM PIN." 2014-04-17 18:23:05 +00:00
Jorim Jaggi
fa9189fd74 Fix not being able to unlock SIM PIN. 
Bug: 14120902
Change-Id: I812d9679000242eabea617ea75cf8355d16926b2
 2014-04-17 20:17:30 +02:00
Baligh Uddin
16b5480bd0 Merge "Import translations. DO NOT MERGE" 2014-04-17 15:48:45 +00:00
Jorim Jaggi
e4f49cdf2e am e0fa592a: Merge "Show enter PIN/PUK before notifications on Keyguard." 
* commit 'e0fa592afc163708d7707158ff76ee8148d90e79':
  Show enter PIN/PUK before notifications on Keyguard.
 2014-04-16 21:58:54 +00:00
Jorim Jaggi
e0fa592afc Merge "Show enter PIN/PUK before notifications on Keyguard." 2014-04-16 21:55:41 +00:00
Baligh Uddin
b2d50c7d45 Import translations. DO NOT MERGE 
Change-Id: I26770bb21dc101ad08178c8d935bffe73f6a22d7
Auto-generated-cl: translation import
 2014-04-16 14:27:36 -07:00
Baligh Uddin
cd254448c1 am 3d72c067: Merge "Remove activitystrings.xml from localized resource directories" 
* commit '3d72c067a04a3ef6101e0d3d16d7fb1ba334a908':
  Remove activitystrings.xml from localized resource directories
 2014-04-16 19:45:22 +00:00
Baligh Uddin
3d72c067a0 Merge "Remove activitystrings.xml from localized resource directories" 2014-04-16 19:39:46 +00:00
Jorim Jaggi
a005f1b685 Show enter PIN/PUK before notifications on Keyguard. 
Change-Id: Icec12a43487fe76378e10bb8aaaa163c53b69075
 2014-04-16 21:15:59 +02:00