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

1074 Commits

Author SHA1 Message Date
Geoff Mendal
8e39914610 Import translations. DO NOT MERGE 
Change-Id: I47e03bc7c00c7cb751c063324027e7846b067eaf
Auto-generated-cl: translation import
 2015-03-16 06:19:39 -07:00
Adrian Roos
93891686eb Merge "Remove leftover code causing trust agent issues" 2015-03-09 16:06:43 +00:00
Geoff Mendal
cb93de1b7d Import translations. DO NOT MERGE 
Change-Id: Id2e79810aa3f2c1beb932786f579feab06b6825a
Auto-generated-cl: translation import
 2015-03-09 06:23:28 -07:00
Adrian Roos
a4da9f6b99 Remove leftover code causing trust agent issues 
When trust agent whitelists were added in MR1,
the isTrustDisabled method was left in although
it prevents the whitelist from working properly.

Bug: 19461292
Change-Id: I72eb041b03e1f16c582cbf2a0bb622a70444caeb
 2015-03-05 19:27:37 +00:00
John Spurlock
7b91c55b3f Merge "Remove unused imports in frameworks/base." 2015-03-02 20:43:50 +00:00
Geoff Mendal
3c89ff2289 Import translations. DO NOT MERGE 
Change-Id: I209860801eccbb182374ecb6abe8ddc0a0bca700
Auto-generated-cl: translation import
 2015-03-02 06:44:30 -08:00
John Spurlock
08c7116ab9 Remove unused imports in frameworks/base. 
Change-Id: I031443de83f93eb57a98863001826671b18f3b17
 2015-02-28 14:47:49 -05:00
Jim Miller
ba67aee02c Add fingerprint settings support to the framework 
- cleanup thread issue and simplify native FingerprintService methods
- add new permissions and enforce them
- add fingerprint hardware detection API

Change-Id: I87c2243ea2412061f1e85b044138480d0161bcdf
 2015-02-27 12:03:32 -08:00
Jason Monk
bd61b2a1fd am 58ae213c: am 0ac63669: am 057fd382: am 9df42df2: Merge "Keyguard: Use plmn/spn broadcast when no SIMs" into lmp-mr1-dev 
* commit '58ae213c3df42d9aa7501071a03460ff69ba44e2':
  Keyguard: Use plmn/spn broadcast when no SIMs
 2015-02-26 23:47:27 +00:00
Jason Monk
58ae213c3d am 0ac63669: am 057fd382: am 9df42df2: Merge "Keyguard: Use plmn/spn broadcast when no SIMs" into lmp-mr1-dev 
* commit '0ac63669b1a3da456fde5c8df61b652eb090a407':
  Keyguard: Use plmn/spn broadcast when no SIMs
 2015-02-26 23:31:35 +00:00
Jason Monk
057fd382cc am 9df42df2: Merge "Keyguard: Use plmn/spn broadcast when no SIMs" into lmp-mr1-dev 
* commit '9df42df2bca0a7a91d813b19e084069675d4057b':
  Keyguard: Use plmn/spn broadcast when no SIMs
 2015-02-26 21:59:06 +00:00
Geoff Mendal
7a57388962 Import translations. DO NOT MERGE 
Change-Id: I5e23004d3660fc0ce296391f908e6a042e8da16d
Auto-generated-cl: translation import
 2015-02-25 06:40:41 -08:00
Geoff Mendal
a4f544540e Import translations. DO NOT MERGE 
Change-Id: I5974f01d8313faa999068ffd844ecbafb9ab4321
Auto-generated-cl: translation import
 2015-02-25 06:02:34 -08:00
Jason Monk
de3260b5bf Keyguard: Use plmn/spn broadcast when no SIMs 
The keyguard needs to show either 'emergency calls only' or 'no service'
depending on whether there is service available, so try to pull this from
the old sticky broadcast containing plmn/spn.

Bug: 19476978
Change-Id: I83523cc4c7dd5f46bd97df2cc9ecdb38d1c2e001
 2015-02-24 10:13:47 -05:00
Geoff Mendal
9649e92c2a Import translations. DO NOT MERGE 
Change-Id: If086d9b20caf8b39a91169d74954f6f21402dec8
Auto-generated-cl: translation import
 2015-02-23 06:50:26 -08:00
Geoff Mendal
dc82f4ce1c Import translations. DO NOT MERGE 
Change-Id: I470855ce547f2e302f9ad27a3c08ad40d8fd0048
Auto-generated-cl: translation import
 2015-02-23 06:12:16 -08:00
Adrian Roos
1156da8c0d am 309b71e5: am 823bf307: am b5e787c1: am 26b0d973: Merge "Fix change IME content description" into lmp-mr1-dev 
* commit '309b71e53086c9bd3b7610799836d66d64aed654':
  Fix change IME content description
 2015-02-20 14:53:48 +00:00
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
Alan Viverette
cc72f61adf am b20d48fd: am 014442c2: am 0dfae079: am d5471a0b: Merge "Revert "Fixed accessibility for the pin input view on keyguard."" into lmp-mr1-dev 
* commit 'b20d48fd20928cf3167ee37649d702c90c7e0218':
  Revert "Fixed accessibility for the pin input view on keyguard."
 2015-02-18 00:30:24 +00:00
Alan Viverette
b20d48fd20 am 014442c2: am 0dfae079: am d5471a0b: Merge "Revert "Fixed accessibility for the pin input view on keyguard."" into lmp-mr1-dev 
* commit '014442c28eae214af56f4c1fe3e0c21d5b091d25':
  Revert "Fixed accessibility for the pin input view on keyguard."
 2015-02-17 23:06:55 +00:00
Alan Viverette
014442c28e am 0dfae079: am d5471a0b: Merge "Revert "Fixed accessibility for the pin input view on keyguard."" into lmp-mr1-dev 
* commit '0dfae079633764c3b6fceaea38fdc664e0e5a76d':
  Revert "Fixed accessibility for the pin input view on keyguard."
 2015-02-17 22:59:29 +00:00
Alan Viverette
0dfae07963 am d5471a0b: Merge "Revert "Fixed accessibility for the pin input view on keyguard."" into lmp-mr1-dev 
* commit 'd5471a0b2bf938cf83f4abac66a18664d8ca5277':
  Revert "Fixed accessibility for the pin input view on keyguard."
 2015-02-17 22:52:06 +00:00
Adrian Roos
42661cba30 Revert "Fixed accessibility for the pin input view on keyguard." 
Also removes the Klondike from the content description.

This reverts commit c199ef37594b946cb295c29df321e74332ee5408
from change I3dd05fa1714da36795f448718fd70f1cdbfe2584

Bug: 18528774
Change-Id: I8a85076f939a8b78075b5a6322009ebfd78bf8d3
 2015-02-17 21:05:57 +01:00
Geoff Mendal
71af2a5d00 Import translations. DO NOT MERGE 
Change-Id: I5d9f149a4f04fd8e89b73f9018fae1e5906ba572
Auto-generated-cl: translation import
 2015-02-16 06:40:33 -08: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
Daniel Sandler
69e358e3f4 am 9337e595: am be62a5db: am 96ac73c3: am 6e3de6a1: Merge "Added TEXT_CHANGED event to PasswordTextView" into lmp-mr1-dev 
* commit '9337e595c164307ab9f50374fd35d38de4bc4cd4':
  Added TEXT_CHANGED event to PasswordTextView
 2015-02-09 21:12:55 +00:00
Daniel Sandler
9337e595c1 am be62a5db: am 96ac73c3: am 6e3de6a1: Merge "Added TEXT_CHANGED event to PasswordTextView" into lmp-mr1-dev 
* commit 'be62a5db60adc738e7f5bbe24c04260e7b9b0a4f':
  Added TEXT_CHANGED event to PasswordTextView
 2015-02-09 21:04:25 +00:00
Daniel Sandler
96ac73c357 am 6e3de6a1: Merge "Added TEXT_CHANGED event to PasswordTextView" into lmp-mr1-dev 
* commit '6e3de6a19af1533a0661975b5440b7c922211d0a':
  Added TEXT_CHANGED event to PasswordTextView
 2015-02-09 20:49:43 +00:00
Daniel Sandler
6e3de6a19a Merge "Added TEXT_CHANGED event to PasswordTextView" into lmp-mr1-dev 2015-02-09 20:43:38 +00:00
Adrian Roos
92b2fe5d0d am 270496ef: am 4e4c37a2: am 991db77a: Only request IME if password view is showing 
automerge: fc7e8f0

* commit 'fc7e8f0b024ab119e7b06e5d3b6d5a1f4e00edba':
  Only request IME if password view is showing
 2015-02-09 16:41:32 +00:00
Adrian Roos
fc7e8f0b02 am 270496ef: am 4e4c37a2: am 991db77a: Only request IME if password view is showing 
* commit '270496ef13b6baba1f0749d8c282262b021ff18e':
  Only request IME if password view is showing
 2015-02-09 16:38:42 +00:00
Adrian Roos
4e4c37a2da am 991db77a: Only request IME if password view is showing 
* commit '991db77a44f3352a8cf6351f79cad67bf955e4e4':
  Only request IME if password view is showing
 2015-02-09 16:07:32 +00:00
Adrian Roos
a48caee9a7 Added TEXT_CHANGED event to PasswordTextView 
Also creates a TextView-like accessibility node
and populates accessibility events with text if
required.

Bug: 18528774
Change-Id: I4a918a092b1e97879c31f54604cf957e01f4bc86
 2015-02-09 15:55:21 +00:00
Adrian Roos
991db77a44 Only request IME if password view is showing 
Bug: 19250277
Change-Id: I881b08ebc6900ba43289b772ed0d039dbb62149c
 2015-02-09 13:26:02 +00:00
Adrian Roos
c2e01683b3 Remove UI code from LockPatternUtils 
Bug: 18931518
Change-Id: I951166f675731ec7a2bc51585e0a51e0cd92611d
 2015-02-03 19:12:23 +01:00
Andrew Lee
f98f7b969b Null-protect attempt to get EmergencyButton. 
Not all device layouts, such as for tablets, will have an Emergency
Button, so check for null before attempting to set a callback.

Bug: 18977746
Change-Id: I0e909e71c51f6923edda4707bb25053a5f2de398
 2015-02-02 16:08:41 -08:00
Andrew Lee
72b46d429c Reset keyguard/bouncer on "return to call". 
+ Add callback, to be invoked when EmergencyButton is clicked when
inside a call.
+ Route callback to the KeyguardViewMediator, to invoke
resetStateLocked() to reset the bouncer.

Bug: 18977746
Change-Id: I4733ccfb6809c4610184a33a28ba38ecf255231f
 2015-02-02 12:30:59 -08:00
Jorim Jaggi
10c85c76a9 Merge commit '83eaf6cc' into HEAD 
Change-Id: I13918ee8116ac17169910a1414de913bcc2d184e
 2015-02-02 20:45:32 +01: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
4e04b1a068 Import translations. DO NOT MERGE 
Change-Id: Ia7c0dac57e019a08a6b7f0a327d03de327dcbac0
Auto-generated-cl: translation import
 2015-01-28 06:55:37 -08:00
Geoff Mendal
dee11b8d17 Import translations. DO NOT MERGE 
Change-Id: I69ace6aac5ffcb881daa299279ad006a08f0f768
Auto-generated-cl: translation import
 2015-01-21 06:42:19 -08: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
Jorim Jaggi
568e54be71 resolve merge conflicts of 87f5369 to master. 
Change-Id: I5d1a7aaf48c4bf70f7181508aa46fbbcc2cf7086
 2015-01-15 00:12:18 +01:00
Adrian Roos
4bc5b2bce9 Merge "LockPatternUtils clean up continued" 2015-01-14 22:32:08 +00:00
Adrian Roos
9dd16ebcf2 LockPatternUtils clean up continued 
- Deprecate Settings.Secure.LOCK_PATTERN_ENABLED
- Remove unused permanent lock out
- Disallow empty/null arguments to saveLockPattern and saveLockPassword
- Refactor repeated quality checks

Change-Id: I6f369eb60f8f6bb1e33384cd06534c713ab52e79
 2015-01-14 22:51:31 +01:00