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

360 Commits

Author SHA1 Message Date
Geoff Mendal
ffeed7078c Import translations. DO NOT MERGE 
Change-Id: I16370c1730b23cbcae593add08cee035c31469b4
Auto-generated-cl: translation import
 2015-01-05 06:17:21 -08:00
Baligh Uddin
1b09b23b74 Import translations. DO NOT MERGE 
Change-Id: I9535f01cf967b5a17dfad63ef52d1b6bec03d322
Auto-generated-cl: translation import
 2014-12-22 20:31:46 -08:00
Geoff Mendal
c2364bc396 Import translations. DO NOT MERGE 
Change-Id: I8cabcbd1ee5327a6545b379dd7f35ca9c29c9114
Auto-generated-cl: translation import
 2014-12-15 06:33:10 -08:00
Geoff Mendal
e14d3cedaf Import translations. DO NOT MERGE 
Change-Id: I1b5385d1c459753eaea6ab4f305686ffb58592e9
Auto-generated-cl: translation import
 2014-12-10 06:35:44 -08:00
Jinsong Mu
0de9745c20 am 5a181a24: 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 '5a181a2436fb629c2298b9bfb0b2848b514edbe6':
  Talk-back doesn't notify user to enter unlock PIN when device is locked with PIN lock. b/18568003
 2014-12-09 00:59:45 +00:00
Jason Monk
1bcdba7b1a am 0538e675: am 85d61aaa: am d601c6c5: Merge "Make CarrierText handle multi-sim" into lmp-mr1-dev 
* commit '0538e675db393777ca1090725b71d54d78fce007':
  Make CarrierText handle multi-sim
 2014-12-08 20:29:16 +00:00
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
3a7436effb Import translations. DO NOT MERGE 
Change-Id: Ia32fade2318979587cf9eabe1aad8ca6a912c52d
Auto-generated-cl: translation import
 2014-12-03 06:36:10 -08: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
fceb7d652f Import translations. DO NOT MERGE 
Change-Id: I99666ee10f2ad6d4489d9ad554606ee22566b15a
Auto-generated-cl: translation import
 2014-12-01 06:44:53 -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
19475c24a9 Import translations. DO NOT MERGE 
Change-Id: Ie84614988b6307176d8da43db0038c12420065e8
Auto-generated-cl: translation import
 2014-11-26 06:39:40 -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
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