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

972 Commits

Author SHA1 Message Date
Amith Yamasani
1f26bf6bfd am 108bdbc9: am efb2df69: Merge "Different messages when wiping user and not device" into lmp-mr1-dev 
* commit '108bdbc934d1e5fb77406d0267ab67f8736dfc57':
  Different messages when wiping user and not device
 2014-11-21 23:07:03 +00:00
Jim Miller
7cc0a1f1bb am 879a4ee8: Merge "Add multi-sim support to keyguard" into lmp-mr1-dev automerge: 0284e5e automerge: eab3240 
* commit '879a4ee8b09e879de890dbbbc34629cd297572eb':
  Add multi-sim support to keyguard
 2014-11-21 22:32:40 +00:00
Amith Yamasani
efb2df698a Merge "Different messages when wiping user and not device" into lmp-mr1-dev 2014-11-21 22:27:17 +00:00
Amith Yamasani
3a3d212a51 Different messages when wiping user and not device 
There are 3 types of users
1. Primary - device will be wiped
2. Managed profile - profile will be removed
3. Secondary user - user will be removed

Show different messages for almost wipe and wipe in each
of these 3 cases.

Bug: 16843155
Change-Id: Icecfe520622773da9e45465bf2217e8ed38b266e
 2014-11-21 13:57:48 -08:00
Jim Miller
879a4ee8b0 Merge "Add multi-sim support to keyguard" into lmp-mr1-dev automerge: 0284e5e 
automerge: eab3240

* commit 'eab3240c78423e791a7f36864f55f94c25a5aba5':
  Add multi-sim support to keyguard
 2014-11-21 18:55:36 +00:00
Jim Miller
0284e5e498 Merge "Add multi-sim support to keyguard" into lmp-mr1-dev 2014-11-21 18:38:03 +00:00
Selim Cinek
9c4a707912 Fixed several time related states for secondary users 
The 24 hour setting was not respected correctly. Also
fixed a bug where the next alarm would not display itself
in the QS panel.

Bug: 16239208
Change-Id: I89734f783912dead5831db49db53fba04dbf54ee
 2014-11-21 18:25:30 +01:00
Adrian Roos
4d4254fdc3 am 2a5663d5: am 4e312d81: Merge "Add device locked API for TrustAgentService" into lmp-mr1-dev automerge: 62a7d53 
* commit '2a5663d524a29cc33137a6651660506398d0633a':
  Add device locked API for TrustAgentService
 2014-11-21 02:58:07 +00:00
Adrian Roos
05576cc784 am cf047b5d: am af6e657a: Merge "Update KeyguardManager.isDeviceLocked API" into lmp-mr1-dev automerge: 866bae5 
* commit 'cf047b5d554b35e504f33994f3a07624c2690633':
  Update KeyguardManager.isDeviceLocked API
 2014-11-21 02:58:00 +00:00
Adrian Roos
2a5663d524 am 4e312d81: Merge "Add device locked API for TrustAgentService" into lmp-mr1-dev 
automerge: 62a7d53

* commit '62a7d5334315b4153f1da1112f945d13f72e0381':
  Add device locked API for TrustAgentService
 2014-11-21 02:47:16 +00:00
Adrian Roos
cf047b5d55 am af6e657a: Merge "Update KeyguardManager.isDeviceLocked API" into lmp-mr1-dev 
automerge: 866bae5

* commit '866bae50b7e8f0389b67df54eaf829fa50bc8eaf':
  Update KeyguardManager.isDeviceLocked API
 2014-11-21 02:46:16 +00:00
Adrian Roos
481a6df99f Add device locked API for TrustAgentService 
Bug: 18414067
Change-Id: I96c68af9ccc9940acf9fab3b5bd39a3485f01045
 2014-11-20 21:48:38 +01:00
Adrian Roos
50bfeec868 Update KeyguardManager.isDeviceLocked API 
Bug: 18414067
Change-Id: I0715714c2c9a122f578ec0c6f508faae12e6f752
 2014-11-20 21:45:04 +01:00
Jorim Jaggi
d05064b850 Tint SIM images in PIN/PUK screen 
Bug: 18147652
Change-Id: Ic077a80883782c228dce0d4537e4c7e5e3caf2b4
 2014-11-20 21:36:52 +01:00
Jim Miller
52a6133f4b Add multi-sim support to keyguard 
Use new telephony APIs.
Clean up SIM state machine code.
Use cached copy of SubscriptionInfo.
Make SIM PIN and SIM PUK work.

Tested on single and multi-SIM devices.

Fixes bug 18147652

Change-Id: Ic69a4d2898999a5438e6a70b5851705bc05443f1
 2014-11-20 21:36:52 +01:00
Geoff Mendal
3e1f102d48 Import translations. DO NOT MERGE 
Change-Id: Ib9109f2785d00192370803b6f1c577d480bc009b
Auto-generated-cl: translation import
 2014-11-19 06:31:47 -08:00
Geoff Mendal
e64f6b35f2 Import translations. DO NOT MERGE 
Change-Id: I92fdf378ecedb1f4d92c34c2447734f9b1fbda8d
Auto-generated-cl: translation import
 2014-11-17 10:29:00 -08:00
Geoff Mendal
f2a7a7829d Merge "Import translations. DO NOT MERGE" 2014-11-13 04:41:10 +00:00
Geoff Mendal
9733af6f15 Import translations. DO NOT MERGE 
Change-Id: I93c07f564ad22c99bbc3e848074b853c826c6fd7
Auto-generated-cl: translation import
 2014-11-12 20:39:36 -08:00
Selim Cinek
108e1993b0 am 858fb04f: am 5b560f57: am 29685c2f: Merge "Added dissapear animation to pattern and pin input" into lmp-mr1-dev 
* commit '858fb04f32a4dfc92def10af985ccce9c2feb5af':
  Added dissapear animation to pattern and pin input
 2014-11-12 16:39:03 +00:00
Selim Cinek
858fb04f32 am 5b560f57: am 29685c2f: Merge "Added dissapear animation to pattern and pin input" into lmp-mr1-dev 
* commit '5b560f57a93edeb4f8123a1cd53d68b3e3694705':
  Added dissapear animation to pattern and pin input
 2014-11-12 16:20:20 +00:00
Selim Cinek
29685c2fde Merge "Added dissapear animation to pattern and pin input" into lmp-mr1-dev 2014-11-12 16:12:13 +00:00
Selim Cinek
f9c0e8f02f Added dissapear animation to pattern and pin input 
Bug: 18232017
Change-Id: I062d55b0870ccaad6093b672f5076c3f80c10f94
 2014-11-12 14:48:48 +01:00
Jorim Jaggi
6db9400884 am 4974fae3: am 5a8f191c: am 3e54ce27: Merge "Adjust owner info to spec" into lmp-mr1-dev 
* commit '4974fae3bae6eb08a3f735603a4eae1780be6c94':
  Adjust owner info to spec
 2014-11-10 15:52:43 +00:00
Jorim Jaggi
4974fae3ba am 5a8f191c: am 3e54ce27: Merge "Adjust owner info to spec" into lmp-mr1-dev 
* commit '5a8f191c12d7087d1a64d8f058d6b0c2351223c5':
  Adjust owner info to spec
 2014-11-10 15:47:54 +00:00
Jorim Jaggi
3e54ce273a Merge "Adjust owner info to spec" into lmp-mr1-dev 2014-11-10 15:39:22 +00:00
Geoff Mendal
ae11401639 Import translations. DO NOT MERGE 
Change-Id: I846e773dba336127002de67b9dcdf9506c1ec29b
Auto-generated-cl: translation import
 2014-11-10 06:36:09 -08:00
Jim Miller
88e2c6149f am c6a04240: Merge "Change Configure structure to List<PersistableBundle>" into lmp-mr1-dev automerge: 5292069 
automerge: 481fc74

* commit '481fc7427b419efb98428f27c5b0e252183ff315':
  Change Configure structure to List<PersistableBundle>
 2014-11-08 13:56:45 +00:00
Jim Miller
481fc7427b am c6a04240: Merge "Change Configure structure to List<PersistableBundle>" into lmp-mr1-dev automerge: 5292069 
* commit 'c6a042401a740b360790f71884b66fd3a2a09447':
  Change Configure structure to List<PersistableBundle>
 2014-11-08 13:45:08 +00:00
Jim Miller
0814d41c73 Change Configure structure to List<PersistableBundle> 
Adding the new structure was making it difficult for
LMP devices to have common source with upcoming API version.

Fixes bug 17008504

Change-Id: I704503cf0ebff113874c87ab11e37735dbe7b8d7
 2014-11-07 17:18:37 -08:00
Baligh Uddin
4ba5e94e78 Import translations. DO NOT MERGE 
Change-Id: Ib9e93cba1660b5f0b1393f81ddbffe50876f1b53
Auto-generated-cl: translation import
 2014-11-06 23:00:37 -08:00
Jorim Jaggi
ae52c56448 Adjust owner info to spec 
Bug: 18249205
Change-Id: I71916b977d7567d4bc998b86f0d7748ae73a5de0
 2014-11-07 01:50:50 +01:00
Jim Miller
cc56956025 am 767ae175: am 6230cdf5: am 262dc4da: Merge "Update TrustAgentService API after review" into lmp-mr1-dev 
* commit '767ae175fab5a93f4948b3722549448eb4b55e41':
  Update TrustAgentService API after review
 2014-11-06 03:12:08 +00:00
Jim Miller
767ae175fa am 6230cdf5: am 262dc4da: Merge "Update TrustAgentService API after review" into lmp-mr1-dev 
* commit '6230cdf5721f11660e2c0fec1c5695346a9001d0':
  Update TrustAgentService API after review
 2014-11-06 03:07:09 +00:00
Jim Miller
262dc4dafe Merge "Update TrustAgentService API after review" into lmp-mr1-dev 2014-11-06 02:52:20 +00:00
Jim Miller
e303bf4435 Update TrustAgentService API after review 
This change incorporates API council feedback and enables the
TrustAgent whitelisting API.

It also contains a minor cleanup of DPM's use of UserHandle
to eliminate unnecessary object creation.

Fixes bug 17008504

Change-Id: I63cc50169fde54b34406845818bcaf6aadc1a3db
 2014-11-05 18:17:56 -08:00
Adrian Roos
4a38beac17 am 78ac6b29: am c2a809b1: am ad3bc7f8: Fix a keyguard charging status 
* commit '78ac6b296d7509b650a90000a38001a4251e8c3d':
  Fix a keyguard charging status
 2014-11-04 14:38:04 +00:00
Adrian Roos
78ac6b296d am c2a809b1: am ad3bc7f8: Fix a keyguard charging status 
* commit 'c2a809b1afae2077756fdf11af4ac5d466fa6d9a':
  Fix a keyguard charging status
 2014-11-04 14:33:14 +00:00
Adrian Roos
ad3bc7f878 Fix a keyguard charging status 
Fixes a bug where the keyguard was showing
a charging state even though the device was
not plugged in.

Bug: 18166083
Change-Id: I85a2cda674ffdafb37df70598f4028414a639def
 2014-11-04 14:18:16 +00:00
Geoff Mendal
9aff871e55 Import translations. DO NOT MERGE 
Change-Id: I3b95e959238549b4b9d37628441b94023f77ef3f
Auto-generated-cl: translation import
 2014-11-03 06:30:03 -08:00
Adrian Roos
91f4344eee am b3726de1: am 4bc3c8bd: Merge "SampleTrustAgent: Exercise KeyguardManager.isKeyguardInTrustedState" into lmp-mr1-dev automerge: f9b36d5 
* commit 'b3726de168116903293d86d7876183be7e1549b4':
  SampleTrustAgent: Exercise KeyguardManager.isKeyguardInTrustedState
 2014-10-28 07:15:56 +00:00
Adrian Roos
b3726de168 am 4bc3c8bd: Merge "SampleTrustAgent: Exercise KeyguardManager.isKeyguardInTrustedState" into lmp-mr1-dev 
automerge: f9b36d5

* commit 'f9b36d5ef94c92a66c08167d5e7e911e5ea8c645':
  SampleTrustAgent: Exercise KeyguardManager.isKeyguardInTrustedState
 2014-10-27 21:27:01 +00:00
Geoff Mendal
0be35480bb Import translations. DO NOT MERGE 
Change-Id: I248a938c719ca34f05b61deaf5a9a73f4170a170
Auto-generated-cl: translation import
 2014-10-27 06:03:54 -07:00
Adrian Roos
2ace72544a SampleTrustAgent: Exercise KeyguardManager.isKeyguardInTrustedState 
Bug: 18084166
Change-Id: I7d8695f4b576676cc6da1fe07fea05e72d04f33e
 2014-10-24 14:35:26 +02:00
Geoff Mendal
f8457fc248 Import translations. DO NOT MERGE 
Change-Id: I21c8e5a968baefdc8e5f3f20b8fdf7fd82fd2b11
Auto-generated-cl: translation import
 2014-10-22 06:06:19 -07:00
Adrian Roos
1dad102162 am 7850cb33: am 0c458aa5: am 7356a713: Merge "Keyguard: Show IME automatically on tablets" into lmp-mr1-dev 
* commit '7850cb330f25f42fb1499aabb157f0fdec2178b7':
  Keyguard: Show IME automatically on tablets
 2014-10-20 15:29:57 +00:00
Adrian Roos
7850cb330f am 0c458aa5: am 7356a713: Merge "Keyguard: Show IME automatically on tablets" into lmp-mr1-dev 
* commit '0c458aa5158245fef31c78b84be28e574cf8515e':
  Keyguard: Show IME automatically on tablets
 2014-10-20 15:25:27 +00:00
Geoff Mendal
8d7f2c1792 Import translations. DO NOT MERGE 
Change-Id: Id80c87b2025c925a1b5e5117b0f5f464f30c9957
Auto-generated-cl: translation import
 2014-10-20 06:22:15 -07:00
Adrian Roos
195e631960 Keyguard: Show IME automatically on tablets 
Also removes the legacy bool from the core resources.

Bug: 17757057
Change-Id: I5f19e43f413599430b648c3b8763d19a9fc07a91
 2014-10-16 17:28:04 +02:00
Geoff Mendal
70e650c005 Import translations. DO NOT MERGE 
Change-Id: I42bcd99df84e4665098241c31f9d865c537fb1e6
Auto-generated-cl: translation import
 2014-10-13 06:43:16 -07:00