PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,603 Commits 1 Branch 0 Tags
de101033025c53ab8f16c31c57c003c757e47cec
Commit Graph

7603 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Fischer
2f70ae1664 am 1b46022b: (-s ours) am a56e2362: Import translations. DO NOT MERGE 
* commit '1b46022b4155cf68ddf072f99186df4f009c63b4':
  Import translations. DO NOT MERGE
 2012-05-25 15:46:27 -07:00
Eric Fischer
1b46022b41 am a56e2362: Import translations. DO NOT MERGE 
* commit 'a56e2362b12cf94045145975d6ce1fa5d0c35aea':
  Import translations. DO NOT MERGE
 2012-05-25 15:43:45 -07:00
Eric Fischer
acfb55e1a9 Import translations. DO NOT MERGE 
Change-Id: Idb949bd15f7b38df8ecc3314c0f0441688e4f2bd
 2012-05-25 14:50:06 -07:00
Eric Fischer
a56e2362b1 Import translations. DO NOT MERGE 
Change-Id: Ia98a540aa471fa330bfa066330d0e48e058f4798
 2012-05-25 14:48:17 -07:00
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
Jeff Brown
29d77cfaf6 am 303beea9: am 60111cf0: Merge "String change." into jb-dev 
* commit '303beea9b40c97a6560ef19abf409c5ad5fd8d4b':
  String change.
 2012-05-24 15:22:56 -07:00
Jeff Brown
303beea9b4 am 60111cf0: Merge "String change." into jb-dev 
* commit '60111cf073af774250517bcab0f888f91f6f4750':
  String change.
 2012-05-24 15:20:21 -07:00
Jeff Brown
60111cf073 Merge "String change." into jb-dev 2012-05-24 15:18:16 -07:00
Jeff Brown
0e3232fea0 String change. 
Change-Id: Ic2d52977682d1074ce37df219db4c0a199d50196
 2012-05-24 15:01:33 -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
The Android Automerger
b90b97956b merge in nakasi-factoryrom-release history after reset to jb-dev 2012-05-24 10:19:40 -07:00
Amith Yamasani
8ad7abbcf6 Merge "Corrected return value for updatePreferenceToSpecificActivityOrRemove method" 2012-05-24 09:48:21 -07:00
The Android Open Source Project
e706f0a71d am 15841d27: Reconcile with jb-release nakasi-factoryrom-release 
* commit '15841d27afafe222fa040c366976e54a178df374':
  Match setup wizard wifi settings with new wireframes
 2012-05-24 09:04:08 -07:00
The Android Open Source Project
15841d27af Reconcile with jb-release nakasi-factoryrom-release 
Change-Id: I50829094e89eb701667f355ffe86ef812c5aa0cc
 2012-05-24 09:01:44 -07:00
The Android Automerger
c04a034425 merge in jb-release history after reset to jb-dev 2012-05-24 07:01:56 -07:00
Michael Kolb
ed427b6fbd Match setup wizard wifi settings with new wireframes 
Bug: 6521472

Change-Id: I159d8a98327ad775b2c5ccfc7380d60d62b54dad
 2012-05-23 17:36:52 -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
Christian Robertson
53f9ca15e0 am f4ef0edf: am 27c20291: Merge "Updating launcher icon to fix alignment. Bug: 6511716" into jb-dev 
* commit 'f4ef0edffdd8e111b817cbf8a9d178fa30919f05':
  Updating launcher icon to fix alignment. Bug:  6511716
 2012-05-23 14:09:35 -07:00
Christian Robertson
f4ef0edffd am 27c20291: Merge "Updating launcher icon to fix alignment. Bug: 6511716" into jb-dev 
* commit '27c2029128d2d9909eced0bb7d7c56755d85de17':
  Updating launcher icon to fix alignment. Bug:  6511716
 2012-05-23 14:04:40 -07:00
Christian Robertson
27c2029128 Merge "Updating launcher icon to fix alignment. Bug: 6511716" into jb-dev 2012-05-23 14:01:46 -07:00
Christian Robertson
93d6c74090 Updating launcher icon to fix alignment. Bug: 6511716 
Change-Id: I912c356fcd61414394ef9318568491b68a63b724
 2012-05-23 11:59:53 -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
The Android Automerger
9b4720da01 merge in jb-release history after reset to jb-dev 2012-05-23 07:04:18 -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
The Android Open Source Project
abd711b15e am 0d23458e: Reconcile with jb-release 
* commit '0d23458e0ef45fe44f4ffe8e98044dc7d9189374':
 2012-05-22 14:21:33 -07:00
Andrew Flynn
f85b241208 am f89dc7c9: am be4a0325: Merge "Update WPS Dialog" into jb-dev 
* commit 'f89dc7c93a413cd52e1a2f2fe6c56d64de55522c':
  Update WPS Dialog
 2012-05-22 14:21:33 -07:00
Andrew Flynn
222a093649 resolved conflicts for merge of f89dc7c9 to master 
Change-Id: Icd37261dd3ce920b3bed359ed5232bdc018916fc
 2012-05-22 14:15:20 -07:00