PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,802 Commits 1 Branch 0 Tags
d3a3bfd598ba21a43db7e5e66c90a98d028aa22c
Commit Graph

8802 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Svetoslav Ganov
3c95a3b947 am 69621ece: Locale selection settings do not hide warning dialog. 
* commit '69621ece97d9f82e7408562f28110f40d872cb24':
  Locale selection settings do not hide warning dialog.
 2012-10-05 13:48:08 -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
The Android Open Source Project
3ddc5049fc Reconcile with jb-mr1-release - do not merge 
Change-Id: Id2efe6503779bfb18d403b49dfaac9ad9f392bc3
 2012-10-05 08:18:21 -07:00
The Android Automerger
6a2bf2a8cd merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-05 07:00:19 -07:00
Baligh Uddin
62a725f9c3 am babf1a43: am 9d904890: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'babf1a4348cb94a1dfadf4c454452d67f27dfdc6':
  Import translations. DO NOT MERGE
 2012-10-04 22:23:48 -07:00
Baligh Uddin
babf1a4348 am 9d904890: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '9d90489078b406d3a52e27ef517278e15f603f76':
  Import translations. DO NOT MERGE
 2012-10-04 22:21:01 -07:00
Baligh Uddin
e8d6447231 am 3d72d169: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit '3d72d169568665b7aa08342c9392fe7f2326cfa8':
  Import translations. DO NOT MERGE
 2012-10-04 22:20:53 -07:00
Baligh Uddin
9d90489078 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-04 22:19:15 -07:00
Baligh Uddin
3d72d16956 Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-10-04 22:18:41 -07:00
Amith Yamasani
16fd6059ee am 42171a2c: am 6fd359d8: Merge "Move the position of widget choosers to below lockscreen settings in Security" into jb-mr1-dev 
* commit '42171a2cc68da0f45b7828eb766a9c73e173e6b2':
  Move the position of widget choosers to below lockscreen settings in Security
 2012-10-04 22:00:25 -07:00
Amith Yamasani
42171a2cc6 am 6fd359d8: Merge "Move the position of widget choosers to below lockscreen settings in Security" into jb-mr1-dev 
* commit '6fd359d8f66e9a2fea45251e52b7a6b07561705b':
  Move the position of widget choosers to below lockscreen settings in Security
 2012-10-04 21:58:07 -07:00
Amith Yamasani
6fd359d8f6 Merge "Move the position of widget choosers to below lockscreen settings in Security" into jb-mr1-dev 2012-10-04 21:56:04 -07:00
Charles Chen
464a0078b1 am fdab8bd9: am 992e0b85: Merge "Announce dynamic content changes in lock confirmation settings." into jb-mr1-dev 
* commit 'fdab8bd9dabe3cb70453a58af68d5f2ce23b44c4':
  Announce dynamic content changes in lock confirmation settings.
 2012-10-04 18:35:47 -07:00
Charles Chen
fdab8bd9da am 992e0b85: Merge "Announce dynamic content changes in lock confirmation settings." into jb-mr1-dev 
* commit '992e0b8537e4fa2f6f6941f7e21d142c40499e7a':
  Announce dynamic content changes in lock confirmation settings.
 2012-10-04 18:33:43 -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
7b1d707f97 am 8416f453: am 2c41f7be: Merge "Fix issue #7226978: Still in app detail screen after uninstall" into jb-mr1-dev 
* commit '8416f45384b5c0ebd24aca0913793820dcc3def4':
  Fix issue #7226978: Still in app detail screen after uninstall
 2012-10-04 17:24:34 -07:00
Dianne Hackborn
8416f45384 am 2c41f7be: Merge "Fix issue #7226978: Still in app detail screen after uninstall" into jb-mr1-dev 
* commit '2c41f7be44715483de4d3e9c8a91488c4f723e90':
  Fix issue #7226978: Still in app detail screen after uninstall
 2012-10-04 17:22:32 -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
a5b6ba8afb am ef62a198: am 113e4b6a: Merge "Refresh authenticator info when accounts change." into jb-mr1-dev 
* commit 'ef62a19855cbfac35ba1c4b1a14caa75e271b512':
  Refresh authenticator info when accounts change.
 2012-10-04 16:44:42 -07:00
Jeff Sharkey
ef62a19855 am 113e4b6a: Merge "Refresh authenticator info when accounts change." into jb-mr1-dev 
* commit '113e4b6aa1dfbc49abdf6366909ceb4a6923d114':
  Refresh authenticator info when accounts change.
 2012-10-04 16:42:27 -07:00
Jeff Sharkey
113e4b6aa1 Merge "Refresh authenticator info when accounts change." into jb-mr1-dev 2012-10-04 16:40:25 -07:00
Amith Yamasani
8f6060f639 Move the position of widget choosers to below lockscreen settings in Security 
Bug: 7261302

Move the 2 widget options on lockscreen to below the lock related items, just
above the Owner Info item.

Change-Id: I373b915e15bc93ce7e56f5982999afa1e5aed281
 2012-10-04 16:21:36 -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
Baligh Uddin
eabf97657b Import translations. DO NOT MERGE 
Change-Id: I1d77c147969acf45abfa5eb4924fb20639d409ee
Auto-generated-cl: translation import
 2012-10-04 15:00:03 -07:00
Baligh Uddin
ad5454ff3b Import translations. DO NOT MERGE 
Change-Id: I9d3249b9c3962ef225c8f7566f8aa96805d89355
Auto-generated-cl: translation import
 2012-10-04 14:58:30 -07:00
Baligh Uddin
484cbebafd am f55a3a1e: am 27636444: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'f55a3a1e3464a79fc4cf080fac8903a566373960':
  Import translations. DO NOT MERGE
 2012-10-04 10:43:34 -07:00
Baligh Uddin
f55a3a1e34 am 27636444: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '27636444a4be011a6a813cba6429e58629316ce4':
  Import translations. DO NOT MERGE
 2012-10-04 10:40:56 -07:00
Baligh Uddin
27636444a4 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-04 10:38:54 -07:00
Baligh Uddin
a35de94f80 am 771daf38: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit '771daf38ea35c670f2eac8512d8058daaec1434f':
  Import translations. DO NOT MERGE
 2012-10-04 10:02:15 -07:00
Baligh Uddin
771daf38ea Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-10-04 10:00:58 -07:00
The Android Open Source Project
90870780c8 Reconcile with jb-mr1-release - do not merge 
Change-Id: Ic92ccbe7031853f464542711f57fcf1e1d7112fb
 2012-10-04 07:50:00 -07:00
The Android Automerger
9958d3582d merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-04 07:00:18 -07:00
Baligh Uddin
8948fa5090 Import translations. DO NOT MERGE 
Change-Id: I5e5c043d16bb59b50b4341a44827c824c564786c
Auto-generated-cl: translation import
 2012-10-03 21:23:00 -07:00
Baligh Uddin
48be9aa3a8 Import translations. DO NOT MERGE 
Change-Id: I65e354b797114c305fdce72fd57ee8039e16630a
Auto-generated-cl: translation import
 2012-10-03 21:21:22 -07:00
Amith Yamasani
dc592eebf1 am 8a55b2d5: am 875fa8af: Merge "No decoration for WifiSetup activity used by SetupWizard" into jb-mr1-dev 
* commit '8a55b2d545d9e2d10afc2f5bf98e0ea6f43182de':
  No decoration for WifiSetup activity used by SetupWizard
 2012-10-03 17:54:56 -07:00
Amith Yamasani
8a55b2d545 am 875fa8af: Merge "No decoration for WifiSetup activity used by SetupWizard" into jb-mr1-dev 
* commit '875fa8affb0f3b0ac39120833a7778f92c97b965':
  No decoration for WifiSetup activity used by SetupWizard
 2012-10-03 17:52:59 -07:00
Amith Yamasani
875fa8affb Merge "No decoration for WifiSetup activity used by SetupWizard" into jb-mr1-dev 2012-10-03 17:50:59 -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
Adam Powell
8bb4fc5251 am c767066d: am c8e609c4: Merge "Navigation fixes for Settings" into jb-mr1-dev 
* commit 'c767066d52880d439daa1912392431943a35fe38':
  Navigation fixes for Settings
 2012-10-03 17:00:59 -07:00
Adam Powell
c767066d52 am c8e609c4: Merge "Navigation fixes for Settings" into jb-mr1-dev 
* commit 'c8e609c49d836ec8c87bc52b9f592693fd860f1d':
  Navigation fixes for Settings
 2012-10-03 16:59:13 -07:00
Adam Powell
c8e609c49d Merge "Navigation fixes for Settings" into jb-mr1-dev 2012-10-03 16:57:44 -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
Adam Powell
4684ae8eca Navigation fixes for Settings 
Change quick-entry points to Settings to have taskAffinity="",
excludeFromRecents="true", and no parentActivityName.

This makes the various quick shortcuts more standalone; their task
state does not persist and they have no Up navigation available. As
most shortcuts do not launch these activities with
FLAG_ACTIVITY_TASK_ON_HOME, Back will return the user to the previous
task.

This does not affect the "real" versions of these settings screens as
navigated to through the front door of the Settings app; those screens
are reached through SubSettings instances with specific fragments
added.

Bug 7276291

Change-Id: I7864437277601a3f6b6beded44a5edfd4636010c
 2012-10-03 16:36:20 -07:00
Amith Yamasani
ded980a6e5 No decoration for WifiSetup activity used by SetupWizard 
Bug: 7274530
Change-Id: I981aa5fb3fca854f0b378b7c219feb92567598ce
 2012-10-03 16:23:35 -07:00
Jeff Sharkey
f56fa1d83a am 396c24ce: am ffec6eac: Merge "Avoid NPE when installing app update." into jb-mr1-dev 
* commit '396c24ce99192ad02d4661bcb8607786e42a09ae':
  Avoid NPE when installing app update.
 2012-10-03 16:18:51 -07:00
Jeff Sharkey
396c24ce99 am ffec6eac: Merge "Avoid NPE when installing app update." into jb-mr1-dev 
* commit 'ffec6eaca53c521d18e8bd295f4e3b896cefedb5':
  Avoid NPE when installing app update.
 2012-10-03 16:17:17 -07:00
Jeff Sharkey
ffec6eaca5 Merge "Avoid NPE when installing app update." into jb-mr1-dev 2012-10-03 16:15:31 -07:00