Commit Graph

6367 Commits

Author SHA1 Message Date
Maurice Lam
6a627652cb [WifiSetup] Mechanism for suspending auto finish
We have been using forget() to prevent auto-reconnection when the
user hits back to Wifi setup. This has the side effect of forgetting
networks, which is undesirable especially for password protected APs.

The new mechanism keeps a flag on whether the user has selected a
connection. Only auto-advance if the user has picked a network and
there is a valid WiFi connection.

The new EXTRA_REQUIRE_USER_SELECTION can specify whether a user
selection is required initially. That is, whether to auto finish if
the system connected to a network without user input. The default is
false so WiFi can be skipped if the user started setup wizard with
a valid WiFi connection (e.g. after System Update). Note that a user
selection is always required when the user goes back from the next
screen.

Since the new AP dialog does not have a connect button, the SKIP
button in the navigation bar also changes to NEXT when there is a
valid WiFi connection, so the user can hit NEXT if they decided not
to change the network.

Bug: 15333554
Bug: 15999487
Change-Id: I98e935b8e09e470a0c49c44bc299bb2eced98634
2014-07-17 20:47:04 -07:00
Zoltan Szatmary-Ban
dc2620425d am ef8a48c8: am cda76822: Merge "Update Location Settings for Enterprise" into lmp-dev
* commit 'ef8a48c85b8c9ff31e731c82f83bf183e4a8994b':
  Update Location Settings for Enterprise
2014-07-17 21:29:47 +00:00
Chris Craik
7c6c12f885 am 4ce86a69: am dd82be9c: Merge "Access high contrast setting directly" into lmp-dev
* commit '4ce86a69a8b2c5d89b7e67c9aa08eda03961efb7':
  Access high contrast setting directly
2014-07-17 21:29:38 +00:00
Alexandra Gherghina
692b03c49e am 46ad8100: am c42d4059: Remove account for a managed user
* commit '46ad8100475c8bb2c5aa3ee7787674ef0669c634':
  Remove account for a managed user
2014-07-17 21:29:33 +00:00
Alexandra Gherghina
85d6818cf2 am 84d71954: am 7c81c1d1: Handle managing accounts for a managed profile
* commit '84d719542d430bd3e0074925629ae3d51fd561f9':
  Handle managing accounts for a managed profile
2014-07-17 21:29:23 +00:00
Jeff Davidson
878ca0edb9 Merge "Link WifiAssistant card with actual settings." into lmp-dev 2014-07-17 21:04:20 +00:00
Michael Wright
b8a90e5042 Merge "Add OP_PROJECT_MEDIA to AppOps" into lmp-dev 2014-07-17 21:04:20 +00:00
Alexandra Gherghina
d8070b862b am a4b48a95: am b8fff27c: Merge "Handle choosing and adding accounts for a managed profile" into lmp-dev
* commit 'a4b48a956f3118c85f93123b1b85ca4abb7069dd':
  Handle choosing and adding accounts for a managed profile
2014-07-17 20:59:32 +00:00
Dianne Hackborn
8280f115ed am d0a94769: am be875db5: Merge "Battery chart fixes." into lmp-dev
* commit 'd0a947692de3e618fa4ed6a5f7f72c6714e088da':
  Battery chart fixes.
2014-07-17 20:59:13 +00:00
Amith Yamasani
06c8616291 am 26523d28: am f1d56ebb: Merge "Follow split of DISALLOW_TELEPHONY" into lmp-dev
* commit '26523d28ad6bd14e30196a990a849c6ba5395177':
  Follow split of DISALLOW_TELEPHONY
2014-07-17 20:59:08 +00:00
Amith Yamasani
5c2ab1ea14 am 0e1aaa0c: am d888b543: Revert "Update Location Settings for Enterprise" due to build breakage.
* commit '0e1aaa0cc8a95d014314220c2453c6606f13428b':
  Revert "Update Location Settings for Enterprise" due to build breakage.
2014-07-17 20:58:49 +00:00
Zoltan Szatmary-Ban
4d221ca92e am fc9bf4b5: am ca153c55: Update Location Settings for Enterprise
* commit 'fc9bf4b50b343eb112947baa3ae29fa9754bb369':
  Update Location Settings for Enterprise
2014-07-17 20:57:06 +00:00
Jeff Davidson
873fa4f2ba Link WifiAssistant card with actual settings.
Only show the card if we haven't already enabled an assistant, and if
there's one available on the device to enable. (For now, we enable the
first one; in the future, we can offer a selection between
assistants).

When the user opts in, we either show the standard system activity or
the custom opt-in activity if the assistant has defined one. In either
case, we only dismiss the card if the child activity indicates that
opt-in was successful.

Bug: 16376277
Change-Id: Ic92c7676c563ab8c8fb695117a053004f15f7d25
2014-07-17 13:48:50 -07:00
Alexandra Gherghina
c42d4059b5 Remove account for a managed user
Bug: 16056552
Change-Id: Iad24856cab908ed40c32af799ca2c41fe85b6b45
2014-07-17 19:57:43 +00:00
Przemyslaw Szczepaniak
d7bdf17aba Merge "Make TTS setting transition animation consistent." into lmp-dev 2014-07-17 19:55:10 +00:00
Alexandra Gherghina
ccdc369e47 Merge "Add account for managed user" into lmp-dev 2014-07-17 19:51:18 +00:00
Alexandra Gherghina
9ce0da9cf1 Add account for managed user
Bug: 16056552
Change-Id: I225a1b447d9b4024703b82be8a1fa66359d9e9a1
2014-07-17 21:18:34 +01:00
Zoltan Szatmary-Ban
cda76822c4 Merge "Update Location Settings for Enterprise" into lmp-dev 2014-07-17 19:45:26 +00:00
Zoltan Szatmary-Ban
925560e9a2 Update Location Settings for Enterprise
Find packages of the corporate user and show them
with badged icon on the "Recent location requests" list.

Bug: 15467321
Change-Id: Ic52ed3d01a0816288d4818190e82befa5235f28b
2014-07-17 21:11:48 +01:00
Alexandra Gherghina
7c81c1d1af Handle managing accounts for a managed profile
Bug: 15466880
Change-Id: Icf0e06c954269426b500f0e5fbcdf3346c59eb9d
2014-07-17 19:42:46 +00:00
Fabrice Di Meglio
592a17aa3c Merge "Fix bug #16451628 Settings app crashes for intent: android.settings.ACTION_APP_NOTIFICATION_SETTINGS" into lmp-dev 2014-07-17 19:20:15 +00:00
Amith Yamasani
d888b543b2 Revert "Update Location Settings for Enterprise" due to
build breakage.

This reverts commit ca153c55dd.

Change-Id: Id6d6c98e8504f50b1764bcb87052eb567b6284a1
2014-07-17 18:26:38 +00:00
Fabrice Di Meglio
6f40485308 Merge "Fix Utils.prepareCustomPreferencesList()" into lmp-dev 2014-07-17 17:59:02 +00:00
Amith Yamasani
d0a057ccc8 Merge "Improvements to user settings" into lmp-dev 2014-07-17 17:59:02 +00:00
Amith Yamasani
c16b73e92b Improvements to user settings
Exiting guest mode from within guest user.
Updated assets and cleaned up/optimized some asset clipping code.

Bug: 15761851
Bug: 16355550
Change-Id: I431e92bac3cbedd46bd1e33cffc4d9f0c576ca69
2014-07-17 20:22:08 -07:00
Dianne Hackborn
be875db541 Merge "Battery chart fixes." into lmp-dev 2014-07-17 17:59:02 +00:00
Dianne Hackborn
c19eb361a4 Battery chart fixes.
When there is no data to show, don't make a crazy collapsed chart.

Also avoid re-creating the chart when scrolling.

And fix various other things.

Change-Id: Ia1895bc7c46e6d830e66f66e66f17726e1e23e3f
2014-07-17 12:09:54 -07:00
Zoltan Szatmary-Ban
ca153c55dd Update Location Settings for Enterprise
Find packages of the corporate user and show them
with badged icon on the "Recent location requests" list.

Bug: 15467321
Change-Id: Ib0fdb9f0c811307875296c37bab6d1fbab919022
2014-07-17 18:47:17 +01:00
Fabrice Di Meglio
2c377382e7 am 4f9f25ac: am 9b435f29: Merge "Fix bug #15702424 add-wifi setting screen has no title" into lmp-dev
* commit '4f9f25ac6ce72fce54e3ae9b786dcadc28805ce4':
  Fix bug #15702424 add-wifi setting screen has no title
2014-07-17 17:03:25 +00:00
Chris Craik
c0cac5fb50 am 7babd055: Merge "Accessibility text contrast control" into lmp-dev
* commit '7babd05509ea33f507f3525fbe065093d5877779':
  Accessibility text contrast control
2014-07-17 17:03:23 +00:00
Lifu Tang
cc1c788a8a am 569abb0c: Merge "Avoid removing switch even listener multiple times" into lmp-dev
* commit '569abb0c25708d4e7fc2cb4b3fe08839e253e211':
  Avoid removing switch even listener multiple times
2014-07-17 17:01:00 +00:00
PauloftheWest
32e77410c7 am b64a1f2f: Merge "Added Wifi Assistant Card" into lmp-dev
* commit 'b64a1f2fde227153510bd9147c05fb31bddd5a14':
  Added Wifi Assistant Card
2014-07-17 17:00:59 +00:00
Paul Lawrence
9d17fc34a5 am 41eb8522: Merge "Make crypt dialogs material" into lmp-dev
* commit '41eb85226ceaba16a635eb6b9818231008466f24':
  Make crypt dialogs material
2014-07-17 17:00:58 +00:00
Przemyslaw Szczepaniak
91b620082c Make TTS setting transition animation consistent.
Bug: 16345246
Change-Id: I729b2f35735ab03424acca07c4a9eb27541a356b
2014-07-17 15:56:50 +01:00
Fabrice Di Meglio
e817a66e83 Fix bug #15702424 add-wifi setting screen has no title
- pass the missing EXTRA_SHOW_FRAGMENT_TITLE_RESID
- define a new string for the Activity title
- code cleaning: remove a non needed call to getIntent()

Change-Id: I430d59c0225c6e7f23e78edf5644d07ef33a9d98
2014-07-16 19:51:06 -07:00
Amith Yamasani
920c57d499 Follow split of DISALLOW_TELEPHONY
Save both DISALLOW_OUTGOING_CALLS and DISALLOW_SMS together.

Change-Id: I06dd23b3fb4a21f3a22661da17491fc5b0bce4ed
2014-07-17 11:03:41 -07:00
Chris Craik
dd82be9c70 Merge "Access high contrast setting directly" into lmp-dev 2014-07-17 02:34:24 +00:00
Chris Craik
22c7f58b65 Access high contrast setting directly
Change-Id: I6dd6359a9a0ed26955bbe7a9f24e460f85a17383
2014-07-17 11:15:49 -07:00
Alexandra Gherghina
b8fff27ce3 Merge "Handle choosing and adding accounts for a managed profile" into lmp-dev 2014-07-17 00:15:07 +00:00
Alexandra Gherghina
7d748c0267 Handle choosing and adding accounts for a managed profile
The user id can now be passed through the app as a fragment argument.

Bug: 15466880
Change-Id: I0e2be20551b4ec8c9226640ac74ea74115156ccd
2014-07-17 19:05:57 +00:00
Fabrice Di Meglio
9b435f29d7 Merge "Fix bug #15702424 add-wifi setting screen has no title" into lmp-dev 2014-07-16 23:30:53 +00:00
Chris Craik
7babd05509 Merge "Accessibility text contrast control" into lmp-dev 2014-07-16 22:04:55 +00:00
Chris Craik
fc72424cd7 Accessibility text contrast control
b/14624452

Change-Id: I0f6708680eb37cf8e7dc63cae56b639eaf7c8dbd
2014-07-16 18:04:26 -07:00
Maurice Lam
e6080819b0 am ca1ad092: Merge "[WifiSetup] Make illustration header not clickable" into lmp-dev
* commit 'ca1ad0928064a92b92d72fd1900bde644c398f27':
  [WifiSetup] Make illustration header not clickable
2014-07-16 17:14:41 +00:00
PauloftheWest
b64a1f2fde Merge "Added Wifi Assistant Card" into lmp-dev 2014-07-16 16:25:13 +00:00
PauloftheWest
060e01a93e Added Wifi Assistant Card
+ Show Wi-Fi Assistant card above network list that scroll under the action bar with the rest of the list
+ Display a promo image and text
+ Clicking "Setup" should link to the selected Wi-Fi assistant app (must be open to 3rd parties)
+ Touching "No, Thanks" should snooze this card for 30 days / 2nd time 90 / 3rd time 180 days / then forever

Bug: 15703202

Change-Id: If74101bea630246c6bda2de3ed79fee72eca4c0c
2014-07-16 15:46:09 -07:00
Narayan Kamath
023406a374 am 2abbacb7: Merge "Get rid of duplicated code in accessibility settings."
* commit '2abbacb7d46657e5863eb2ef0035521ffc41a0a8':
  Get rid of duplicated code in accessibility settings.
2014-07-16 13:08:24 +00:00
Narayan Kamath
26edbccb58 Get rid of duplicated code in accessibility settings.
Has the side effect of picking up changes to LocalePicker
that added support for 3 letter language codes.

bug: 10090157

Change-Id: I20b357c8a3e76c7cecdf623d9ed39c3751d07645
2014-07-16 12:54:45 +00:00
Alexandra Gherghina
6f877156e0 Merge "Only show AccountSyncSettings when we have an account" into lmp-dev 2014-07-16 00:46:50 +00:00
Alexandra Gherghina
defdfc54bb Only show AccountSyncSettings when we have an account
Also removes useless list of accounts

Bug: 16295803
Change-Id: Ida3c1846327874af9f97695a485b12ec689fd343
2014-07-16 13:27:26 +01:00