PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,897 Commits 1 Branch 0 Tags
0ab861f05481dbb0d3764aa429dd2da50e25fa82
Commit Graph

3246 Commits

Author SHA1 Message Date
Amith Yamasani
0ab861f054 am f007430e: am a5ac7ce5: Merge "Don\'t show SIM LOCK settings if there\'s no Icc card." into jb-dev 
* commit 'f007430ed5aa1e1218caae9de6dded511c5d761f':
  Don't show SIM LOCK settings if there's no Icc card.
 2012-05-25 10:21:56 -07:00
Amith Yamasani
f007430ed5 am a5ac7ce5: Merge "Don\'t show SIM LOCK settings if there\'s no Icc card." into jb-dev 
* commit 'a5ac7ce5149ea3f6f4b27259cd9fd4a23b7ac47a':
  Don't show SIM LOCK settings if there's no Icc card.
 2012-05-25 10:16:49 -07:00
Amith Yamasani
a5ac7ce514 Merge "Don't show SIM LOCK settings if there's no Icc card." into jb-dev 2012-05-25 10:14:58 -07:00
Amith Yamasani
484aeb5fd7 am 929f04e2: am 8ad7abbc: Merge "Corrected return value for updatePreferenceToSpecificActivityOrRemove method" 
* commit '929f04e28e7910eae04871e8ea3c7126b100b393':
  Corrected return value for updatePreferenceToSpecificActivityOrRemove method
 2012-05-25 07:35:57 -07:00
Amith Yamasani
929f04e28e am 8ad7abbc: Merge "Corrected return value for updatePreferenceToSpecificActivityOrRemove method" 
* commit '8ad7abbcf64076b4df8ff3e724815c2e7940be8e':
  Corrected return value for updatePreferenceToSpecificActivityOrRemove method
 2012-05-25 07:19:56 -07:00
Fabrice Di Meglio
beebce5b57 am 4e8150c4: am 22af594c: Merge "Fix bug #6522190 MountService should respond to configuration changes ("INTERNAL STORAGE" string should be translated dynamically)" into jb-dev 
* commit '4e8150c42c08d144faa1ade09282f7f45be9636f':
  Fix bug #6522190 MountService should respond to configuration changes ("INTERNAL STORAGE" string should be translated dynamically)
 2012-05-24 11:42:55 -07:00
Fabrice Di Meglio
4e8150c42c am 22af594c: Merge "Fix bug #6522190 MountService should respond to configuration changes ("INTERNAL STORAGE" string should be translated dynamically)" into jb-dev 
* commit '22af594c04045adbb9fe6a2cb7a69e40afd655b2':
  Fix bug #6522190 MountService should respond to configuration changes ("INTERNAL STORAGE" string should be translated dynamically)
 2012-05-24 11:40:30 -07:00
Fabrice Di Meglio
22af594c04 Merge "Fix bug #6522190 MountService should respond to configuration changes ("INTERNAL STORAGE" string should be translated dynamically)" into jb-dev 2012-05-24 11:37:07 -07:00
Fabrice Di Meglio
c18cc43b28 Fix bug #6522190 MountService should respond to configuration changes ("INTERNAL STORAGE" string should be translated dynamically) 
- use an ID instead of a String for StorageVolume description
- use this ID for getting the correct localized version of the description string

Change-Id: If66868ecc84297322cb9a3f0b2d834f79dd019ca
 2012-05-24 11:35:09 -07:00
Jeff Sharkey
1f0c0516d2 am a3a40f72: am a655a2f4: Merge "Only show ethernet when traffic has occurred." into jb-dev 
* commit 'a3a40f724e0e291edc9d18d1d5e9fdfcb8e2a469':
  Only show ethernet when traffic has occurred.
 2012-05-24 11:31:13 -07:00
Jeff Sharkey
a3a40f724e am a655a2f4: Merge "Only show ethernet when traffic has occurred." into jb-dev 
* commit 'a655a2f48e61dd44ee9f14585e0ee89202412158':
  Only show ethernet when traffic has occurred.
 2012-05-24 11:28:17 -07:00
Jeff Sharkey
a655a2f48e Merge "Only show ethernet when traffic has occurred." into jb-dev 2012-05-24 11:25:55 -07:00
Jeff Sharkey
b67c4a8e73 Only show ethernet when traffic has occurred. 
Bug: 6231172
Change-Id: I24dfd5f998b4e96681813c9fd7ce1ed74cf30eb5
 2012-05-24 11:01:29 -07:00
Amith Yamasani
8ad7abbcf6 Merge "Corrected return value for updatePreferenceToSpecificActivityOrRemove method" 2012-05-24 09:48:21 -07:00
Amith Yamasani
5c68e12493 Don't show SIM LOCK settings if there's no Icc card. 
Bug: 6525359

Change-Id: I7bf2a1799ca3032a5dbfa15320d862195b9659f7
 2012-05-23 17:20:01 -07:00
Amith Yamasani
b809fbf61d am 9e184326: am 6e9e5195: Merge "Fix crash when removing an account." into jb-dev 
* commit '9e184326640c448b48b31799d1d55d8d3b160483':
  Fix crash when removing an account.
 2012-05-23 14:39:10 -07:00
Amith Yamasani
9e18432664 am 6e9e5195: Merge "Fix crash when removing an account." into jb-dev 
* commit '6e9e519560a50d735ea3c2ddd01d9b7a9cc1d89b':
  Fix crash when removing an account.
 2012-05-23 14:36:50 -07:00
Amith Yamasani
6e9e519560 Merge "Fix crash when removing an account." into jb-dev 2012-05-23 14:34:15 -07:00
Amith Yamasani
e88be4f620 Fix crash when removing an account. 
Bug: 6494527
Change-Id: I9ab3b54ac4e4d679fd9ec22ab438b9e1ea0be2b1
 2012-05-23 14:13:13 -07:00
Michael Kolb
068d1fcdbd am 34382357: am 9d5a6eb4: Match setup wizard wifi settings with new wireframes 
* commit '34382357f5fa69e5ce09dce4fec44a2c220e269b':
  Match setup wizard wifi settings with new wireframes
 2012-05-23 11:34:23 -07:00
Michael Kolb
34382357f5 am 9d5a6eb4: Match setup wizard wifi settings with new wireframes 
* commit '9d5a6eb4d7ec662e666dc5dfe1506616d5b59341':
  Match setup wizard wifi settings with new wireframes
 2012-05-23 11:31:51 -07:00
Michael Kolb
9d5a6eb4d7 Match setup wizard wifi settings with new wireframes 
Bug: 6521472

Change-Id: I159d8a98327ad775b2c5ccfc7380d60d62b54dad
 2012-05-23 11:19:47 -07:00
John Spurlock
be378a76b2 am 4c63ec42: am 3a821e86: Merge "Settings: "Rotation lock" retains existing orientation." into jb-dev 
* commit '4c63ec42c156645bc67172180b7fc8b4c75182bd':
  Settings: "Rotation lock" retains existing orientation.
 2012-05-23 05:41:29 -07:00
John Spurlock
4c63ec42c1 am 3a821e86: Merge "Settings: "Rotation lock" retains existing orientation." into jb-dev 
* commit '3a821e86f5851cbce1185a481acb88a0f33c98ae':
  Settings: "Rotation lock" retains existing orientation.
 2012-05-23 05:39:01 -07:00
John Spurlock
3a821e86f5 Merge "Settings: "Rotation lock" retains existing orientation." into jb-dev 2012-05-23 05:29:56 -07:00
Vikram Aggarwal
1125b775ff am bccd90e6: am ff78bf72: Merge "Show keyboard selectively, do not listen on MCC/MNC changes, show text to user." into jb-dev 
* commit 'bccd90e6baf0af157af2c5149517681475341b5d':
  Show keyboard selectively, do not listen on MCC/MNC changes, show text to user.
 2012-05-22 14:55:27 -07:00
Vikram Aggarwal
bccd90e6ba am ff78bf72: Merge "Show keyboard selectively, do not listen on MCC/MNC changes, show text to user." into jb-dev 
* commit 'ff78bf7280b2f435bf09e0df0f252506b1c6af61':
  Show keyboard selectively, do not listen on MCC/MNC changes, show text to user.
 2012-05-22 14:52:40 -07:00
Vikram Aggarwal
ff78bf7280 Merge "Show keyboard selectively, do not listen on MCC/MNC changes, show text to user." into jb-dev 2012-05-22 14:50:48 -07:00
Vikram Aggarwal
f576dd6c9f Show keyboard selectively, do not listen on MCC/MNC changes, show text to user. 
Fix b/6531158 (Stop showing the keyboard)

Fix b/6532201 (Stop removing the text view, and prompt the user with a message)

Fix b/6155075 (Stop listening to MCC/MNC changes)

Change-Id: Ibf8414fe57bdd0acf6c20f3194c52b168b9292c6
 2012-05-22 14:37:19 -07:00
Andrew Flynn
222a093649 resolved conflicts for merge of f89dc7c9 to master 
Change-Id: Icd37261dd3ce920b3bed359ed5232bdc018916fc
 2012-05-22 14:15:20 -07:00
Andrew Flynn
f89dc7c93a am be4a0325: Merge "Update WPS Dialog" into jb-dev 
* commit 'be4a032581ae6dfb41662486085e64052d085314':
  Update WPS Dialog
 2012-05-22 11:41:21 -07:00
Andrew Flynn
2e39ebfeaf Update WPS Dialog 
- Remove title
- Change description text
- Add WPS icon

Bug: 6457246
Change-Id: Icd37261dd3ce920b3bed359ed5232bdc018916fc
 2012-05-22 11:22:02 -07:00
Jean-Baptiste Queru
1a47dff3ce Merge "Remove title bar background drawable from running app detail view" 2012-05-22 07:48:41 -07:00
John Spurlock
523d5a6e04 Settings: "Rotation lock" retains existing orientation. 
Enabling "Rotation lock" when in landscape will stay in landscape
instead of forcing to portrait.

Bug: 6481542
Change-Id: Ide6171437a207f97a8fc3123ad8b2fe27323336f
 2012-05-22 09:51:02 -04:00
Svetoslav Ganov
1b47f982c3 am fb59d66a: am 8d43aeae: Merge "Updating the checkbox state to match the title." into jb-dev 
* commit 'fb59d66a4ea44a656f77ee61a9275f50e87069c0':
  Updating the checkbox state to match the title.
 2012-05-21 14:32:57 -07:00
Jeff Brown
b737037aca am 0ee87ab2: am 766b2861: Add UI to select multiple keyboard layouts. 
* commit '0ee87ab22a04a6a3b40b9d9e09b5de30bbd9f92c':
  Add UI to select multiple keyboard layouts.
 2012-05-21 14:29:24 -07:00
Svetoslav Ganov
fb59d66a4e am 8d43aeae: Merge "Updating the checkbox state to match the title." into jb-dev 
* commit '8d43aeae0347435a03e4007eef5fce578ec50184':
  Updating the checkbox state to match the title.
 2012-05-21 14:12:43 -07:00
Svetoslav Ganov
84f56ca6ba am c19be29c: am fc16237d: Merge "Removed Accessibility tutorial and orphaned resources." into jb-dev 
* commit 'c19be29cd7550411c83764b67e22e18065794342':
  Removed Accessibility tutorial and orphaned resources.
 2012-05-21 14:11:33 -07:00
Irfan Sheriff
172b6fe253 am 41f88da8: am ee7589c0: Merge "Fix p2p settings crash" into jb-dev 
* commit '41f88da823f59c7d37076b7dd6d883498b8f6997':
  Fix p2p settings crash
 2012-05-21 14:11:30 -07:00
Svetoslav Ganov
8d43aeae03 Merge "Updating the checkbox state to match the title." into jb-dev 2012-05-21 14:09:27 -07:00
Jeff Sharkey
4ca0945cf8 am 71f79983: am 409433e9: Merge "Avoid NPE until we understand better." into jb-dev 
* commit '71f7998304a560c8ba413e5bea1a16b7ba550027':
  Avoid NPE until we understand better.
 2012-05-21 12:45:08 -07:00
Svetoslav Ganov
8bd499d3f4 am 7c0a86ef: am 6a09c07b: Merge "Removing explore by touch from settings." into jb-dev 
* commit '7c0a86efe0e73671ab93d069afbda52cd0d957e8':
  Removing explore by touch from settings.
 2012-05-21 12:45:08 -07:00
Michael Kolb
c98f9b1bf2 am a63bda69: am 5dfc5053: Merge "Add seperate activity for setup wizard wifi picker to adjust theme" into jb-dev 
* commit 'a63bda69d72a3a07f058e89870e6892fb880fa5d':
  Add seperate activity for setup wizard wifi picker to adjust theme
 2012-05-21 12:45:07 -07:00
Dianne Hackborn
8900ab0fde am d3bacbfa: am 7d2658ff: Merge "Fix issues 6512411 and 6512951 in ManageApplications." into jb-dev 
* commit 'd3bacbfa3e925f33d1830c49a62c989d26035e94':
  Fix issues 6512411 and 6512951 in ManageApplications.
 2012-05-21 12:43:32 -07:00
Jeff Brown
03ab90a405 am cb945846: am 796e0a09: Merge "Add support for grouping keyboard layouts by collection." into jb-dev 
* commit 'cb94584629f6ffa05b9bc8307f90596e7113c36b':
  Add support for grouping keyboard layouts by collection.
 2012-05-21 12:43:14 -07:00
Russell Brenner
5e709955d2 am 737d5aa9: am 1c0a8f95: Merge "Wifi select screen redlines" into jb-dev 
* commit '737d5aa9cfdc4a06c48530175799a13175d165d1':
  Wifi select screen redlines
 2012-05-21 12:41:11 -07:00
Daniel Sandler
d559a483d2 am 527a6693: am 70b59998: Refinements to notification controls in Settings. 
* commit '527a669330598f66deda5fd1fa516ddcb230991f':
  Refinements to notification controls in Settings.
 2012-05-21 12:40:20 -07:00
Gilles Debunne
2f8067353c am 50e9b7c0: am 8cbfe403: Merge "Show dots when entering PIN password in landscape" into jb-dev 
* commit '50e9b7c0f446d3c26fdda08e9600fe4740968754':
  Show dots when entering PIN password in landscape
 2012-05-21 11:51:46 -07:00
Jeff Brown
0ee87ab22a am 766b2861: Add UI to select multiple keyboard layouts. 
* commit '766b286187d02b3da6e0142376a4478072f30a16':
  Add UI to select multiple keyboard layouts.
 2012-05-20 21:53:26 -07:00
Jeff Brown
766b286187 Add UI to select multiple keyboard layouts. 
Bug: 6405203
Change-Id: I27ca4630aebcb39b83298d37d8fb3f4ef0080317
 2012-05-20 14:56:42 -07:00