Commit Graph

8275 Commits

Author SHA1 Message Date
Robin Lee
1e13caf969 Merge "vpn2: show third-party VPN services" 2015-04-22 16:41:21 +00:00
Jason Monk
3bcd76ce63 Change owner info to be a dialog rather than screen
Bug: 15937670
Change-Id: I8d8609ff165c4a76e318a80a62fb1dc9effbc82a
2015-04-22 11:14:14 -04:00
Zoltan Szatmary-Ban
008c9238d9 Merge "Show dialog when user tries to edit a locked down WiFi config" 2015-04-22 10:10:36 +00:00
Yorke Lee
dc868a18f8 Add default phone app to system settings
Bug: 20303635

Change-Id: Ibf052fa92347bff49a638c4042d899c9d6587410
2015-04-21 17:26:16 -07:00
Lucky Zhang
86b44796c5 Merge "[SetupWizard] Refactor WifiSetupActivity" 2015-04-21 22:42:56 +00:00
Lucky Zhang
a62d2c800c [SetupWizard] Refactor WifiSetupActivity
Refactor WifiSetupActivity to respect the conventional logic of Setup
Wizard's SubactivityWrapper. WifiSetupActivity now returns the result
code back to WifiSettingsWrapper and lets the Wrapper invoke
WizardManager, instead of invoking WizardManager by itself and letting
its Wrapper finish early.

The related change in WifiSettingsWrapper on Setup Wizard side is
ag/676788.

Bug: 20309008
Change-Id: Ia3bc2ff390404ff87c427782b5e7b345050bea03
2015-04-21 15:09:40 -07:00
Jeff Sharkey
267582826b Merge "Use disk directly from volume in storage wizard." 2015-04-21 19:55:11 +00:00
Andres Morales
aef794a289 Fix crash when rotating NFC dialog
Bug: 18710540
Change-Id: I0f50a8aed555439e8beeff70276d646fc11afe0a
2015-04-21 12:43:03 -07:00
Robin Lee
2bd92d5d06 vpn2: show third-party VPN services
VPN apps are shown alongside configured VPNs now. The requirement that
a password is set is now only enforced when setting up a configured
VPN as this is not necessary for apps.

Some UI redesign.

Bug: 19573824
Bug: 17474682
Bug: 19575658
Change-Id: I02bd977136929647d65b9784fb4cc5df24b45428
2015-04-21 19:42:53 +01:00
Jason Monk
f1a6275488 Merge "Fix filtering for manage apps" 2015-04-21 18:07:50 +00:00
Jason Monk
38e7b26664 Fix filtering for manage apps
Bug: 20453766
Change-Id: Ia4a0f0d9a652332944ef846770d5bc4cc50395d9
2015-04-21 13:55:10 -04:00
Jim Miller
c225005b02 Merge "Remove enroll haptic feedback since it's now part of the framework." 2015-04-21 17:46:11 +00:00
Chris Wren
358e355942 Merge "Intrument the act of banning a package's notifications." 2015-04-21 17:24:39 +00:00
Maurice Lam
83301b5256 [Setup] Use SetupWizardLayout
Use SetupWizardLayout for the screens that show in Settings to get
better visual consistency and new features like showing a progress
bar in list view.

Bug: 19594252
Change-Id: I53ab17a4c2d922a362e3762f1cdccb512f7d8f6e
2015-04-21 10:19:35 -07:00
Chris Wren
8b96cb88b8 Intrument the act of banning a package's notifications.
Bug: 20451514
Change-Id: I0c065a7baaf84442e415d9a6c7dce79457fb311e
2015-04-21 12:34:57 -04:00
Barnaby James
6e042caff2 Add toast notification to VoiceSettingsActivity.
Change-Id: Ic007b2eda8d082cf27e4aa4edf19b5387edb4b74
2015-04-21 07:20:39 -07:00
Jim Miller
97180e34a9 Remove enroll haptic feedback since it's now part of the framework.
Change-Id: Ic108d2fcbcac5baa219f49e4441522bfaa85fbff
2015-04-20 19:14:42 -07:00
Stuart Scott
0ce64e26c0 Merge "Correct the way settings deals with subscriptions." 2015-04-20 17:56:49 +00:00
Maurice Lam
e5112fe766 Merge "[WifiSetup] Remove required info" 2015-04-20 16:55:39 +00:00
Zoltan Szatmary-Ban
89403529ad Show dialog when user tries to edit a locked down WiFi config
Also, 'FORGET' button is not shown on WifiDialogs of locked down configs.
Context menu only shows 'Connect' for them.

Bug: 20117316
Change-Id: I3fa986c10b6ff47d1a897794213c225c8c6f579b
2015-04-20 16:04:15 +01:00
Erik Kline
377c7c9afa Use CONNECTIVITY_ACTION instead _IMMEDIATE
With the demise of the connectivity change delay
CONNECTIVITY_ACTION and CONNECTIVITY_ACTION_IMMEDIATE are
issued back to back.

CONNECTIVITY_ACTION_IMMEDIATE is being reaped.

Bug: 20013379
Change-Id: I71d1752cf3b2ebc377127c5fb7bf0864da9a860a
2015-04-20 14:42:03 +09:00
Erik Kline
a71f1dc2ca Use CONNECTIVITY_ACTION instead _IMMEDIATE
With the demise of the connectivity change delay
CONNECTIVITY_ACTION and CONNECTIVITY_ACTION_IMMEDIATE are
issued back to back.

CONNECTIVITY_ACTION_IMMEDIATE is being reaped.

Bug: 20013379
Change-Id: I71d1752cf3b2ebc377127c5fb7bf0864da9a860a
2015-04-20 13:33:31 +09:00
Jeff Sharkey
f7db2b2f22 Use disk directly from volume in storage wizard.
Otherwise we're upset moving apps back to internal storage, which
is a private volume without a disk.

Bug: 19993667
Change-Id: I59e78bf13e14a68b0f4f1c6cbee35f6f7fd8d6ca
2015-04-19 14:59:04 -07:00
Jeff Sharkey
ea273b5c6e Merge "Use new VolumeInfo helper methods." 2015-04-18 23:25:33 +00:00
Jeff Sharkey
90daa80c5b Use new VolumeInfo helper methods.
Makes it clearer if we're checking for readable/writable state,
and puts emulated/private conversion logic in single place.

Bug: 19993667
Change-Id: I953f5c184ca62afc631d855e64cd8a4972320148
2015-04-18 16:22:12 -07:00
Maurice Lam
8834320c6e Merge "Use SetupWizardLib helpers" 2015-04-18 00:48:22 +00:00
xinhe
e11aa6f445 Change SoftAP Setup UI
Bug:20140630
Change-Id: I7f5696a5b78c70a6bc8ac38c5b99dd408e06a668
2015-04-17 16:13:26 -07:00
Andres Morales
40e0f243c9 Merge "Unbreak CC screen" 2015-04-17 19:42:52 +00:00
Maurice Lam
8bcac046b9 Merge "[LockScreenSetup] Start SUW-style screens in setup flow" 2015-04-17 19:17:22 +00:00
Tony Mantler
e0a14922ea Merge "Move PermissionsInfo to SettingsLib" 2015-04-17 16:13:43 +00:00
Maurice Lam
bddc566485 Use SetupWizardLib helpers
Use SystemBarHelper, WizardManagerHelper and themes from Setup Wizard
Library.

Bug: 19594252
Change-Id: I60b6ab4f086a170ac270fb08325fc42010293523
2015-04-17 04:46:09 +00:00
Maurice Lam
e0a4c2bfe7 [WifiSetup] Remove required info
Required info is not used anymore and can be removed.

Bug: 10929897
Change-Id: I9f5648426058a5fb1c5e52f1983fee1a5448edb0
2015-04-16 21:43:49 -07:00
Maurice Lam
3859643c5b [LockScreenSetup] Start SUW-style screens in setup flow
Implement the new overloaded methods in the setup-specific screens
so that the SUW-styled screens will be started instead of the regular
ones as seen in Settings.

Bug: 20304053
Change-Id: I68e778e6421cfe08e20c9b4af9ed98e0f5ebcee1
2015-04-16 18:21:31 -07:00
Andres Morales
59f5976e15 Unbreak CC screen
Re-add logic in authenticationSucceeded

Change-Id: Iac1925f5e2f2f67dd5d7c7f5d454f32691d51b61
2015-04-16 16:45:26 -07:00
Tony Mantler
2d566e7f05 Move PermissionsInfo to SettingsLib
Change-Id: Ibe587365b841d7e68d7bb7b7999656f73d9d9bc7
2015-04-16 15:42:46 -07:00
Andres Morales
a928ff4a67 Merge "Fix issues in FP Settings" 2015-04-16 21:38:52 +00:00
Sanket Padawe
c5daa39fbe Merge "Remove "Show apps" and add summary to saved networks from Wifi Settings." 2015-04-16 20:21:39 +00:00
Jason Monk
16bf99da6a Merge "Filter app list by storage volume" 2015-04-16 18:16:58 +00:00
Maurice Lam
7ba56cfd2d Merge "[WifiSetup] Make dialogs immersive" 2015-04-16 16:33:07 +00:00
Jason Monk
02a310d8c9 Filter app list by storage volume
(when coming from storage settings)

Bug: 19989309
Change-Id: I932b67d25b5c9305067969ba13acb1a9f78e6cdb
2015-04-16 11:45:34 -04:00
Barnaby James
be68a62e0f Merge "UI Tweaks to Zen Mode Voice Activity." 2015-04-16 15:23:50 +00:00
John Spurlock
8be177bffd Settings: Use new media icons for slider pref.
Bug: 20096341
Change-Id: I0117cce573cf4234eb6dbd9b16f82093af6df833
2015-04-16 11:03:38 -04:00
Barnaby James
f79e2d11f5 UI Tweaks to Zen Mode Voice Activity.
Small cleanup of the UI / strings.
- Cleanup of string constant names.
- Add a specific string for ZenModeVoiceActivity label.
- Change look of list position indicators.
- Add optional header to VoiceSettingsActivity.
- Fix NPE in some cases when disabling Zen mode.

Change-Id: Ic09ee2b1b5a50891b5447c2db0e3de3c475696bf
2015-04-16 07:20:13 -07:00
John Spurlock
b8e02b8bd0 Settings: Fabulous "Add rule" button.
Bug: 20064962
Change-Id: If7ff9d6cdfc61e5dd9e0d3bc4e2228c5fdaf9fa9
2015-04-16 05:50:46 -04:00
Jeff Sharkey
4e53ac6dc8 Merge "Move packages between candidate volumes." 2015-04-16 05:50:14 +00:00
Jeff Sharkey
1f4efd7360 Move packages between candidate volumes.
We now allow moving packages between all possible candidate volumes,
as determined by the framework.  Moving now jumps through wizard to
help user understand what's going on.

Bug: 19993667
Change-Id: I5416ed2865f400b1d718c68a3f0e033080fefa0e
2015-04-15 22:14:09 -07:00
Andres Morales
887c90d8af Fix issues in FP Settings
- A crash in FP settings due to a null activity
- FP settings launching confirm credentials twice on rotation

Change-Id: Ie8c743a14e2a2f1adbdcf7693687fa66663c105d
2015-04-15 17:55:42 -07:00
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