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

1088 Commits

Author SHA1 Message Date
Adrian Roos
a323e3f336 Merge "Relabel emergency button" 2015-04-08 16:58:58 +00:00
Adrian Roos
a41d5a7a35 Relabel emergency button 
Bug: 19574098
Change-Id: Iddf96ba2206838712980aea00c9ea304f590c8b3
 2015-04-08 18:56:38 +02:00
Geoff Mendal
032492572e Import translations. DO NOT MERGE 
Change-Id: Ib75733c03e1a3350e192c9967a0f8b2e4b49e8c2
Auto-generated-cl: translation import
 2015-04-08 05:52:41 -07:00
Geoff Mendal
7167e1e3ce Import translations. DO NOT MERGE 
Change-Id: I3f89528f6ae805899dc48a039f3c08ceeabd8480
Auto-generated-cl: translation import
 2015-04-06 05:32:59 -07:00
Geoff Mendal
b0396e5c3d Import translations. DO NOT MERGE 
Change-Id: Iaeb14afbbba8c976399110e09e898a4708cf6437
Auto-generated-cl: translation import
 2015-04-03 22:51:30 -07:00
Jason Monk
cdf0a97f38 Merge "Change carrier text to 'airplane mode' when on" 2015-04-02 12:58:39 +00:00
Jim Miller
ebbf205bc6 Prepare to make Fingerprint API public. 
- move fingerprint support files into hardware area
- move jni into services/core

Change-Id: I48a8e43d6d328fb66d79919c255e4c44e984b4d1
 2015-04-01 19:20:08 -07:00
Jason Monk
726fb28248 Change carrier text to 'airplane mode' when on 
Bug: 18833886
Change-Id: Iae757cacb7770cbe7e3509a943c78d04ee0f99f4
 2015-04-01 11:49:54 -04:00
Adrian Roos
4249c049cc Merge "Explicitly specify package in EmergencyButton" 2015-03-30 22:01:23 +00:00
Adrian Roos
8d75c14d0c Explicitly specify package in EmergencyButton 
Change-Id: I0c64195e748ef926ae87db21663c86eab38c38b8
 2015-03-30 18:59:13 +00:00
Jim Miller
9fc9ac5f77 Merge "Refactor fingerprint API" 2015-03-25 19:45:29 +00:00
John Spurlock
36a1342bce Fix typo in KeyguardUpdateMonitor. 
Change-Id: Iedb2b2051b1a14ab7cc099614f45a57b745ea19d
 2015-03-24 21:15:48 -04:00
Jim Miller
9f0753f5a3 Refactor fingerprint API 
- enroll() and authenticate() now take an explicit callback object.
- better handling of strings
- use framework resources for commonn error strings
- add vendor-specific arrays to resources

Bug 16487912

Change-Id: Idf34242fdd06bba1903cdb22bf20169d15d92b82
 2015-03-24 17:02:46 -07:00
Geoff Mendal
6536f65afb Import translations. DO NOT MERGE 
Change-Id: Ifac523c71970a048540fcfdbdb81b1b6d02e630a
Auto-generated-cl: translation import
 2015-03-20 23:36:23 -07:00
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