Commit Graph

3901 Commits

Author SHA1 Message Date
Russell Brenner
f3bc6c939f am 18be472e: am 7f9b5681: am 553074f0: Merge "Return RESULT_OK when wifi connection established" into jb-mr1-dev
* commit '18be472ef46d2320a98173a6d68d9d62b60b6ccc':
  Return RESULT_OK when wifi connection established
2012-10-10 10:36:58 -07:00
Amith Yamasani
d36e524206 am 86ac45c1: am fee5c228: am 7f2824b9: Merge "Go back to top of list when Settings is relaunched" into jb-mr1-dev
* commit '86ac45c13aebcd5b368d7571c6f1fc433d1a71c8':
  Go back to top of list when Settings is relaunched
2012-10-10 10:36:57 -07:00
Russell Brenner
553074f0fc Merge "Return RESULT_OK when wifi connection established" into jb-mr1-dev 2012-10-10 10:31:59 -07:00
Amith Yamasani
7f2824b924 Merge "Go back to top of list when Settings is relaunched" into jb-mr1-dev 2012-10-10 10:31:59 -07:00
Amith Yamasani
ef6172304b Go back to top of list when Settings is relaunched
Also fixes slight movements when coming back from Add account.

Bug: 7312513
Bug: 7318452
Change-Id: I5b07262de52e6bdf98e75fff98a032afd74fc0e5
2012-10-09 16:57:25 -07:00
Irfan Sheriff
1de6b8b648 am f3153e3b: am 196f1bd0: am a92f380f: Merge "Have poor network avoidance turned off by default" into jb-mr1-dev
* commit 'f3153e3b232a0f5af9c91372df1d9ef938e6f25d':
  Have poor network avoidance turned off by default
2012-10-09 16:37:14 -07:00
Irfan Sheriff
a92f380f86 Merge "Have poor network avoidance turned off by default" into jb-mr1-dev 2012-10-09 16:32:25 -07:00
Irfan Sheriff
ba50175b1c Have poor network avoidance turned off by default
Bug: 7318044
Change-Id: I1c86ffd2dae168a3eb35f08cd09096a7f28de2a9
2012-10-09 16:18:36 -07:00
Russell Brenner
3067fbce2e Return RESULT_OK when wifi connection established
Two new exit points were not setting a return result. Since the
default result for an activity is RESULT_CANCEL, Setup Wizard was
continuing as if no connection was made.

Bug: 7298234
Change-Id: I44085f38ed021b7d417f9794b3341747f00300e9
2012-10-09 16:17:12 -07:00
Svetoslav Ganov
04aa39907c am e002c0f0: am f04ac7ee: am a1e406b5: Merge "Accessibility settings should update after gesture to enable accessibility." into jb-mr1-dev
* commit 'e002c0f088e1bbf6f730ecbf79f29f330ceaa345':
  Accessibility settings should update after gesture to enable accessibility.
2012-10-08 16:41:37 -07:00
Svetoslav Ganov
a1e406b58e Merge "Accessibility settings should update after gesture to enable accessibility." into jb-mr1-dev 2012-10-08 16:35:52 -07:00
Svetoslav Ganov
1f81c0542e Accessibility settings should update after gesture to enable accessibility.
1. We have added a global gesture to enable accessibility which is long press
   on power follower by a long press with two fingers. If this gesture is
   performed when accessibility settings are on the screen, accessibility and
   the screen-reader are enabled while the UI does not reflect that and the
   user may try to enable the already enabled screen-reader which will show
   two irrelevant warning dialogs - one for enabling the screen-reader and
   one for enabling explore by touch (assuming the screen-reader requests it).
   This change adds a simple content observer for the relevant accessibility
   settings which upon a change calls the functions to refresh the settings UI.

bug:7309127

Change-Id: I45851d7789e24e9e0a5bc5aaac39db9a12b60e0c
2012-10-08 16:03:34 -07:00
Vikram Aggarwal
f5558bb1c0 am 563e4506: am 902ad875: am 86508085: Remove further logging
* commit '563e45063092ab1e2e722cae60a07a58f32ac4de':
  Remove further logging
2012-10-08 13:38:10 -07:00
Vikram Aggarwal
86508085ea Remove further logging
Bug: 7302014 CryptKeeper logs PII data

Change-Id: Ifb18c428c70e97f28ceeced2fa0aa6e9247a5372
2012-10-08 12:59:54 -07:00
Jake Hamby
c71d0505b9 am 58f59428: am 837bb033: am 283dce21: Merge "Allow disconnected BT profiles to be unchecked in Settings." into jb-mr1-dev
* commit '58f594284efb98737f5435b8463ab0e28895fe60':
  Allow disconnected BT profiles to be unchecked in Settings.
2012-10-08 12:19:46 -07:00
Jake Hamby
283dce21b4 Merge "Allow disconnected BT profiles to be unchecked in Settings." into jb-mr1-dev 2012-10-08 12:13:14 -07:00
Vikram Aggarwal
ab462aebec am f36ebae7: am 075dfeaa: am c3ebad20: Remove verbose logging
* commit 'f36ebae7a29387452af71730767aba6a00f23094':
  Remove verbose logging
2012-10-08 10:57:18 -07:00
Vikram Aggarwal
c3ebad20f2 Remove verbose logging
Bug: 7302014 CryptKeeper logs PII data

Change-Id: I4dec3a827a5b6880b1c0995b8adebf34315c4773
2012-10-08 09:13:07 -07:00
Amith Yamasani
f731e47a36 am 60b4d615: am a1e19608: am 0b146b23: Merge "Revert "Show warning dialog in a multiuser system when adding a new account."" into jb-mr1-dev
* commit '60b4d615c619aaf268fd3d1fd101f7524756b3fb':
  Revert "Show warning dialog in a multiuser system when adding a new account."
2012-10-05 20:58:23 -07:00
Amith Yamasani
0b146b2384 Merge "Revert "Show warning dialog in a multiuser system when adding a new account."" into jb-mr1-dev 2012-10-05 20:53:03 -07:00
Amith Yamasani
21c2904ba3 Revert "Show warning dialog in a multiuser system when adding a new account."
This reverts commit eb71f26897

Change-Id: Iad4a6656e922c0d2dbd3dd349d1c24d597eab7f5
2012-10-05 19:56:18 -07:00
Adam Cohen
3757a635a6 am e7be6192: am 517f5ced: am 1f9a07b5: Merge "Fixing filter for status widget (issue 7295596)" into jb-mr1-dev
* commit 'e7be6192ed7337d81a77ad1da11dba2c578929c7':
  Fixing filter for status widget (issue 7295596)
2012-10-05 14:21:18 -07:00
Svetoslav Ganov
4b4297f7fc am 2c72ba6d: am 3b1520ee: am 78995994: Updating the screen magnification strings.
* commit '2c72ba6de2e2dbce1278ef67db0e65439c9c1577':
  Updating the screen magnification strings.
2012-10-05 14:21:17 -07:00
Adam Cohen
1f9a07b5e9 Merge "Fixing filter for status widget (issue 7295596)" into jb-mr1-dev 2012-10-05 14:16:42 -07:00
Svetoslav Ganov
78995994b9 Updating the screen magnification strings.
bug:7295457

Change-Id: Idef3950b975fbb8071067c165fa52358aa6b828d
2012-10-05 14:13:42 -07:00
Jeff Sharkey
897c3c8937 am f49a4702: am dd51496c: am 4a58b100: Merge "Avoid NPE when missing PackageInfo." into jb-mr1-dev
* commit 'f49a470253c8310b024b6121b782e70b2f5f935a':
  Avoid NPE when missing PackageInfo.
2012-10-05 13:59:08 -07:00
Jeff Sharkey
4a58b1006c Merge "Avoid NPE when missing PackageInfo." into jb-mr1-dev 2012-10-05 13:53:39 -07:00
Svetoslav Ganov
381a95b209 am eb8c57d9: am 3c95a3b9: am 69621ece: Locale selection settings do not hide warning dialog.
* commit 'eb8c57d909d1498639d32e82bdda52393ed761ee':
  Locale selection settings do not hide warning dialog.
2012-10-05 13:52:37 -07:00
Adam Cohen
a1c314a879 Fixing filter for status widget (issue 7295596)
Change-Id: I63515bc68550357b8e2738450eefa01ec3122229
2012-10-05 13:42:04 -07:00
Jeff Sharkey
54b3f501ca Avoid NPE when missing PackageInfo.
Bug: 7296861
Change-Id: I87b64d5f4b1f34e47d785a18a029130fdca874a1
2012-10-05 13:34:41 -07:00
Svetoslav Ganov
69621ece97 Locale selection settings do not hide warning dialog.
1. If there is more than one user on the device and a user tries
   to modify the locale which is shared across all users we are
   showing a warning dialog. When the user selects OK we are
   changing the locale and going to the previous screen. This is
   achieved by removing the locale selection fragment from the
   backstack. The problem was that the dialog was not dismissed
   upon OK in the dialog which resulted in saving the dialog's
   state and an attempt to restore it on the wrong fragment which
   has no idea about this dialog, this returning a null dialog
   resulting in a crash. This change removes the dialog on
   OK selection.

bug:7265186

Change-Id: I336ab54f5281c7a9ae24f1c25769daac46477ebd
2012-10-05 12:49:25 -07:00
Charles Chen
5e4b82452a am 464a0078: am fdab8bd9: am 992e0b85: Merge "Announce dynamic content changes in lock confirmation settings." into jb-mr1-dev
* commit '464a0078b1f72a3a069f80b4aeca4644eef02eaa':
  Announce dynamic content changes in lock confirmation settings.
2012-10-04 20:34:16 -07:00
Charles Chen
992e0b8537 Merge "Announce dynamic content changes in lock confirmation settings." into jb-mr1-dev 2012-10-04 18:32:30 -07:00
Jake Hamby
904d3726d4 Allow disconnected BT profiles to be unchecked in Settings.
In the Bluetooth profile list, the checkbox indicates whether the
profile is preferred (we should auto connect). If the profile is
not connected, selecting it will try to connect the profile and set
it to preferred. If the profile can't be connected, then the user
could not turn off the preferred setting for the profile.

Change the behavior so that when a profile is not connected,
but is marked as preferred, selecting the profile will turn off the
preferred setting (no auto connect) instead of trying to connect.
This enables the user to turn off auto connect for a profile when
it can't be connected. Tapping a second time will try to connect
the profile and set it as preferred, as usual.

Also change PanProfile to return the current connection status for
isPreferred() instead of always returning true. Currently, the
PAN profile is always checked, which is confusing because it looks
like PAN is always connected. Also, because of the new behavior
when a profile is selected, it's now necessary to return false for
isPreferred() when PAN isn't connected, so that we will try to
connect when the user selects it, instead of trying to turn off
the preferred setting, which isn't supported for PAN.

Bug: 7007641
Change-Id: Ifb0f51a15379bc254933168c43bdfc8b22f26051
2012-10-04 17:42:38 -07:00
Dianne Hackborn
68d4d87e5a am 7b1d707f: am 8416f453: am 2c41f7be: Merge "Fix issue #7226978: Still in app detail screen after uninstall" into jb-mr1-dev
* commit '7b1d707f9706acc2500b13df7961c8db6338e24a':
  Fix issue #7226978: Still in app detail screen after uninstall
2012-10-04 17:26:02 -07:00
Dianne Hackborn
2c41f7be44 Merge "Fix issue #7226978: Still in app detail screen after uninstall" into jb-mr1-dev 2012-10-04 17:20:45 -07:00
Jeff Sharkey
51e6e175ed am a5b6ba8a: am ef62a198: am 113e4b6a: Merge "Refresh authenticator info when accounts change." into jb-mr1-dev
* commit 'a5b6ba8afb7a81ca975d58c61fc152e11a34871f':
  Refresh authenticator info when accounts change.
2012-10-04 16:47:14 -07:00
Jeff Sharkey
113e4b6aa1 Merge "Refresh authenticator info when accounts change." into jb-mr1-dev 2012-10-04 16:40:25 -07:00
Dianne Hackborn
ab616d477b Fix issue #7226978: Still in app detail screen after uninstall
Change-Id: I3b03db0a68bfab5dd010474ee714d5f7a5538af0
2012-10-04 15:44:50 -07:00
alanv
eef72c39ae Announce dynamic content changes in lock confirmation settings.
Also re-orders updateStage() and setText/Selection calls so that text
events don't flush announcements. This does not change functionality.

Bug: 7256500
Change-Id: I8b10d66e9f73c7a630a8c3c5128372e18f26234c
2012-10-03 17:10:50 -07:00
Jeff Sharkey
9ff79c19bd Refresh authenticator info when accounts change.
There may be newly installed authenticators, so refresh them when
accounts change.

Bug: 7280043
Change-Id: Ic173970c815950526c77a2653e7fae4551948f13
2012-10-03 16:49:35 -07:00
Jeff Sharkey
237236a1a0 am f56fa1d8: am 396c24ce: am ffec6eac: Merge "Avoid NPE when installing app update." into jb-mr1-dev
* commit 'f56fa1d83aa46f4992130e995c378070432024b7':
  Avoid NPE when installing app update.
2012-10-03 16:21:29 -07:00
Jeff Sharkey
ffec6eaca5 Merge "Avoid NPE when installing app update." into jb-mr1-dev 2012-10-03 16:15:31 -07:00
Jeff Sharkey
347188667b Avoid NPE when installing app update.
PMS sends REMOVED followed quickly by ADDED.  Ignore when missing
package, since it may be coming back shortly.  Eventually we should
change this to watch EXTRA_REPLACING.

Bug: 7269896
Change-Id: I3b518f4faee34019c5c808824d5e46261f6d206a
2012-10-03 16:06:41 -07:00
Amith Yamasani
f9a95796d5 am d187eae5: am 42abadb0: am 2fa8cf73: Merge "Use new color avatar assets" into jb-mr1-dev
* commit 'd187eae558bda7eb485fe859f34ae06f54cba5f3':
  Use new color avatar assets
2012-10-02 22:27:03 -07:00
Amith Yamasani
2fa8cf7360 Merge "Use new color avatar assets" into jb-mr1-dev 2012-10-02 22:21:05 -07:00
Amith Yamasani
95dc4733c0 Use new color avatar assets
Bug: 7204409
Bug: 7222997
Change-Id: Iac2c4ab2d7bf0090670573bf4c967f07abdf6f51
2012-10-02 21:10:48 -07:00
Jeff Sharkey
817739d5f4 am 9f396f52: am ccb277ef: am b0e25f71: Merge "Follow API changes in framework." into jb-mr1-dev
* commit '9f396f52ee73e983fbe876c99f7ccc7d0ff7d43b':
  Follow API changes in framework.
2012-10-02 19:08:50 -07:00
Jeff Sharkey
b0e25f71a8 Merge "Follow API changes in framework." into jb-mr1-dev 2012-10-02 19:02:46 -07:00
Jeff Sharkey
be32d4b408 Follow API changes in framework.
Change-Id: I6c1f5c9ec342f69ceae3dddaa0cfab4e0a742372
2012-10-02 18:57:55 -07:00