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

826 Commits

Author SHA1 Message Date
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
Baligh Uddin
1723d6fef6 Remove activitystrings.xml from localized resource directories 
Change-Id: I57fe2e6f60fcebd77118f15db9d06b0f2df56d7c
 2014-04-16 10:35:49 -07:00
Baligh Uddin
3eff39fb0f Merge "Revert "Import translations. DO NOT MERGE"" 2014-04-16 16:10:08 +00:00
Baligh Uddin
abe94cf196 Revert "Import translations. DO NOT MERGE" 
This reverts commit bcf6441e61725a2e6c04d03de43d209311da9d3a.

Change-Id: I8b556dfaeb45434e194503fe5ae77e744637f6c2
 2014-04-16 16:09:58 +00:00
Baligh Uddin
3471e80349 Merge "Import translations. DO NOT MERGE" 2014-04-16 15:27:00 +00:00
Evan Charlton
8c6d9e544e resolved conflicts for merge of 352e1082 to master-nova 
Change-Id: I6ab96bcc801d8c264908c89d465a9a7f49e1ef16
 2014-04-14 11:53:39 -07:00
Dan Sandler
352e108259 Merge "Merge remote-tracking branch 'goog/master-lockscreen-dev'" 2014-04-14 17:54:22 +00:00
Baligh Uddin
bcf6441e61 Import translations. DO NOT MERGE 
Change-Id: I06d9b9dea39d302df5f59242be6372413f854e3a
Auto-generated-cl: translation import
 2014-04-14 10:01:43 -07:00
Alexandra Gherghina
8bed355237 am bd924d2e: Merge "Revert "Mark the keyguard package as required for profile"" 
* commit 'bd924d2e6174024ca760ae3e53ca1e24c91cf0a6':
  Revert "Mark the keyguard package as required for profile"
 2014-04-12 08:42:40 +00:00
Alexandra Gherghina
bd924d2e61 Merge "Revert "Mark the keyguard package as required for profile"" 2014-04-12 08:15:31 +00:00
John Spurlock
04286cdc09 am ae3f7cca: Merge "Add app_name to keyguard package." 
* commit 'ae3f7cca5235b9c3da080e7f8210a21ecf48285b':
  Add app_name to keyguard package.
 2014-04-11 18:50:43 +00:00
John Spurlock
2396e29d31 am ae3f7cca: Merge "Add app_name to keyguard package." 
* commit 'ae3f7cca5235b9c3da080e7f8210a21ecf48285b':
  Add app_name to keyguard package.
 2014-04-11 18:48:17 +00:00
Alexandra Gherghina
8f6b3a0e1e Revert "Mark the keyguard package as required for profile" 
This reverts commit d4749eb4a888c353e7ea6d6a675cc0b1c8ddf905.

We've switched to a whitelist approach.

Change-Id: I97236785f7843de19e94711bc758fcc6de73a0d2
 2014-04-11 11:28:34 +00:00
Jorim Jaggi
e5c7a89463 Hide back button on keyguard and make it work for bouncer. 
Bug: 13635952
Change-Id: Ie9824dd9926c9deb0a38c8e0a6161f605a489622
 2014-04-10 21:10:22 +02:00
John Spurlock
99155e257e Add app_name to keyguard package. 
Bad label referenced in the manifest.  Found while listing
installed packages in settings.

Change-Id: Ieb4a764d2a8e7f27245ce2c41998cdc77ecead92
 2014-04-10 10:31:31 -04:00
Jorim Jaggi
0bed7f258b Always go through bouncer when unlocking 
Previously, we skipped the bouncer when the user didn't had a
security method set. Users without a security method couldn't unlock
their SIM cards though. This change moves the responsibility to
decide what to do to bouncer, so SIM pin is still shown with users
without secrity methods. The bouncer will still be skipped if no
authentication is required.

Bug: 13635952
Change-Id: I0b43628c37d769515e97c29fc5fb5337fe46526f
 2014-04-05 17:05:56 +02:00
Jorim Jaggi
03c701ec58 Basic implementation for notifications on lockscreen. 
This change makes PhoneStatusBar expand while the lockscreen is
showing. Further, the KeyguardSimpleHostView is shown by
KeyguardBouncer, and the Bouncer is shown whenever the user tries to
unlock the phone (closing the shade).

Bug: 13635952
Change-Id: I4354b7a7937af6e1c93abf16ad6e485376d16bc2
 2014-04-05 16:50:36 +02:00
Baligh Uddin
e1301a5424 Merge "Import translations. DO NOT MERGE" 2014-04-04 14:22:54 +00:00
Alan Viverette
01cefbc5b3 am b325345e: Merge "Switch framework Holo references to Quantum.Light" 
* commit 'b325345ef0adf2849350d339de1ec5f92b67b7ae':
  Switch framework Holo references to Quantum.Light
 2014-04-02 22:23:17 +00:00
Alan Viverette
3a3395042e am b325345e: Merge "Switch framework Holo references to Quantum.Light" 
* commit 'b325345ef0adf2849350d339de1ec5f92b67b7ae':
  Switch framework Holo references to Quantum.Light
 2014-04-02 22:18:59 +00:00
Baligh Uddin
fc17e2d211 Import translations. DO NOT MERGE 
Change-Id: I612d2477b77f8a69c502f42abcb34bb634e24d34
Auto-generated-cl: translation import
 2014-04-02 08:38:16 -07:00
Alan Viverette
6259933ec9 Switch framework Holo references to Quantum.Light 
Change-Id: Ib545a143f1959b6104adbc9d594dd626851d90b3
 2014-04-01 14:57:39 -07:00
Paul Lawrence
da7ff92c48 am df42723d: Merge "Don\'t double prompt on booting encrypted device" 
* commit 'df42723d6b717fd2882c98c930a0f93c75af2474':
  Don't double prompt on booting encrypted device
 2014-04-01 15:11:31 +00:00