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

324 Commits

Author SHA1 Message Date
Adrian Roos
309b71e530 am 823bf307: am b5e787c1: am 26b0d973: Merge "Fix change IME content description" into lmp-mr1-dev 
* commit '823bf307a248f332f708fd8b359008df837722eb':
  Fix change IME content description
 2015-02-20 14:46:45 +00:00
Adrian Roos
823bf307a2 am b5e787c1: am 26b0d973: Merge "Fix change IME content description" into lmp-mr1-dev 
* commit 'b5e787c1c5a1845e0b8de53f1452a7a6cdeb4c93':
  Fix change IME content description
 2015-02-20 14:39:30 +00:00
Adrian Roos
b5e787c1c5 am 26b0d973: Merge "Fix change IME content description" into lmp-mr1-dev 
* commit '26b0d973d8c2b05e6141fb4808fbb0a28cb7f713':
  Fix change IME content description
 2015-02-20 14:32:44 +00:00
Adrian Roos
4a00263191 Fix change IME content description 
Bug: 19434845
Change-Id: I28be1d8efb61d47abdce168b07a0846056eb650d
 2015-02-19 18:21:52 +01:00
Geoff Mendal
b008c8f73a Import translations. DO NOT MERGE 
Change-Id: I44a5695c1b18476df2114f16e35fbcbf2a0d99c1
Auto-generated-cl: translation import
 2015-02-12 14:51:47 -08:00
Jorim Jaggi
83eaf6cc8c am 515148dc: Merge "Send accessibility event when bouncer is shown" into lmp-mr1-dev 
automerge: 2ffb340

* commit '2ffb3400f7922aba597b61cea91b82bcfc3d7e7d':
  Send accessibility event when bouncer is shown
 2015-02-02 19:30:34 +00:00
Jorim Jaggi
2ffb3400f7 am 515148dc: Merge "Send accessibility event when bouncer is shown" into lmp-mr1-dev 
* commit '515148dcaaf5b63e69998d67958829d4347071ec':
  Send accessibility event when bouncer is shown
 2015-02-02 19:25:34 +00:00
Jorim Jaggi
c1dff8cee8 Send accessibility event when bouncer is shown 
Bug: 18996476
Change-Id: I0e402aa198263807e3013c7fb151f28d049ea51a
 2015-02-02 20:18:26 +01:00
Geoff Mendal
f1270cfb84 Import translations. DO NOT MERGE 
Change-Id: Ib02415ea924e876ae776b34ed271dcae2b9afbb1
Auto-generated-cl: translation import
 2015-01-16 12:37:30 -08:00
Baligh Uddin
0b85506360 Import translations. DO NOT MERGE 
Change-Id: Ie975c5e8d1edb7afc679ce1d27bb7e09b81df571
Auto-generated-cl: translation import
 2014-12-22 20:26:50 -08:00
Baligh Uddin
4136b4f7fe Import translations. DO NOT MERGE 
Change-Id: Ib629c0bca4f92a0c81bf5af904773df1b1f8549e
Auto-generated-cl: translation import
 2014-12-22 20:23:07 -08:00
Geoff Mendal
e184608398 Import translations. DO NOT MERGE 
Change-Id: Ifbbb87b8df40d269d7e28aa398dcacc878c93011
Auto-generated-cl: translation import
 2014-12-15 06:28:48 -08:00
Geoff Mendal
feb6c7f3d6 Import translations. DO NOT MERGE 
Change-Id: I70dc0646e4b8ea8b83dc1f7106067e278260bb3a
Auto-generated-cl: translation import
 2014-12-15 06:25:08 -08:00
Geoff Mendal
f6e388231d Import translations. DO NOT MERGE 
Change-Id: I76e8da5cbb1d3c5e39ea80ebdc0f4f9b129febf7
Auto-generated-cl: translation import
 2014-12-10 06:31:09 -08:00
Geoff Mendal
aa72294174 Import translations. DO NOT MERGE 
Change-Id: I63ccbdea01d869627116121f95c9d35cd64da04e
Auto-generated-cl: translation import
 2014-12-10 06:26:53 -08: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
Geoff Mendal
e734a86b69 Import translations. DO NOT MERGE 
Change-Id: Ifb7d25104a21beffd196b8d73d3c6c20e3800f9f
Auto-generated-cl: translation import
 2014-12-08 06:32:08 -08:00
Geoff Mendal
8510d0142c Import translations. DO NOT MERGE 
Change-Id: I50002c9d6b9e684be9f69dab0c8318226cbda6b9
Auto-generated-cl: translation import
 2014-12-08 06:28:24 -08: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