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

307 Commits

Author SHA1 Message Date
Jinsong Mu
5a181a2436 am 6fac0351: am b3898fbe: Merge "Talk-back doesn\'t notify user to enter unlock PIN when device is locked with PIN lock. b/18568003" into lmp-mr1-dev 
* commit '6fac0351cebf84cf9505246e1fec5d74a1fa49c0':
  Talk-back doesn't notify user to enter unlock PIN when device is locked with PIN lock. b/18568003
 2014-12-08 19:35:31 +00:00
Jason Monk
0538e675db am 85d61aaa: am d601c6c5: Merge "Make CarrierText handle multi-sim" into lmp-mr1-dev 
* commit '85d61aaa1a441efd1c1eba2e30742552fa34a0d6':
  Make CarrierText handle multi-sim
 2014-12-08 19:09:10 +00:00
Jinsong Mu
b3898fbe07 Merge "Talk-back doesn't notify user to enter unlock PIN when device is locked with PIN lock. b/18568003" into lmp-mr1-dev 2014-12-05 23:50:02 +00:00
Jinsong Mu
dc6efdc1c6 Talk-back doesn't notify user to enter unlock PIN when device is locked with PIN lock. 
b/18568003

Change-Id: I622ca7c49a8aa712490c8f74fcd7a1ab6d2ead5f
 2014-12-05 09:36:19 -08:00
Jason Monk
d601c6c5c3 Merge "Make CarrierText handle multi-sim" into lmp-mr1-dev 2014-12-04 22:31:58 +00:00
Jason Monk
9ff69bd8f1 Make CarrierText handle multi-sim 
To do this need to handle the subscription id that comes with all
spn broadcasts and concatenate properly as needed.

Bug: 18223317
Change-Id: I2a1cde0a4bf2f50082288cc5cdeb968fa9aa7dd0
 2014-12-04 17:29:12 -05:00
Geoff Mendal
97df114581 Import translations. DO NOT MERGE 
Change-Id: Iea99b1400da98c7af76027d54e0f9315c2726a5b
Auto-generated-cl: translation import
 2014-12-03 06:27:45 -08:00
Baligh Uddin
c46c0d9d82 Import translations. DO NOT MERGE 
Change-Id: I6acd5c2437f73dcbeca9cf6746c0a7c23c98eebc
Auto-generated-cl: translation import
 2014-12-02 14:14:05 -08:00
Geoff Mendal
9cde3e1d82 Import translations. DO NOT MERGE 
Change-Id: I2cb5a0bf876f8553710f0ed3882f7ef56da24557
Auto-generated-cl: translation import
 2014-12-01 06:36:32 -08:00
Geoff Mendal
92ed2ec015 Import translations. DO NOT MERGE 
Change-Id: Idfd2434481ce912e23afaaa7fb6bbef3dcad35f8
Auto-generated-cl: translation import
 2014-11-26 06:31:37 -08:00
Jorim Jaggi
649c0ca2a4 am fc4d8043: am f510a8a6: Merge "Tint SIM images in PIN/PUK screen" into lmp-mr1-dev 
* commit 'fc4d8043ded6f8ef5dcf6ffdcb9f2f40c1c369f5':
  Tint SIM images in PIN/PUK screen
 2014-11-25 15:09:46 +00:00
Jorim Jaggi
f510a8a688 Merge "Tint SIM images in PIN/PUK screen" into lmp-mr1-dev 2014-11-24 16:26:03 +00:00
Geoff Mendal
905e20855b Import translations. DO NOT MERGE 
Change-Id: Ib51df7dd1177be11dbe75dc983866a9cfdf74511
Auto-generated-cl: translation import
 2014-11-24 06:21:48 -08:00
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
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
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
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
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
ae52c56448 Adjust owner info to spec 
Bug: 18249205
Change-Id: I71916b977d7567d4bc998b86f0d7748ae73a5de0
 2014-11-07 01:50:50 +01: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
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
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
Jorim Jaggi
6d476e9938 am a853c623: Merge "Avoid some more layer creations" into lmp-dev 
* commit 'a853c62323cef84ffc8442e0d1f6550ee7b1f99e':
  Avoid some more layer creations
 2014-09-12 18:53:18 +00:00
Jorim Jaggi
347a07acaa 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:07 +00:00
Jorim Jaggi
689d491d8a Merge "Avoid some more layer creations" into lmp-dev 2014-09-12 18:42:57 +00:00
Jorim Jaggi
0b15e00675 More notifications and bigger clock for phablets 
Bug: 16799035
Change-Id: I7aa6240ca8a06276640bafd531d92893cf53f40b
 2014-09-12 20:13:44 +02:00
Jorim Jaggi
e19b1ac57c Avoid some more layer creations 
Bug: 17287256
Change-Id: I8c0c6f1f189b70d9a0c261f75987def3464d808d
 2014-09-12 18:42:20 +02:00
Jorim Jaggi
8136912835 am bf763e77: Merge "Remove some overdraw in Keyguard" into lmp-dev 
* commit 'bf763e77177f172dcb1d7590dd1855d53ff0d2e5':
  Remove some overdraw in Keyguard
 2014-09-10 17:32:06 +00:00
Jorim Jaggi
6e85b712c5 am bf763e77: Merge "Remove some overdraw in Keyguard" into lmp-dev 
* commit 'bf763e77177f172dcb1d7590dd1855d53ff0d2e5':
  Remove some overdraw in Keyguard
 2014-09-10 17:31:47 +00:00
Jorim Jaggi
53251ed4ac Remove some overdraw in Keyguard 
Bug: 17287256
Change-Id: I0bc4101713f83abc2738528c247ca8ce5748bff1
 2014-09-10 19:00:22 +02: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
de9818a839 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:01 +00:00
Jorim Jaggi
68e6fa72f2 Remove "forgot pattern" in pattern view 
Bug: 17184958
Change-Id: I7ebb35a1b734286ded99352b3fa2b891386c581d
 2014-09-05 15:41:07 +02: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
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
e82f90e72e Remove different layout for landscape in Keyguard 
Bug: 15422177
Change-Id: I8a643a8f6dcfed1530f17e8de6a5cc69533528b4
 2014-09-02 21:54:25 +02: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
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
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
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
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
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