Baligh Uddin
8151c82b53
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
2015-09-25 02:58:35 +00:00
Baligh Uddin
35b4e051fc
Import translations. DO NOT MERGE
...
Change-Id: I8dbabeae97d242d546a379cdd2cea75fceb8bec9
Auto-generated-cl: translation import
2015-09-24 19:56:50 -07:00
Maurice Lam
177db306c5
am 2fd785e0: am 655ddae8: [Fingerprint] Fix link accessibility
...
* commit '2fd785e099003aad2c2537938cd8945b32cb90ab':
[Fingerprint] Fix link accessibility
2015-09-25 01:08:58 +00:00
Maurice Lam
2fd785e099
am 655ddae8: [Fingerprint] Fix link accessibility
...
* commit '655ddae8b52191633f0052617feb511b0bc02945':
[Fingerprint] Fix link accessibility
2015-09-25 01:01:57 +00:00
Maurice Lam
655ddae8b5
[Fingerprint] Fix link accessibility
...
Copied ExploreByTouchHelper, LinkAccessibilityHelper and LinkTextView
from setup wizard and switched fingerprint_settings_footer to use
LinkTextView, so that users can navigate to the link in TalkBack
mode.
Bug: 24343933
Change-Id: I0ff0c054510dfef4263ea223cb0044a4bddf321f
2015-09-24 16:28:27 -07:00
Jason Monk
7eda07bc5f
resolved conflicts for e0d175ed to master
...
Change-Id: Ia9f6e2f5af2ee4e5b944a80407bfedf7f9b30a1b
2015-09-23 18:55:44 -04:00
Jason Monk
e0d175edc6
am 9f773870: am 3b06fd8b: am 16a8e8d1: Make picture color mode less of a feature
...
* commit '9f773870361cb11729c6997e943a4e540324ea02':
Make picture color mode less of a feature
2015-09-23 21:00:23 +00:00
Jason Monk
9f77387036
am 3b06fd8b: am 16a8e8d1: Make picture color mode less of a feature
...
* commit '3b06fd8b9dc59acf31e61c48e4c8fefd110c1f0f':
Make picture color mode less of a feature
2015-09-23 20:50:38 +00:00
Jason Monk
3b06fd8b9d
am 16a8e8d1: Make picture color mode less of a feature
...
* commit '16a8e8d1028c09abe8b083acf9da70e6d65ebb79':
Make picture color mode less of a feature
2015-09-23 20:44:16 +00:00
Jason Monk
16a8e8d102
Make picture color mode less of a feature
...
- Shun it to developer settings
- Hide 'natural' mode
- Remove dialog
Bug: 24038268
Change-Id: Ibaf363bc06b444f2a361707b98742328fc290cfc
2015-09-23 16:08:13 -04:00
Baligh Uddin
3d7c4d57c4
Import translations. DO NOT MERGE
...
Change-Id: If9f89fbb505335fd3ab6a87a15fce090005f1e80
Auto-generated-cl: translation import
2015-09-22 22:02:21 -07:00
Julia Reynolds
cf92ef10a5
Updates to automatic rule listing page for 3P rules.
...
Show the provider app icon and name; allow deletion from
listing page; remove the rule summary for consistency.
Bug: 22977552
Change-Id: Ib71832fa4ff64b7321ade39f9964ac52cee6c643
2015-09-21 11:30:02 -04:00
Jim Miller
e2fb8f1d81
am 93fd2b5c: am 2b620859: am 50ee327f: am d251fed3: Merge "Add summary for 0 fingerprint settings preference" into mnc-dr-dev
...
* commit '93fd2b5c3010b17be5391a1e0ae755e31ec9852c':
Add summary for 0 fingerprint settings preference
2015-09-19 18:15:05 +00:00
Justin Harrison
c591cdd69b
am fa9d8258: am 8a44f2c4: am a3add1d2: am c6a96d40: Merge "Add color transform setting" into mnc-dr-dev
...
* commit 'fa9d8258d4d186c1aeaf3f79cff892d0a290e6a5':
Add color transform setting
2015-09-19 18:14:36 +00:00
Baligh Uddin
2d0db3098e
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
2015-09-19 02:35:07 +00:00
Jim Miller
93fd2b5c30
am 2b620859: am 50ee327f: am d251fed3: Merge "Add summary for 0 fingerprint settings preference" into mnc-dr-dev
...
* commit '2b6208599d5cd606cc3a685f6ae3d5b9acf5553b':
Add summary for 0 fingerprint settings preference
2015-09-19 01:22:40 +00:00
Jim Miller
2b6208599d
am 50ee327f: am d251fed3: Merge "Add summary for 0 fingerprint settings preference" into mnc-dr-dev
...
* commit '50ee327fb9606fdc89df9e00558231692951aa90':
Add summary for 0 fingerprint settings preference
2015-09-19 01:13:26 +00:00
Jim Miller
50ee327fb9
am d251fed3: Merge "Add summary for 0 fingerprint settings preference" into mnc-dr-dev
...
* commit 'd251fed3ef24b02697a375bf32f382338f500f53':
Add summary for 0 fingerprint settings preference
2015-09-19 01:08:31 +00:00
Jim Miller
d251fed3ef
Merge "Add summary for 0 fingerprint settings preference" into mnc-dr-dev
2015-09-19 00:59:51 +00:00
Justin Harrison
fa9d8258d4
am 8a44f2c4: am a3add1d2: am c6a96d40: Merge "Add color transform setting" into mnc-dr-dev
...
* commit '8a44f2c413daf544d932dbbba8f221b655da6011':
Add color transform setting
2015-09-19 00:46:06 +00:00
Justin Harrison
8a44f2c413
am a3add1d2: am c6a96d40: Merge "Add color transform setting" into mnc-dr-dev
...
* commit 'a3add1d2086f82c8d176ca0a72a7cbd8b98c19ff':
Add color transform setting
2015-09-19 00:37:40 +00:00
Justin Harrison
a3add1d208
am c6a96d40: Merge "Add color transform setting" into mnc-dr-dev
...
* commit 'c6a96d4076ecddce57c864683a47e581ca2517f5':
Add color transform setting
2015-09-19 00:29:31 +00:00
Jason Monk
0217281d33
Add color transform setting
...
Bug: 24038268
Change-Id: I2bf45fef85038c29423a86c7bb018a8e750110a6
2015-09-18 20:11:01 -04:00
Jim Miller
d433359684
Add summary for 0 fingerprint settings preference
...
This allows the fingerprint summary to be shown when there
are no fingerprints.
Fixes bug 24172006
Change-Id: I9dd266013ac74da74f1dd397cbe0e50acf5d1262
2015-09-18 15:37:48 -07:00
Baligh Uddin
8223038551
Import translations. DO NOT MERGE
...
Change-Id: I5ed9e4e1920eab53feb140714646b796d69d193d
Auto-generated-cl: translation import
2015-09-18 10:37:08 -07:00
Paul Lawrence
e68e93fc36
am 67d0fe4c: am fe9b6d3e: am aead1b25: am 43be4b9b: Merge "Stop long passwords crashing CryptKeeper" into mnc-dr-dev
...
* commit '67d0fe4c0ec169514c05ec485834fca353ebc9d2':
Stop long passwords crashing CryptKeeper
2015-09-18 15:57:21 +00:00
Paul Lawrence
67d0fe4c0e
am fe9b6d3e: am aead1b25: am 43be4b9b: Merge "Stop long passwords crashing CryptKeeper" into mnc-dr-dev
...
* commit 'fe9b6d3e2e08e689a6b770df497e717a1a5e767e':
Stop long passwords crashing CryptKeeper
2015-09-18 15:49:04 +00:00
Paul Lawrence
fe9b6d3e2e
am aead1b25: am 43be4b9b: Merge "Stop long passwords crashing CryptKeeper" into mnc-dr-dev
...
* commit 'aead1b2581c2594c18e16b56325b615c5944f6d7':
Stop long passwords crashing CryptKeeper
2015-09-18 15:38:15 +00:00
Paul Lawrence
aead1b2581
am 43be4b9b: Merge "Stop long passwords crashing CryptKeeper" into mnc-dr-dev
...
* commit '43be4b9b787ee4881dd27c41d1d554c8ef1d6a3d':
Stop long passwords crashing CryptKeeper
2015-09-18 15:32:29 +00:00
Paul Lawrence
43be4b9b78
Merge "Stop long passwords crashing CryptKeeper" into mnc-dr-dev
2015-09-18 15:26:01 +00:00
Maurice Lam
771fac591f
[WifiSettings] Add Wi-Fi dialog activity
...
Add a Wi-Fi dialog activity that can be started by setup wizard to
connect to a Wi-Fi access point.
Also refactored mEdit and mModify in WifiConfigController into an
int-enum mMode, with modes view, connect and modify. This is how the
new modes maps to the old flags:
MODE_VIEW -- mEdit = false, mModify = *
MODE_CONNECT -- mEdit = true, mModify = false
MODE_MODIFY -- mEdit = true, mModify = true
Bug: 23426311
Change-Id: I8e2221fd3c42577068e07686dab245dd5888e0ae
2015-09-17 16:03:49 -07:00
Paul Lawrence
44985b9ccd
Stop long passwords crashing CryptKeeper
...
Bug: 24017705
Change-Id: Ida157f96f350486d9ec0189c68fff314dc4a90f2
2015-09-16 15:29:57 -07:00
Baligh Uddin
6ea05b747d
Import translations. DO NOT MERGE
...
Change-Id: I260590df2eeda8d9228cbb4635bf804c5ce1276a
Auto-generated-cl: translation import
2015-09-14 03:20:45 -07:00
Baligh Uddin
eb1c872563
Import translations. DO NOT MERGE
...
Change-Id: I80c5843b1be74f3b58aa812986ff04680f588b2c
Auto-generated-cl: translation import
2015-09-14 02:48:18 -07:00
Baligh Uddin
c0191b5503
Merge "Import translations. DO NOT MERGE"
2015-09-11 16:19:23 +00:00
Baligh Uddin
196555c71b
Import translations. DO NOT MERGE
...
Change-Id: I60a7b3894ab284a6c336dff438e38767c473ac19
Auto-generated-cl: translation import
2015-09-10 14:56:41 -07:00
Baligh Uddin
153a69c597
Import translations. DO NOT MERGE
...
Change-Id: I8e301f2fd2ee2b4e2e91b5e7f3b910ebf708f7cd
Auto-generated-cl: translation import
2015-09-10 14:24:34 -07:00
Maurice Lam
6d07779c07
Merge "[ScreenLockSetup] Create separate title string"
2015-09-10 20:57:13 +00:00
Maurice Lam
7d8ebeea94
[ScreenLockSetup] Create separate title string
...
Create a separate "Choose screen lock" title for setup wizard's
version of ChooseLockGeneric, with a higher CHAR LIMIT because
setup wizard's layout has more space and can avoid using
abbreviations.
Bug: 23551150
Change-Id: I93aa8c537ac97e7a1af9414a5b3ddc218c929bff
2015-09-10 12:05:14 -07:00
Jorim Jaggi
cb9d7a96bb
resolved conflicts for 99bbec73 to master
...
Change-Id: I0d837f89eff37dc3469502fa41e294a9302c17bb
2015-09-09 18:48:27 -07:00
Jorim Jaggi
99bbec733d
am f37368db: am ef5f9e39: am 48422b52: Merge "Add double-tap power button to open camera 2/2" into mnc-dr-dev
...
* commit 'f37368db841ce534cc1712b54b1c88bcbe991756':
Add double-tap power button to open camera 2/2
2015-09-10 01:11:44 +00:00
Jorim Jaggi
f37368db84
am ef5f9e39: am 48422b52: Merge "Add double-tap power button to open camera 2/2" into mnc-dr-dev
...
* commit 'ef5f9e3952ac35df4ce4335be0020ae81b11f746':
Add double-tap power button to open camera 2/2
2015-09-10 01:02:39 +00:00
Jorim Jaggi
ef5f9e3952
am 48422b52: Merge "Add double-tap power button to open camera 2/2" into mnc-dr-dev
...
* commit '48422b52f3ed81dd447e6bc836d752f33ef8c7b3':
Add double-tap power button to open camera 2/2
2015-09-10 00:53:48 +00:00
Jorim Jaggi
48422b52f3
Merge "Add double-tap power button to open camera 2/2" into mnc-dr-dev
2015-09-10 00:25:59 +00:00
Jim Miller
a04ebb412c
am eddb0493: am 93b39ff9: am 01f44efa: am 179fa507: Merge "Handle fp enrollment errors more gracefully - When finger can\'t be analyzed for enrollment (FINGERPRINT_ERROR_UNABLE_TO_PROCESS), tell the user to try again or use a different finger. - When timeout is reache
...
* commit 'eddb04934b2b52ab0ff6545515df8f0801f538c0':
Handle fp enrollment errors more gracefully - When finger can't be analyzed for enrollment (FINGERPRINT_ERROR_UNABLE_TO_PROCESS), tell the user to try again or use a different finger. - When timeout is reached (FINGERPRINT_ERROR_TIMEOUT), stop enrollment and ask the user to try again.
2015-09-09 23:22:50 +00:00
Jim Miller
eddb04934b
am 93b39ff9: am 01f44efa: am 179fa507: Merge "Handle fp enrollment errors more gracefully - When finger can\'t be analyzed for enrollment (FINGERPRINT_ERROR_UNABLE_TO_PROCESS), tell the user to try again or use a different finger. - When timeout is reached (FINGERPRIN
...
* commit '93b39ff9bd40df755967a4dfe0593b30b0cfa8d2':
Handle fp enrollment errors more gracefully - When finger can't be analyzed for enrollment (FINGERPRINT_ERROR_UNABLE_TO_PROCESS), tell the user to try again or use a different finger. - When timeout is reached (FINGERPRINT_ERROR_TIMEOUT), stop enrollment and ask the user to try again.
2015-09-09 23:14:27 +00:00
Jim Miller
93b39ff9bd
am 01f44efa: am 179fa507: Merge "Handle fp enrollment errors more gracefully - When finger can\'t be analyzed for enrollment (FINGERPRINT_ERROR_UNABLE_TO_PROCESS), tell the user to try again or use a different finger. - When timeout is reached (FINGERPRINT_ERROR_TIMEO
...
* commit '01f44efab0673e8648470c8be1670730660a4778':
Handle fp enrollment errors more gracefully - When finger can't be analyzed for enrollment (FINGERPRINT_ERROR_UNABLE_TO_PROCESS), tell the user to try again or use a different finger. - When timeout is reached (FINGERPRINT_ERROR_TIMEOUT), stop enrollment and ask the user to try again.
2015-09-09 23:08:06 +00:00
Jim Miller
01f44efab0
am 179fa507: Merge "Handle fp enrollment errors more gracefully - When finger can\'t be analyzed for enrollment (FINGERPRINT_ERROR_UNABLE_TO_PROCESS), tell the user to try again or use a different finger. - When timeout is reached (FINGERPRINT_ERROR_TIMEOUT), stop enro
...
* commit '179fa5078b6e105e6e01e82c0af7c43745c452b0':
Handle fp enrollment errors more gracefully - When finger can't be analyzed for enrollment (FINGERPRINT_ERROR_UNABLE_TO_PROCESS), tell the user to try again or use a different finger. - When timeout is reached (FINGERPRINT_ERROR_TIMEOUT), stop enrollment and ask the user to try again.
2015-09-09 23:02:34 +00:00
Jorim Jaggi
cc1e9f7ce7
Add double-tap power button to open camera 2/2
...
Bug: 23787555
Change-Id: I04787cd863212b1ed9608a6c8bd02af13273b387
2015-09-09 22:40:00 +00:00
Jim Miller
457904634c
Handle fp enrollment errors more gracefully
...
- When finger can't be analyzed for enrollment
(FINGERPRINT_ERROR_UNABLE_TO_PROCESS), tell the user
to try again or use a different finger.
- When timeout is reached (FINGERPRINT_ERROR_TIMEOUT),
stop enrollment and ask the user to try again.
Fixes bug 23546104
Fixes bug 22708384
Change-Id: I879874b53dd0d928093fab1c92d0d4d68d73be28
2015-09-09 15:30:40 -07:00