PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,713 Commits 1 Branch 0 Tags
a70688feac09e4b4d832001bc1adb23e2e11cccc
Commit Graph

9713 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Cohen
517f5cede9 am 1f9a07b5: Merge "Fixing filter for status widget (issue 7295596)" into jb-mr1-dev 
* commit '1f9a07b5e9b1868fc6741c99e74970aa0e9762fe':
  Fixing filter for status widget (issue 7295596)
 2012-10-05 14:18:24 -07:00
Svetoslav Ganov
3b1520eed7 am 78995994: Updating the screen magnification strings. 
* commit '78995994b9b0afbc4c4705e41d1c4ac944e557f2':
  Updating the screen magnification strings.
 2012-10-05 14:16:58 -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
f49a470253 am dd51496c: am 4a58b100: Merge "Avoid NPE when missing PackageInfo." into jb-mr1-dev 
* commit 'dd51496cf3c1b1e5e24652a669c3889e1c31720d':
  Avoid NPE when missing PackageInfo.
 2012-10-05 13:57:22 -07:00
Jeff Sharkey
dd51496cf3 am 4a58b100: Merge "Avoid NPE when missing PackageInfo." into jb-mr1-dev 
* commit '4a58b1006cec93565a7106c117b2c87248341404':
  Avoid NPE when missing PackageInfo.
 2012-10-05 13:55:36 -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
Svetoslav Ganov
eb8c57d909 am 3c95a3b9: am 69621ece: Locale selection settings do not hide warning dialog. 
* commit '3c95a3b947cc251bb5379b026e465d9541df6345':
  Locale selection settings do not hide warning dialog.
 2012-10-05 13:49:53 -07:00
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
31f2cb77c4 am 3ddc5049: (-s ours) Reconcile with jb-mr1-release - do not merge 
* commit '3ddc5049fccffa0fee9670d2833318ff35121c8d':
 2012-10-05 08:20:53 -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
9fff3f5790 am 62a725f9: (-s ours) am babf1a43: am 9d904890: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '62a725f9c3f01e846b5f27d851349d92f6af2d5f':
  Import translations. DO NOT MERGE
 2012-10-04 22:26:07 -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
127254ab5f am e8d64472: (-s ours) am 3d72d169: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit 'e8d64472319dbc6e67ce964e8712dc0a676298ae':
  Import translations. DO NOT MERGE
 2012-10-04 22:22:59 -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
fc2f177971 Merge "Import translations. DO NOT MERGE" 2012-10-04 22:19:35 -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
af721bbb49 am 16fd6059: am 42171a2c: am 6fd359d8: Merge "Move the position of widget choosers to below lockscreen settings in Security" into jb-mr1-dev 
* commit '16fd6059eeed4f9d1b7e4fac3b5a0fe9686d2229':
  Move the position of widget choosers to below lockscreen settings in Security
 2012-10-04 22:02:36 -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
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
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
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
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
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
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
0974c0aabe Import translations. DO NOT MERGE 
Change-Id: I3c441df6a35ab942ed6467ae938baa18f719a1f7
Auto-generated-cl: translation import
 2012-10-04 15:02:57 -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
92c45de11a am 484cbeba: (-s ours) am f55a3a1e: am 27636444: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '484cbebafd3d4e2456f4fa0b82fffbb7987ba0ae':
  Import translations. DO NOT MERGE
 2012-10-04 10:44:35 -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