Commit Graph

19764 Commits

Author SHA1 Message Date
Robin Lee
1e13caf969 Merge "vpn2: show third-party VPN services" 2015-04-22 16:41:21 +00:00
Geoff Mendal
6d61061518 Import translations. DO NOT MERGE
Change-Id: I921201f47bbaa1b29c6f4c42131123c439207e40
Auto-generated-cl: translation import
2015-04-22 08:11:16 -05: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
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
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
956e5bc0a4 Merge "[WifiSetup] Update Wi-Fi icon colors" 2015-04-21 17:23:39 +00: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
Maurice Lam
f6991a26ea [WifiSetup] Update Wi-Fi icon colors
For the new blue-themed setup wizard, update the colors of the Wi-Fi
icons. This reuses the abandoned wifi_signal_colored XML, update it
to reference the new material wifi_signal_teal icon. Only the shape
of wifi_signal_teal is used. Tint is applied to the icon so that the
actual color is defined by wifi_signal_color attr in the theme.

Bug: 19729981
Change-Id: I59a8c137086f2e80eb7e10880626098243b14d13
2015-04-20 17:33:27 -07:00
Maurice Lam
c3385dc11b Merge "[Setup] Update illustration assets" 2015-04-20 21:50:55 +00:00
Maurice Lam
caaa16090d [Setup] Update illustration assets
Update to the new blue-themed assets.

Note that the size of tileable assets, like illustration_tile, and the
width of tablet assets may be different, but the overall visual result
of the layout should be the same.

Bug: 19729981
Change-Id: I4ec44a8e1488b734ec2eddee046a305104e87abb
2015-04-20 19:17:09 +00: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
Barnaby James
540510d88f Merge "Add more settings voice synonyms." 2015-04-20 14:18:15 +00:00
Barnaby James
cf2bcd6b14 Add more settings voice synonyms.
Add some more synonyms until server side matching is improved (b/20378313).

Change-Id: I9ada119614ddfeedbb43cbda9975737311b5b3dc
2015-04-20 07:04:59 -07:00
Geoff Mendal
f62f1db70f Import translations. DO NOT MERGE
Change-Id: Ibc6408581ba999e5c019ff7cd4697bdefba8849f
Auto-generated-cl: translation import
2015-04-20 08:12:08 -05: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
Geoff Mendal
463ae4b2bf Import translations. DO NOT MERGE
Change-Id: I26d5deda28b97d156af1458e0a078514dd4039b7
Auto-generated-cl: translation import
2015-04-17 22:04:27 -07:00
Maurice Lam
8834320c6e Merge "Use SetupWizardLib helpers" 2015-04-18 00:48:22 +00: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
010f5939d1 Merge "Fix alignment issue with mac address in Wifi Settings" 2015-04-16 20:24:47 +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
Elliott Hughes
482bc3827d am ce9a533c: am 48e7e2ac: am 2e30bff1: Merge "Add Europe/Madrid."
* commit 'ce9a533c7103fb3469f833066fc05579d16b48f9':
  Add Europe/Madrid.
2015-04-16 15:45:53 +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
Elliott Hughes
ce9a533c71 am 48e7e2ac: am 2e30bff1: Merge "Add Europe/Madrid."
* commit '48e7e2ac182b94b7c2b682874d0dea969b59339a':
  Add Europe/Madrid.
2015-04-16 15:34:58 +00:00
Elliott Hughes
48e7e2ac18 am 2e30bff1: Merge "Add Europe/Madrid."
* commit '2e30bff1351fafd2bbad2c46c55515e74f5d027c':
  Add Europe/Madrid.
2015-04-16 15:24:40 +00: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
Elliott Hughes
2e30bff135 Merge "Add Europe/Madrid." 2015-04-16 15:03:03 +00:00