Jim Miller
cc7a4f3cac
Merge "Don't reset fingerprint storage on devices without fingerprint hw."
2015-03-12 17:57:51 +00:00
Jim Miller
d52b577d49
Don't reset fingerprint storage on devices without fingerprint hw.
...
Fixes bug 19707354
Change-Id: I26144dc855bff83cdc9c9544c8ab7449274d7b5e
2015-03-12 10:43:31 -07:00
Geoff Mendal
39d1d67085
am 9f0b7264
: (-s ours) am feb731a2
: (-s ours) am dd07a862
: (-s ours) Import translations. DO NOT MERGE
...
* commit '9f0b7264e55ca2ba96cd09df0c307c169c58b56d':
Import translations. DO NOT MERGE
2015-03-12 17:25:27 +00:00
Geoff Mendal
f3a291b785
am 3335973a
: (-s ours) am f02db6b7
: (-s ours) Import translations. DO NOT MERGE
...
* commit '3335973a6710135a299a615c7a48555c51586e97':
Import translations. DO NOT MERGE
2015-03-12 17:25:26 +00:00
Jason Monk
d1605438b2
Merge "Follow-up on comments from splitting app info"
2015-03-12 14:32:01 +00:00
Jason Monk
2df843d84f
Merge "Support some changes to SettingsLib"
2015-03-12 14:23:52 +00:00
Jim Miller
fe08c38366
Merge "Implement additional fingerprint flows in Settings."
2015-03-12 01:23:16 +00:00
Jim Miller
9218687e4b
Implement additional fingerprint flows in Settings.
...
- new onboarding flow ("locate sensor")
- changed sensor location image
- changed in-app sensor icon
- remove fingerprint animation since it caused people to
want to tap on it.
- remove enrolled fingerprint templates when switching back to "none" or "slide"
- use real in-app icon for fingerprint
- much improved layout
- basic landscape layout working
- added 250ms delay to final enrollment step so it's not so jarring
- delete is now working
- rename wired, but not functional yet
Bug 19592835
Change-Id: Ie3e73a2fc8f834f1b90e2746c4cc841216aa6031
2015-03-11 18:15:55 -07:00
Maurice Lam
6cdfb05b31
Merge "[WifiSettings] Refactor Wi-Fi required info"
2015-03-11 23:22:19 +00:00
Maurice Lam
b484340e3d
[WifiSettings] Refactor Wi-Fi required info
...
Instead of using an invisible TextView in the layout itself, make the
required info a list header. This paves way for using the Setup
Wizard library by including all the required contents in the ListView
itself.
The required info is not shown since Lollipop, but can be tested with
adb shell am start -a "com.android.net.wifi.SETUP_WIFI_NETWORK" \
--es theme material_light \
--ez useImmersiveMode true \
--ez wifi_show_wifi_required_info true
Bug: 19698532
Change-Id: I5a7da726b2f49af7dd755b41c73e1a1b4349699c
2015-03-11 23:03:07 +00:00
Robin Lee
6b345581d2
Merge "Don't reset the keystore during password change"
2015-03-11 18:47:49 +00:00
Geoff Mendal
9f0b7264e5
am feb731a2
: (-s ours) am dd07a862
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'feb731a2c94d2238587d1a84d0a2d09f99329612':
Import translations. DO NOT MERGE
2015-03-11 17:25:25 +00:00
Geoff Mendal
3335973a67
am f02db6b7
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'f02db6b7e8fc774e64b812613cde7746d31aa10e':
Import translations. DO NOT MERGE
2015-03-11 17:25:11 +00:00
Geoff Mendal
3f450d7d2a
Import translations. DO NOT MERGE
...
Change-Id: Id8312d1b2f877c9236d1f517c5d92d5340f23d6e
Auto-generated-cl: translation import
2015-03-11 06:35:00 -07:00
Geoff Mendal
feb731a2c9
am dd07a862
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'dd07a86251dd79190bdc7bc811ae09c65eab89d2':
Import translations. DO NOT MERGE
2015-03-11 12:49:26 +00:00
Geoff Mendal
dd07a86251
Import translations. DO NOT MERGE
...
Change-Id: Ia9a0856a78edd8afe8c540b8c68e88b063b34b1d
Auto-generated-cl: translation import
2015-03-11 05:40:13 -07:00
Geoff Mendal
f02db6b7e8
Import translations. DO NOT MERGE
...
Change-Id: Ia835e0d6c351a29462c1d8adcd002f6f1bec598b
Auto-generated-cl: translation import
2015-03-11 05:28:40 -07:00
Pavel Zhamaitsiak
736d29b87c
Merge "Show alerts in case of some IMS registration errors." into lmp-mr1-wfc-dev
...
automerge: 4c7a410
* commit '4c7a4101ca87668341a998d17e929f66973c53f5':
Show alerts in case of some IMS registration errors.
2015-03-10 19:34:18 +00:00
Pavel Zhamaitsiak
4c7a4101ca
Merge "Show alerts in case of some IMS registration errors." into lmp-mr1-wfc-dev
2015-03-10 19:27:32 +00:00
Pavel Zhamaitsiak
a58527d552
Update Wi-Fi Calling mode when WFC is enabled/disabled
...
automerge: 248b8fd
* commit '248b8fd7bf46c80d06e36aa9328c6fd0e0d326ce':
Update Wi-Fi Calling mode when WFC is enabled/disabled
2015-03-10 16:57:44 +00:00
Geoff Mendal
a044b1daa2
am a3d28d9c
: (-s ours) am fd8f5459
: (-s ours) am 0d8c3df4
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'a3d28d9cccaa743eb050a4c427d11de204525c98':
Import translations. DO NOT MERGE
2015-03-10 15:47:28 +00:00
Pavel Zhamaitsiak
897b492d69
Show alerts in case of some IMS registration errors.
...
Change-Id: I7019c6f0bae66190d190babd83ebcdd780e5b8a0
2015-03-09 17:23:26 -07:00
Pavel Zhamaitsiak
248b8fd7bf
Update Wi-Fi Calling mode when WFC is enabled/disabled
...
Bug: 19644042
Change-Id: Ie9cfe8c7f416985e4f78d48159d83191a19ac599
2015-03-09 16:58:39 -07:00
Stuart Scott
be90341c80
Add option to reset network settings to factory
...
bug:16161518
Change-Id: I7c0cc58d5385352c6c9af2b27af23a744b5df977
2015-03-09 13:18:50 -07:00
Geoff Mendal
a3d28d9ccc
am fd8f5459
: (-s ours) am 0d8c3df4
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'fd8f545977ae4b5826632d8de293b3d322ae9960':
Import translations. DO NOT MERGE
2015-03-09 17:01:45 +00:00
Zoltan Szatmary-Ban
e5814ffb18
Make default user icons retrievable as cached bitmaps
...
Also invoke that method where formerly we did a UserIcon.convertBitmap(
UserIcon.getDefaultUserIcon(...)) call.
Bug: 19620707
Change-Id: I2ae3bbcee7d1c6515f0f6253925ef9837d8e3548
2015-03-09 16:58:48 +00:00
Geoff Mendal
792343b2f5
am 782d81bc
: (-s ours) am f91c51b1
: (-s ours) Import translations. DO NOT MERGE
...
* commit '782d81bc70e4bc5b1adbd86119fd70a935e617f6':
Import translations. DO NOT MERGE
2015-03-09 15:49:34 +00:00
Geoff Mendal
fd8f545977
am 0d8c3df4
: (-s ours) Import translations. DO NOT MERGE
...
* commit '0d8c3df4d95ec000889e3406ea50475e5d299874':
Import translations. DO NOT MERGE
2015-03-09 15:45:14 +00:00
Geoff Mendal
782d81bc70
am f91c51b1
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'f91c51b13b750f5ccc62ee1d760bd470b78837bb':
Import translations. DO NOT MERGE
2015-03-09 15:35:57 +00:00
Geoff Mendal
6b309ccb9c
Import translations. DO NOT MERGE
...
Change-Id: I3136e17493fb2f0d42e1518c5445b48aa203aa90
Auto-generated-cl: translation import
2015-03-09 06:35:26 -07:00
Geoff Mendal
0d8c3df4d9
Import translations. DO NOT MERGE
...
Change-Id: If88c28e5bfe82169fa423ef04bc7cc4ee2aa9962
Auto-generated-cl: translation import
2015-03-09 05:41:43 -07:00
Geoff Mendal
f91c51b13b
Import translations. DO NOT MERGE
...
Change-Id: I9e9281f6e2d2e50882fcec514ffc28993787a62a
Auto-generated-cl: translation import
2015-03-09 05:30:12 -07:00
Vinit Deshpande
128e25cec0
am "Do not provide 5GHz option for softap if there is no country code available"
...
merged from partner/m-wireless-wifi-dev
d51b952
Do not provide 5GHz option for softap if there is no country code available
2015-03-06 13:56:02 -08:00
Vinit Deshpande
2797429bd8
am "set softAP on a specified band, including both 2.4 and 5 GHz band"
...
merged from partner/m-wireless-wifi-dev
82ff3d5
set softAP on a specified band, including both 2.4 and 5 GHz band
2015-03-06 13:56:02 -08:00
Robin Lee
d8338fb85c
Don't reset the keystore during password change
...
There is absolutely no advantage to doing this.
Bug: 18817878
Change-Id: Ibb386696e67c316e65f53c28f9249ef2a2a48db6
2015-03-06 12:12:03 +00:00
Adrian Roos
5455bb540a
Ensure redaction settings are visible on narrow screens
...
Bug: 18599040
Change-Id: I852f8fa317927f6f786b33f965e9d1feab562518
2015-03-05 20:13:40 +01:00
Geoff Mendal
bc614dfcb5
Merge "Import translations. DO NOT MERGE"
2015-03-04 14:46:45 +00:00
Geoff Mendal
74e48c5629
Import translations. DO NOT MERGE
...
Change-Id: I2ea337dfa70639c56d7e9bce0513f7550cac54f4
Auto-generated-cl: translation import
2015-03-04 06:41:39 -08:00
Geoff Mendal
0785281676
am a6315bde
: (-s ours) am a07520f6
: (-s ours) am ba5c9ed1
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'a6315bde9d4d696a1b23aa1d5be1511ec9a21aed':
Import translations. DO NOT MERGE
2015-03-04 14:00:38 +00:00
Geoff Mendal
a6315bde9d
am a07520f6
: (-s ours) am ba5c9ed1
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'a07520f6888981f4e310aa3c3c49ff6ea04b51d0':
Import translations. DO NOT MERGE
2015-03-04 13:54:47 +00:00
Geoff Mendal
a07520f688
am ba5c9ed1
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'ba5c9ed1835cb3eef7dcf6e2968be1b0e5316dc5':
Import translations. DO NOT MERGE
2015-03-04 13:47:20 +00:00
Geoff Mendal
429052d583
am d1c5ae48
: (-s ours) am b4ee938f
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'd1c5ae486dc09d10dffaf138c98ad6daed182993':
Import translations. DO NOT MERGE
2015-03-04 13:44:17 +00:00
Geoff Mendal
ba5c9ed183
Import translations. DO NOT MERGE
...
Change-Id: I51a7c7c78b210268bc543e3ca81e123b02c0e525
Auto-generated-cl: translation import
2015-03-04 05:41:50 -08:00
Geoff Mendal
d1c5ae486d
am b4ee938f
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'b4ee938f74fdf6ffe3cad237342d7f5034a55053':
Import translations. DO NOT MERGE
2015-03-04 13:37:29 +00:00
Geoff Mendal
b4ee938f74
Import translations. DO NOT MERGE
...
Change-Id: I1e33ed430ca8680d04f1bccd0253b8e7620c28e3
Auto-generated-cl: translation import
2015-03-04 05:30:02 -08:00
Pavel Zhamaitsiak
9a4b136ffb
Wi-Fi calling settings cleanup
...
automerge: 7109932
* commit '71099329cc0443ce4517480c86f81ed6b4e33ff2':
Wi-Fi calling settings cleanup
2015-03-03 23:41:33 +00:00
Wale Ogunwale
b3e2fedb5f
Merge "Added Developer Options settings for multi-window mode."
2015-03-03 21:28:47 +00:00
Wale Ogunwale
4c9d667bc2
Added Developer Options settings for multi-window mode.
...
Enables/disables the development multi-windows UI under Recents UI.
Setting is hidden on -user builds.
Bug: 19494313
Change-Id: Id1ccec5d9552dfdc74cc8d0af26ba7e6c4456166
2015-03-03 13:11:55 -08:00
Julia Reynolds
e27fbc557f
Merge "Prompt for lock pin on VPN screen when credential restriction is enabled."
2015-03-03 18:42:13 +00:00
Julia Reynolds
a12fc84877
Prompt for lock pin on VPN screen when credential restriction is enabled.
...
If there is no lock pin set.
Bug: 19569109
Change-Id: I9ca17b61e72576f7b90b1598b2ace6e9d79b263a
2015-03-03 12:39:59 -05:00