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

894 Commits

Author SHA1 Message Date
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
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
Jim Miller
f7b0ca622d am edcf3e40: am 0292b8ee: am 73c3c377: am af37450f: am 52403d6f: Merge "Fix "Wrong password" message shown when using BT keyboard." into lmp-dev 
* commit 'edcf3e4045ad13c19b584c043a32467fb1c45dbb':
  Fix "Wrong password" message shown when using BT keyboard.
 2014-10-08 19:06:58 +00:00
Jim Miller
edcf3e4045 am 0292b8ee: am 73c3c377: am af37450f: am 52403d6f: Merge "Fix "Wrong password" message shown when using BT keyboard." into lmp-dev 
* commit '0292b8ee8e79050cee206f80d5bfcad34d015d59':
  Fix "Wrong password" message shown when using BT keyboard.
 2014-10-08 18:50:05 +00:00
Jim Miller
73c3c37703 am af37450f: am 52403d6f: Merge "Fix "Wrong password" message shown when using BT keyboard." into lmp-dev 
* commit 'af37450f41f6834979f1312e61ec550d2a0d665e':
  Fix "Wrong password" message shown when using BT keyboard.
 2014-10-08 18:25:38 +00:00
Jim Miller
af37450f41 am 52403d6f: Merge "Fix "Wrong password" message shown when using BT keyboard." into lmp-dev 
* commit '52403d6f8e9a0e31a0f880a9cd297aeb35c29c8e':
  Fix "Wrong password" message shown when using BT keyboard.
 2014-10-08 18:15:24 +00:00
Geoff Mendal
b28e5e6fb3 Import translations. DO NOT MERGE 
Change-Id: I076b34940ee671680ba8b05277a07d124fe6f896
Auto-generated-cl: translation import
 2014-10-08 08:10:47 -07:00
Jim Miller
e8fed24be6 Fix "Wrong password" message shown when using BT keyboard. 
The code was assuming we're always using soft IME. When a physical
keyboard is attached, we get two events; ACTION_DOWN and ACTION_UP.
The code attempted to unlock the device twice.  The second attempt
failed because the TextView was cleared by the first successful attempt.

Fixes bug 17690585

Change-Id: Ia92a97400b4404d0cbe86aacb727009e95914327
 2014-10-07 16:50:04 -07:00
Geoff Mendal
60c8d31311 Import translations. DO NOT MERGE 
Change-Id: Id12f921d4c65962111910324a271ae406c4e6c3d
Auto-generated-cl: translation import
 2014-10-06 11:07:52 -07:00
Baligh Uddin
3d45fa4d8a Import translations. DO NOT MERGE 
Change-Id: I759dff742b598ccdaee01fa72e37170749c320a2
Auto-generated-cl: translation import
 2014-10-04 11:14:18 -07:00
Vineeta Srivastava
b476d1dc2a am 323807f4: am a42d17c5: am 3cc41b8e: am 533c9461: am ab1e241d: Merge "Show one name if both plmn and spn are equal" into lmp-dev 
* commit '323807f4832dd79dddfd441fc8fdad7465931c6b':
  Show one name if both plmn and spn are equal
 2014-10-01 17:19:17 +00:00
Vineeta Srivastava
323807f483 am a42d17c5: am 3cc41b8e: am 533c9461: am ab1e241d: Merge "Show one name if both plmn and spn are equal" into lmp-dev 
* commit 'a42d17c5233b60c6f4460bd1679f788d334fea16':
  Show one name if both plmn and spn are equal
 2014-10-01 17:10:57 +00:00
Vineeta Srivastava
3cc41b8edd am 533c9461: am ab1e241d: Merge "Show one name if both plmn and spn are equal" into lmp-dev 
* commit '533c9461569c171fbdfe51cff708c27c10302353':
  Show one name if both plmn and spn are equal
 2014-10-01 15:15:51 +00:00
Vineeta Srivastava
533c946156 am ab1e241d: Merge "Show one name if both plmn and spn are equal" into lmp-dev 
* commit 'ab1e241d385ac2cb589f961cf6ea4a86b8a3e867':
  Show one name if both plmn and spn are equal
 2014-10-01 15:02:37 +00:00
Sungmin Choi
ab1b39f434 Show one name if both plmn and spn are equal 
If both plmn and SPN are SKTelecom, lockscreen is shown as SKTelecom-SKTelecom.
In this case, it would be better to show only SKTelecom.

Bug: 17702041
Change-Id: I268455b037752cf21a3247be7809283f50b72c27
 2014-09-30 23:35:14 +00:00
Baligh Uddin
561a625986 Import translations. DO NOT MERGE 
Change-Id: I241313f212706b9887c5d9ec343b849d1b5a47e3
Auto-generated-cl: translation import
 2014-09-30 00:29:54 -07:00
Baligh Uddin
80eac5d930 Import translations. DO NOT MERGE 
Change-Id: I0b93ac3918f0f6cb15d932cad6bb10e782e0677c
Auto-generated-cl: translation import
 2014-09-28 20:28:32 -07:00
Baligh Uddin
810b0d046b Import translations. DO NOT MERGE 
Change-Id: Ib7023f1579781f155196f993f408fd5bfd5a7993
Auto-generated-cl: translation import
 2014-09-20 13:07:20 -07:00
John Spurlock
c7e1e08d3c am 3202941b: am 40274462: am 8c9c8ce9: am da676b8b: am 933e8411: Merge "When dozing, re-enable falsing threshold and log events." into lmp-dev 
* commit '3202941b7f8d9edc659d8733aad56c0f8f348eb0':
  When dozing, re-enable falsing threshold and log events.
 2014-09-19 17:07:17 +00:00
John Spurlock
5645f8d04a am 40274462: am 8c9c8ce9: am da676b8b: am 933e8411: Merge "When dozing, re-enable falsing threshold and log events." into lmp-dev 
* commit '4027446219c0412a23594609f66aa0f9a6483771':
  When dozing, re-enable falsing threshold and log events.
 2014-09-19 16:53:59 +00:00
John Spurlock
79fcf4c0b1 am da676b8b: am 933e8411: Merge "When dozing, re-enable falsing threshold and log events." into lmp-dev 
* commit 'da676b8b552da886b7debcca8dfdd6cc95e14dcd':
  When dozing, re-enable falsing threshold and log events.
 2014-09-19 16:27:55 +00:00
John Spurlock
e00e69c583 am 933e8411: Merge "When dozing, re-enable falsing threshold and log events." into lmp-dev 
* commit '933e841121f91329bd4273cbffe1ed510db76314':
  When dozing, re-enable falsing threshold and log events.
 2014-09-19 16:16:48 +00:00
John Spurlock
813552cc27 When dozing, re-enable falsing threshold and log events. 
- Reactivate our configured keyguard falsing swipe threshold
  for secure keyguards, but only when dozing.
- Add DozeLog helper to capture/maintain interesting events
  about the doze + unlock process, enabled by default, but
  only on devices that start dozing at least once.
- Dump summary counts + logged events to dumpsys output.
- Pass notification pulse "instance" as an extra to the scheduled
  intent, so we can log accordingly.

Bug:17496795
Change-Id: I7e88f93bfc967bdc06550cf1fe5e74d535edd774
 2014-09-19 11:47:30 -04:00
Baligh Uddin
94568b5a4b Import translations. DO NOT MERGE 
Change-Id: I11a6ad98b1e6436afce56de2bdefaaf67f19af9e
Auto-generated-cl: translation import
 2014-09-16 10:57:28 -07:00
Baligh Uddin
fffb742fc9 Import translations. DO NOT MERGE 
Change-Id: I01a13199ac08e944af6db52488c63df0df97bed1
Auto-generated-cl: translation import
 2014-09-16 10:52:09 -07:00
Baligh Uddin
b3c8598174 Import translations. DO NOT MERGE 
Change-Id: I57bb85dcb94f83e095e07ee4956d786849284688
Auto-generated-cl: translation import
 2014-09-14 19:17:12 -07:00
Jorim Jaggi
72e99bb302 am 38e0d1bf: am 39538cd0: am a853c623: Merge "Avoid some more layer creations" into lmp-dev 
* commit '38e0d1bf93e0abe7cbd5765f3043c8b5ada485da':
  Avoid some more layer creations
 2014-09-13 02:17:07 +00:00
Jorim Jaggi
f86ca9a05f am 6d649b3e: am 3476a227: am 570ed0e7: Merge "More notifications and bigger clock for phablets" into lmp-dev 
* commit '6d649b3e3ceb456cd609151fea63ef908cc1b1b6':
  More notifications and bigger clock for phablets
 2014-09-13 02:16:49 +00:00
Jorim Jaggi
618c764634 am a853c623: Merge "Avoid some more layer creations" into lmp-dev 
* commit 'a853c62323cef84ffc8442e0d1f6550ee7b1f99e':
  Avoid some more layer creations
 2014-09-12 18:53:35 +00:00
Jorim Jaggi
d5c2aebf6f am 570ed0e7: Merge "More notifications and bigger clock for phablets" into lmp-dev 
* commit '570ed0e78b6d593560dd0347734210c2f2842b90':
  More notifications and bigger clock for phablets
 2014-09-12 18:53:20 +00:00