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

6917 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Brown
bf677f48b7 Fix comparison of device source bits. 
Bug: 6576743
Change-Id: I123307defc32a84a965590fbded95c6997260675
 2012-05-30 14:33:16 -07:00
Eric Fischer
62dd9132f1 am a2d55407: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit 'a2d55407317b50f86069f9e9feb6a0478ee3b1f9':
  Import translations. DO NOT MERGE
 2012-05-30 13:54:39 -07:00
Eric Fischer
a2d5540731 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-05-30 13:50:22 -07:00
Eric Fischer
1b2e4b8e14 Import translations. DO NOT MERGE 
Change-Id: I45c903dfad7e0b599f9b29b3c4f472d3daf9b25d
 2012-05-30 13:37:01 -07:00
The Android Open Source Project
e34d0df2b4 Reconcile with jb-release 
Change-Id: Ia54294c438373cc24703fc93bbd95f4b936d668a
 2012-05-30 10:16:25 -07:00
Amith Yamasani
6eddf3eb1a am 8242901e: Merge "Adjust layout to avoid clipping." into jb-dev 
* commit '8242901e1682826137208bfe2fe35c8f50fa0be8':
  Adjust layout to avoid clipping.
 2012-05-30 09:57:47 -07:00
Amith Yamasani
8242901e16 Merge "Adjust layout to avoid clipping." into jb-dev 2012-05-30 09:55:45 -07:00
The Android Automerger
fde20280cc merge in jb-release history after reset to jb-dev 2012-05-30 07:05:36 -07:00
Svetoslav Ganov
d3c16b49fb am a99d1125: Merge "Lock screen rotation accessibility preference not updated." into jb-dev 
* commit 'a99d1125e2ede99391e8cff6c4bee179fdc81d06':
  Lock screen rotation accessibility preference not updated.
 2012-05-29 20:04:43 -07:00
Svetoslav Ganov
a99d1125e2 Merge "Lock screen rotation accessibility preference not updated." into jb-dev 2012-05-29 20:02:50 -07:00
Dianne Hackborn
a9dab4ff30 am 10be9eaa: Merge "Fix issue where Manage Apps would not start on correct page." into jb-dev 
* commit '10be9eaa812b38d4ad5d40afaeb05dfdf7d448b1':
  Fix issue where Manage Apps would not start on correct page.
 2012-05-29 19:13:56 -07:00
Dianne Hackborn
10be9eaa81 Merge "Fix issue where Manage Apps would not start on correct page." into jb-dev 2012-05-29 19:09:45 -07:00
Jeff Brown
7a5a3b9c4e am 66a55562: Merge "Make string bigger for localization." into jb-dev 
* commit '66a55562c7848d7616196238605e7970d231d22b':
  Make string bigger for localization.
 2012-05-29 18:10:20 -07:00
Jeff Brown
66a55562c7 Merge "Make string bigger for localization." into jb-dev 2012-05-29 18:05:35 -07:00
Svetoslav Ganov
3aa58b0f35 Lock screen rotation accessibility preference not updated. 
1. If the lock screen rotation preference is changed from the
   status bar the checkbox in the accessibility settings was
   not updated.

bug:6562028

Change-Id: I353e3ad59374ad207297d2a6682e50ed07df820c
 2012-05-29 17:36:51 -07:00
Jeff Brown
693d7b7449 Make string bigger for localization. 
Bug: 6575551
Change-Id: Ia13043325bc9fe28e36a0047dba5313900ab91d2
 2012-05-29 17:26:27 -07:00
Dianne Hackborn
13ba7e6556 Fix issue where Manage Apps would not start on correct page. 
We weren't setting the correct initial page in the view
pager.

Change-Id: I68846505a4f23547e9b09e4bc06e3d455ae9556f
 2012-05-29 17:21:05 -07:00
Jeff Sharkey
02939d4fd8 Surface metered networks as "Mobile hotspots." 
String changes to give clearer definition of metered networks, and
remove metered control for mobile network.  Also fix NPE when testing
hasEthernet() before session is ready.

Bug: 6494976
Change-Id: Ia55ca3362a05977b9f21ab41eb10bbc738e29620
 2012-05-29 15:50:32 -07:00
Amith Yamasani
77859dfa79 Adjust layout to avoid clipping. 
Fixes the WiFi AP dialogs getting clipped at the right edge.

Bug: 6525128
Change-Id: Ic1c5c682d51e1492fe3c739c01255db886a90518
 2012-05-29 15:49:29 -07:00
Jeff Sharkey
27143c0b54 am 16bf0e0e: Merge "Surface metered networks as "Mobile hotspots."" into jb-dev 
* commit '16bf0e0ec7dbd606ea5a5c8a1a9653f1cbb6d9b6':
  Surface metered networks as "Mobile hotspots."
 2012-05-29 15:03:13 -07:00
Jeff Sharkey
16bf0e0ec7 Merge "Surface metered networks as "Mobile hotspots."" into jb-dev 2012-05-29 15:01:33 -07:00
Eric Fischer
ad23b800e1 am 6de0ec64: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit '6de0ec640d4ddd618b7f9fa7c9fc131d13979b97':
  Import translations. DO NOT MERGE
 2012-05-29 14:37:07 -07:00
Eric Fischer
6de0ec640d Merge "Import translations. DO NOT MERGE" into jb-dev 2012-05-29 14:34:03 -07:00
Amith Yamasani
baf9b5fb05 am 35ff41b5: Merge "Retain text in Rename Device dialog." into jb-dev 
* commit '35ff41b5f7928acaa5112051f519e3333106d239':
  Retain text in Rename Device dialog.
 2012-05-29 14:16:15 -07:00
Eric Fischer
00d60cf723 Import translations. DO NOT MERGE 
Change-Id: I46077aeea1d55b35eddd45138c09d25bf3df4aa6
 2012-05-29 14:15:59 -07:00
Amith Yamasani
35ff41b5f7 Merge "Retain text in Rename Device dialog." into jb-dev 2012-05-29 14:13:50 -07:00
Amith Yamasani
5864701197 Retain text in Rename Device dialog. 
Also, show the current device name in the dialog, if available.

Bug: 6508967
Change-Id: I34d420e197796352aeab74121bdee55c2d2854d7
 2012-05-29 13:19:26 -07:00
Jeff Sharkey
d878909980 Surface metered networks as "Mobile hotspots." 
String changes to give clearer definition of metered networks, and
remove metered control for mobile network.  Also fix NPE when testing
hasEthernet() before session is ready.

Bug: 6494976
Change-Id: Ia55ca3362a05977b9f21ab41eb10bbc738e29620
 2012-05-29 11:03:55 -07:00
The Android Open Source Project
a18016940f Reconcile with jb-release nakasi-factoryrom-release 
Change-Id: I96cdf547dadf2a15abbb73874390620639dae0c6
 2012-05-29 09:41:21 -07:00
The Android Automerger
b5e989cb40 merge in jb-release history after reset to jb-dev 2012-05-29 09:00:37 -07:00
Marcus Bauer
5b332e86ba Settings: Fixed German translation for turning WLAN/Bluetooth on 
Prior to this patch, the question "WLAN aktivieren?" would show
after you turned it on, and while it is loading; this patch
merely addresses this issue and changes it to "WLAN wird aktiviert",
which is consistent with the message showing up when turning it off.

Likewise for turning Bluetooth on.

Change-Id: Ic91143836a85751c39839daae720ac03b174bfde
 2012-05-27 10:58:31 +02: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
a56e2362b1 Import translations. DO NOT MERGE 
Change-Id: Ia98a540aa471fa330bfa066330d0e48e058f4798
 2012-05-25 14:48:17 -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
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
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 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
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