Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,208 Commits 1 Branch 0 Tags
f0acba598a70dc02242519a93580638701b13caa
Commit Graph

3538 Commits

Author SHA1 Message Date
Eric Fischer
1b2e4b8e14 Import translations. DO NOT MERGE 
Change-Id: I45c903dfad7e0b599f9b29b3c4f472d3daf9b25d
 2012-05-30 13:37:01 -07:00
Amith Yamasani
622824ad00 am 6eddf3eb: am 8242901e: Merge "Adjust layout to avoid clipping." into jb-dev 
* commit '6eddf3eb1ab28d252d49022774fc7e9fcde5f252':
  Adjust layout to avoid clipping.
 2012-05-30 10:00:18 -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
Jeff Brown
92c40a213b am 7a5a3b9c: am 66a55562: Merge "Make string bigger for localization." into jb-dev 
* commit '7a5a3b9c4e397383b192bd9a61b904f53e93381e':
  Make string bigger for localization.
 2012-05-29 18:14:05 -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
Jeff Brown
693d7b7449 Make string bigger for localization. 
Bug: 6575551
Change-Id: Ia13043325bc9fe28e36a0047dba5313900ab91d2
 2012-05-29 17:26:27 -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
3e87ee0261 am 27143c0b: am 16bf0e0e: Merge "Surface metered networks as "Mobile hotspots."" into jb-dev 
* commit '27143c0b54638f29dd0aa0095ff2505e3adac827':
  Surface metered networks as "Mobile hotspots."
 2012-05-29 15:04:52 -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
00d60cf723 Import translations. DO NOT MERGE 
Change-Id: I46077aeea1d55b35eddd45138c09d25bf3df4aa6
 2012-05-29 14:15:59 -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
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
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
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
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
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
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
2be0928f66 am 33089ad7: am 115ae0cf: Change wifi-on-but-no-networks string 
* commit '33089ad70509d63fa51b3aff4ae88813d027d882':
  Change wifi-on-but-no-networks string
 2012-05-22 11:08:35 -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
alanv
a6a3f8c892 am 8fdb0008: am 0aa7c4f1: Fixed all Accessibility lint warnings in Settings app. 
* commit '8fdb00085ce79672ed154389b7a4e05bf955f3ee':
  Fixed all Accessibility lint warnings in Settings app.
 2012-05-21 18:31:47 -07: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
6fcf504073 am f2cf6d65: am 0901a3c2: Merge "Update the All Apps PagerTabStrip text appearance." into jb-dev 
* commit 'f2cf6d6508b123b53006d97f8add167b30007662':
  Update the All Apps PagerTabStrip text appearance.
 2012-05-21 16:07:15 -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
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
Jean-Baptiste Queru
fad55d5da7 am ad7f7cc5: am c0653a12: Merge "Expandable NumberPicker width in bytesPicker dialog" 
* commit 'ad7f7cc547630b323a1cec70439590e51243d2c7':
  Expandable NumberPicker width in bytesPicker dialog
 2012-05-21 14:32:13 -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
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
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
Svetoslav Ganov
8d43aeae03 Merge "Updating the checkbox state to match the title." into jb-dev 2012-05-21 14:09:27 -07:00