Pavel Zhamaitsiak
6fcb62fbda
Fix missing text message when WiFi Calling is Off.
...
automerge: a4314a5
* commit 'a4314a5d8b5959bc81ce9fc28fb902ed9ecf6cef':
Fix missing text message when WiFi Calling is Off.
2015-04-15 23:44:43 +00:00
Pavel Zhamaitsiak
a4314a5d8b
Fix missing text message when WiFi Calling is Off.
...
Bug: 20124534
Change-Id: I5221c942e7dc43e9fd5c824bb53f69c3da4b229d
2015-04-15 16:12:55 -07:00
Jason Monk
dbcfa01835
Merge "Fix crash in settings from incorrect parcelization"
2015-04-15 21:23:41 +00:00
Jason Monk
5dec877fb0
Fix crash in settings from incorrect parcelization
...
Bug: 20159614
Change-Id: Id7bf48f2337c8764a37b5f6ff836fbae4019c747
2015-04-15 17:21:32 -04:00
Andres Morales
8cb850a4cc
Merge "fingerprint settings: pass auth token to FPEnroll"
2015-04-15 20:50:45 +00:00
Jorim Jaggi
8c72010cd7
Merge "Fix crash on tablets"
2015-04-15 17:56:23 +00:00
Casper Bonde
22ffff6a6d
Add support for Bluetooth Sim Access Profile (4/4)
...
Change-Id: I28ca9cdc68ac11b7f696a668ae966bf4a42fd040
2015-04-15 10:55:41 -07:00
Jorim Jaggi
9a34cadf7f
Fix crash on tablets
...
Bug: 20207600
Change-Id: I9e4a795f9ec9b6d075c1814c89b1c0df4f1c1340
2015-04-15 10:54:19 -07:00
Adrian Roos
02c507e221
Merge "Hide emergency app setting when not available"
2015-04-15 17:38:32 +00:00
P.Y. Laligand
903198f3b7
Merge "Fixed typo in package name."
2015-04-15 17:27:23 +00:00
Geoff Mendal
cacc3e12f5
Import translations. DO NOT MERGE
...
Change-Id: I89102328ee0dbaeed00736d0b30134519791f347
Auto-generated-cl: translation import
2015-04-15 08:05:48 -05:00
Lorenzo Colitti
f9feeb2f50
Merge "Dialog box for networks without an Internet connection"
2015-04-15 11:48:32 +00:00
Lorenzo Colitti
877b054bfe
Dialog box for networks without an Internet connection
...
Bug: 20081183
Change-Id: If4866a341382fa37745ae5aa2d10372f052d5dd6
2015-04-15 15:24:20 +09:00
Jeff Sharkey
408a027d4a
Merge "Avoid a few crashes around unmounting."
2015-04-15 06:20:35 +00:00
Jeff Sharkey
7bc9235aaa
Avoid a few crashes around unmounting.
...
Also refresh UI when metadata changes.
Bug: 19993667
Change-Id: Ib0ea9be68a3db5c71d15fae6809f31df43fd9af0
2015-04-14 23:17:04 -07:00
Jim Miller
9494797ef5
Add actual auth token to Settings Enroll flow.
...
Change-Id: Ie25b5b808b492ddffc64d53f1e801b0654a44189
2015-04-15 05:25:40 +00:00
Jeff Sharkey
4366b565e1
Storage accessors; persist nickname, flags.
...
Move to using new public accessors on DiskInfo and VolumeInfo.
Persist nickname changes, and remember when user has initialized a
public volume. Also skip the migration part of storage wizard until
it's implemented.
Bug: 19993667
Change-Id: I642fb43afb95380fddd48a1dad438e87b06454da
2015-04-14 21:53:28 -07:00
Andres Morales
55af42dce5
fingerprint settings: pass auth token to FPEnroll
...
Change-Id: I6e8d6d2eb5a2b5d2828af76047839ed79f804104
2015-04-14 19:04:01 -07:00
Sanket Padawe
7c132038fc
Fix alignment issue with mac address in Wifi Settings
...
Bug: 17364982
Change-Id: I5706cde24e105049979097244d22eb05af2315ea
2015-04-14 18:12:23 -07:00
Adrian Roos
bef722cfad
Hide emergency app setting when not available
...
Bug: 20117344
Change-Id: Ieb6d166c0fa7c7376bbf262fa831ff3f626fce57
2015-04-14 17:49:46 -07:00
Jeff Sharkey
2949a4ab4d
Follow storage refactoring in system.
...
Also add entry point for SystemUI unmounting, and require permissions
when launching into those flows.
Bug: 19993667
Change-Id: I703d2e5f118848a2e2e96ce1d7f970e5705a288a
2015-04-14 16:46:28 -07:00
Andres Morales
e29dae683e
Request enroll or verify lock before FP enroll
...
Also pipe through challenge token
Change-Id: I9d6afdbadf3832aeeb18a0b5a9620277e2070872
2015-04-14 16:20:42 -07:00
P.Y. Laligand
1f403d5217
Fixed typo in package name.
...
Change-Id: I08641b7e1d56b44a18ac747371f3a3883a81224c
2015-04-14 16:14:16 -07:00
Andres Morales
6609b0c22a
pipe auth token through confirm and set password
...
ConfirmDeviceCredentialsActivity and ChooseLockGeneric now understand
CLSH.EXTRA_KEY_HAS_CHALLENGE and CLSH.EXTRA_KEY_CHALLENGE in their
launching intents. If present, they return a hw_auth_token_t verifying
the challenge passed in as a field in keyed by
CLSH.EXTRA_KEY_CHALLENGE_TOKEN in their result intents.
Change-Id: I0b4e02b6a798a9e57d02522880a180dffadfcde1
2015-04-14 15:32:07 -07:00
Jason Monk
c1235be6f0
Merge "Allow help to be defined to intent uri"
2015-04-14 19:54:19 +00:00
Jason Monk
23acc2bb8a
Allow help to be defined to intent uri
...
Allow help uris to be either an intent uri or as uri (as they were
before). Also add a default help uri, and specific helps for several
screens.
Bug: 15475009
Change-Id: Iff982892973f01d32ff61ea88d4844e9a7153500
2015-04-14 15:43:20 -04:00
Jorim Jaggi
bc90ee8736
Merge "Fix crash in settings"
2015-04-14 18:36:11 +00:00
Andres Morales
02d548790b
Fix crash in settings
...
Bug: 20207600
Change-Id: I6fe3530c57d0c028ae3b0a0d526b348126c75932
2015-04-14 11:33:45 -07:00
Stuart Scott
2533651570
Merge "Avoid mulitple calls to getActivity."
2015-04-14 18:28:09 +00:00
Jorim Jaggi
aa2a53b3b7
Merge "Fix crash in settings when no fingerprint is available"
2015-04-14 18:15:35 +00:00
Jorim Jaggi
3b62e84289
Fix crash in settings when no fingerprint is available
...
Bug: 20207600
Change-Id: If2a6251b085f22fffabc43aee197550328e6bfef
2015-04-14 11:14:19 -07:00
Andres Morales
347c13bcb8
Merge "[LockSettings] pipe old password through when setting new one"
2015-04-14 16:12:50 +00:00
Jason Monk
cd0978bcc2
Merge "Move default app preferences to one screen"
2015-04-14 15:04:16 +00:00
Jason Monk
4fa99fe6b7
Merge "Remove all apps page"
2015-04-14 15:03:59 +00:00
Jason Monk
73a2496d31
Move default app preferences to one screen
...
- Move emergency and SMS app preferences to default apps
- Fix search on default apps
- Make all default app prefs use AppListPreference
- Some approximate UI work on AppListPreference
Bug: 20210110
Change-Id: Id04086163c7e87c92a03af421a27018fb380b45d
2015-04-14 10:24:46 -04:00
Jason Monk
6ef2723004
Remove all apps page
...
Instead move the functionality back into overflow menu as show/hide
system apps. Also move the reset app preferences from advanced to
the overflow menu.
Bug: 20210160
Change-Id: Ied573e1f7dfc438b06642ee2af8f11868130ba3b
2015-04-14 10:24:33 -04:00
Geoff Mendal
407e483fb6
Import translations. DO NOT MERGE
...
Change-Id: I3f7eb6b8c57c19c18c7855dc6196d2a37fde2ea1
Auto-generated-cl: translation import
2015-04-14 06:37:09 -07:00
John Spurlock
687e863dee
Merge "Settings: Add an xliff example to a string param."
2015-04-14 13:01:10 +00:00
John Spurlock
8fe2e99c31
Settings: Add an xliff example to a string param.
...
Bug: 20175132
Change-Id: I739274e2293b2b865d4f8d601f9c804b2bea79cd
2015-04-14 08:58:33 -04:00
Jeff Sharkey
b636a428c7
Merge "Checkpoint of new storage wizards."
2015-04-14 05:07:02 +00:00
Jeff Sharkey
94635995e4
Checkpoint of new storage wizards.
...
Use frameworks/opt/setupwizard/library/ for consistent behavior and
styling on phones and tablets. Implement every step of wizard flow
and connect them together, even though some steps are currently
non-functional. All strings to match UX spec, with some adjustment.
Wizards inherit from helper base class.
New interstitials before unmounting or formatting private storage
to confirm user knows consequences.
Bug: 19993667
Change-Id: I2c774e1718d513805ee8aecfc96d066d4730450c
2015-04-13 21:45:39 -07:00
Andres Morales
a0e1236fa9
[LockSettings] pipe old password through when setting new one
...
Change-Id: Ia98b93d1cdb8c2d0bff42de7ecb59f5b80fb780e
2015-04-13 18:38:46 -07:00
John Spurlock
f24037da65
Merge "Settings: Register zen priority settings entry point."
2015-04-14 01:01:44 +00:00
Sanket Padawe
dce1c724f1
Remove "Show apps" and add summary to saved networks from Wifi Settings.
...
Bug: 20148271
Change-Id: Ie042ac83a7253ff86f3eda77fb1e8a4c0e1a13d5
2015-04-13 17:57:38 -07:00
John Spurlock
c1df2aa963
Settings: Register zen priority settings entry point.
...
Bug: 20064962
Change-Id: I96e094f7d6859b2033c87013bedc270d0290937c
2015-04-13 20:57:06 -04:00
Adrian Roos
ca59f4ffb3
Merge "Disable trust agent settings when disabled by policy"
2015-04-14 00:32:35 +00:00
Adrian Roos
088de47aa8
Disable trust agent settings when disabled by policy
...
Bug: 19868604
Change-Id: Ie476be0338da399a6bc2d20953f6f005ae5eb423
2015-04-13 17:14:41 -07:00
Barnaby James
dfb369d43f
Merge "Add activities to support voice settings."
2015-04-14 00:14:26 +00:00
John Spurlock
2132cedb94
Merge "Settings: External automatic rule settings."
2015-04-13 23:14:53 +00:00
Fyodor Kupolov
ad0a79c1ba
Merge "Updated user_add_user_message_long"
2015-04-13 23:13:57 +00:00