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

6727 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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 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
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
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
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
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
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 Automerger
17ac889164 merge in nakasi-factoryrom-release history after reset to jb-dev 2012-05-22 13:25:42 -07:00
The Android Open Source Project
0d23458e0e Reconcile with jb-release 
Change-Id: Iceaefeeee355a1ceb5c38751649e375f5c52bd7c
 2012-05-22 13:06:55 -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
be4a032581 Merge "Update WPS Dialog" into jb-dev 2012-05-22 11:39:30 -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
Andrew Flynn
33089ad705 am 115ae0cf: Change wifi-on-but-no-networks string 
* commit '115ae0cf0119c07fa8e255df6acf8077282854c6':
  Change wifi-on-but-no-networks string
 2012-05-22 11:05:54 -07:00
Andrew Flynn
115ae0cf01 Change wifi-on-but-no-networks string 
Bug: 6533206

Change-Id: I4f5c1d77ffe1bf93c33c9b65f9fdc7278864f88f
 2012-05-22 10:08:56 -07:00
Jean-Baptiste Queru
75a60fc042 am 1a47dff3: Merge "Remove title bar background drawable from running app detail view" 
* commit '1a47dff3ceeb45a97d08f58f19bfcf7becf145d4':
  Remove title bar background drawable from running app detail view
 2012-05-22 08:52:27 -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
The Android Automerger
e8624ef92c merge in jb-release history after reset to jb-dev 2012-05-22 07:07:04 -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
alanv
8fdb00085c am 0aa7c4f1: Fixed all Accessibility lint warnings in Settings app. 
* commit '0aa7c4f14169c95d203ed996ff6eed3981818c6c':
  Fixed all Accessibility lint warnings in Settings app.
 2012-05-21 18:29:40 -07:00
alanv
0aa7c4f141 Fixed all Accessibility lint warnings in Settings app. 
Change-Id: Ida98444f8942d3618d84c0a6f78cc3653ea4ad24
 2012-05-21 17:55:19 -07:00
Adam Powell
f2cf6d6508 am 0901a3c2: Merge "Update the All Apps PagerTabStrip text appearance." into jb-dev 
* commit '0901a3c2132cb439fbab64d13cbe9ede0e5e5379':
  Update the All Apps PagerTabStrip text appearance.
 2012-05-21 16:04:06 -07:00
Adam Powell
0901a3c213 Merge "Update the All Apps PagerTabStrip text appearance." into jb-dev 2012-05-21 16:02:04 -07:00
Adam Powell
fc82c8257b Update the All Apps PagerTabStrip text appearance. 
Change-Id: I5f6b924d0a291b0723b76ee024bc87cb69d61893
 2012-05-21 14:18:49 -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
8d43aeae03 Merge "Updating the checkbox state to match the title." into jb-dev 2012-05-21 14:09:27 -07:00
Jean-Baptiste Queru
ad7f7cc547 am c0653a12: Merge "Expandable NumberPicker width in bytesPicker dialog" 
* commit 'c0653a12304d64aa6107b2f06bb6d0e2e73a2c33':
  Expandable NumberPicker width in bytesPicker dialog
 2012-05-21 12:36:49 -07:00
Jean-Baptiste Queru
c0653a1230 Merge "Expandable NumberPicker width in bytesPicker dialog" 2012-05-21 11:37:30 -07:00
The Android Automerger
198a9652c9 merge in jb-release history after reset to jb-dev 2012-05-21 07:06:07 -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
The Android Automerger
378526c7a1 merge in jb-release history after reset to jb-dev 2012-05-20 07:39:53 -07:00