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

342 Commits

Author SHA1 Message Date
Geoff Mendal
19475c24a9 Import translations. DO NOT MERGE 
Change-Id: Ie84614988b6307176d8da43db0038c12420065e8
Auto-generated-cl: translation import
 2014-11-26 06:39:40 -08:00
Jorim Jaggi
b1c6fa5436 am 649c0ca2: am fc4d8043: am f510a8a6: Merge "Tint SIM images in PIN/PUK screen" into lmp-mr1-dev 
* commit '649c0ca2a418fed4eff92b93e5e825c5814b4870':
  Tint SIM images in PIN/PUK screen
 2014-11-25 15:15:51 +00: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
b80417303f Import translations. DO NOT MERGE 
Change-Id: I99aa8bb6f0cd916b4ea4e4621a175cad9d43c3af
Auto-generated-cl: translation import
 2014-11-24 06:29:27 -08: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
9d4e6a8355 am 1f26bf6b: am 108bdbc9: am efb2df69: Merge "Different messages when wiping user and not device" into lmp-mr1-dev 
* commit '1f26bf6bfd683b840f688b41d285fd9c942e6ed5':
  Different messages when wiping user and not device
 2014-11-22 00:00:01 +00: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
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
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
Geoff Mendal
ae11401639 Import translations. DO NOT MERGE 
Change-Id: I846e773dba336127002de67b9dcdf9506c1ec29b
Auto-generated-cl: translation import
 2014-11-10 06:36:09 -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
Geoff Mendal
9aff871e55 Import translations. DO NOT MERGE 
Change-Id: I3b95e959238549b4b9d37628441b94023f77ef3f
Auto-generated-cl: translation import
 2014-11-03 06:30:03 -08: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
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
Geoff Mendal
b28e5e6fb3 Import translations. DO NOT MERGE 
Change-Id: I076b34940ee671680ba8b05277a07d124fe6f896
Auto-generated-cl: translation import
 2014-10-08 08:10:47 -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
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
810b0d046b Import translations. DO NOT MERGE 
Change-Id: Ib7023f1579781f155196f993f408fd5bfd5a7993
Auto-generated-cl: translation import
 2014-09-20 13:07:20 -07: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
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
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