Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,203 Commits 1 Branch 0 Tags
fecfa88dd68b408e4e031e01d2f55281fbcc3ed8
Commit Graph

2130 Commits

Author SHA1 Message Date
Peter Ng
a426a5d1c2 am 433bdb75: Merge "data usage color standardization" 
* commit '433bdb751f3cae10b529a272e1b31f26dc72bd11':
  data usage color standardization
 2011-10-18 10:47:46 -07:00
Peter Ng
433bdb751f Merge "data usage color standardization" 2011-10-18 10:45:34 -07:00
Danielle Millett
4c8ef82c27 am 0206fcd3: am 4c9a5fe6: Merge "Fix 5466557: Removed secondary screenlock settings labels" into ics-mr0 
* commit '0206fcd315ce5be67feb98dfcb27572664afc9f8':
  Fix 5466557: Removed secondary screenlock settings labels
 2011-10-18 10:31:45 -07:00
Danielle Millett
0206fcd315 am 4c9a5fe6: Merge "Fix 5466557: Removed secondary screenlock settings labels" into ics-mr0 
* commit '4c9a5fe6a3765ecd7617b611463766cd72706458':
  Fix 5466557: Removed secondary screenlock settings labels
 2011-10-18 10:29:48 -07:00
Danielle Millett
4c9a5fe6a3 Merge "Fix 5466557: Removed secondary screenlock settings labels" into ics-mr0 2011-10-18 10:27:41 -07:00
Justin Ho
4f6038f7d0 am ba24671c: am 6ab0c12c: Updated bandwidth assets 
* commit 'ba24671c2c601ba71bde2cf72b252862ccd745d5':
  Updated bandwidth assets
 2011-10-18 09:34:37 -07:00
Justin Ho
ba24671c2c am 6ab0c12c: Updated bandwidth assets 
* commit '6ab0c12ca417aef49d2c287b8d215c9e66ae154d':
  Updated bandwidth assets
 2011-10-18 09:33:09 -07:00
Justin Ho
6ab0c12ca4 Updated bandwidth assets 
Change-Id: Ia180ff9dfb020ab2f3528638f522c38f11ea010f
 2011-10-17 18:09:43 -07:00
Danielle Millett
80412e70db Fix 5466557: Removed secondary screenlock settings labels 
Removed summary line from the screen lock picker and displaying
the about screen for face unlock every time instead of just the
first time

Change-Id: Iac572d2366acf28d32e632e8dcdde63475641e39
 2011-10-17 20:57:17 -04:00
Peter Ng
0c0e41b17f data usage color standardization 
Change-Id: I7c46ecd5b0730dc524bc788cb941493f3534cb20
 2011-10-17 17:39:16 -07:00
Justin Ho
1035de60eb am 4a451ba8: am 7a33de4c: Merge "Update wifi icons" into ics-mr0 
* commit '4a451ba8f1a098e516e9dc77f6cf8166990c88a2':
  Update wifi icons
 2011-10-17 16:36:53 -07:00
Justin Ho
4a451ba8f1 am 7a33de4c: Merge "Update wifi icons" into ics-mr0 
* commit '7a33de4c004c9093682b54afa3deab2fdf9ed5f6':
  Update wifi icons
 2011-10-17 16:34:41 -07:00
Justin Ho
7a33de4c00 Merge "Update wifi icons" into ics-mr0 2011-10-17 16:33:07 -07:00
Justin Ho
e8fb5b8aa1 Update wifi icons 
Change-Id: I7a82b96df6c44bc17d70631ef36dc5ad733515c4
 2011-10-17 16:04:31 -07:00
John Huang
fe342db0b0 am f9389c7e: am 7b21e97c: Merge "Add "Roaming protocol" to APN editor." into ics-mr0 
* commit 'f9389c7ef011010658b854c4040456cf9ca3f03c':
  Add "Roaming protocol" to APN editor.
 2011-10-17 15:24:02 -07:00
John Huang
f9389c7ef0 am 7b21e97c: Merge "Add "Roaming protocol" to APN editor." into ics-mr0 
* commit '7b21e97c2a213afbb7ab0d2247e751e8194f89fc':
  Add "Roaming protocol" to APN editor.
 2011-10-17 15:22:28 -07:00
John Huang
7b21e97c2a Merge "Add "Roaming protocol" to APN editor." into ics-mr0 2011-10-17 15:20:28 -07:00
Claudia de Veaux
7056c28475 am 1aa9c677: Merge "Restore Wi-Fi spelling; change "extra-large" to "huge". Bugs: 5467607, 5163232" 
* commit '1aa9c677832464604fea45ecd100d8f604f150ec':
  Restore Wi-Fi spelling; change "extra-large" to "huge". Bugs: 5467607, 5163232
 2011-10-17 14:22:45 -07:00
Claudia de Veaux
1aa9c67783 Merge "Restore Wi-Fi spelling; change "extra-large" to "huge". Bugs: 5467607, 5163232" 2011-10-17 14:20:29 -07:00
Eric Fischer
6342580fb7 am e5bfb640: Fix capitalization of Face Unlock. 
* commit 'e5bfb640fbf543494e45c4db139477b262879d26':
  Fix capitalization of Face Unlock.
 2011-10-17 13:23:12 -07:00
Claudia de Veaux
7dc36b90ce Restore Wi-Fi spelling; change "extra-large" to "huge". 
Bugs: 5467607, 5163232

Change-Id: Ia0085a085b6f2d1ec9d5a00d08dee4bb38b10f22
 2011-10-17 12:54:20 -07:00
Eric Fischer
e5bfb640fb Fix capitalization of Face Unlock. 
Bug 5447766

Change-Id: I4a91bd00bb09251af170ca054a8aa0bd88c5eec0
 2011-10-17 11:28:34 -07:00
John Huang
d0de427f9a Add "Roaming protocol" to APN editor. 
Field already exists in the APN database.  Now it is user updatable.
Only enable it on CDMA for this release (means it is not really user
visible, but available for testing purposes).  Will revisit enabling
for all in a future release.

Bug: 5420680
Change-Id: Ia2c551c48ae9ce47c57ad36ec73d152441a27284
 2011-10-16 14:35:00 -07:00
Jeff Sharkey
d881ffcf45 am 68da8364: Merge "Toast when finished pattern or password setup." into ics-mr0 
* commit '68da83649e8f8488275677d3b0e0995a230513b4':
  Toast when finished pattern or password setup.
 2011-10-13 14:08:38 -07:00
Jeff Sharkey
68da83649e Merge "Toast when finished pattern or password setup." into ics-mr0 2011-10-13 12:37:47 -07:00
Jeff Sharkey
e4599058dd Toast when finished pattern or password setup. 
Bug: 5443781
Change-Id: I599ccbb9c535396e05a2a22ab6d3ef302fb9c623
 2011-10-13 11:33:43 -07:00
Jim Miller
d11aed5925 am dccda985: Fix 5444675: Don\'t show "Vibrate on touch" in password lock options 
* commit 'dccda985675dc8b116f43fc18cea3b6e40c8aa6c':
  Fix 5444675: Don't show "Vibrate on touch" in password lock options
 2011-10-12 21:11:45 -07:00
Jim Miller
dccda98567 Fix 5444675: Don't show "Vibrate on touch" in password lock options 
Don't show "Vibrate on touch" for password lock screen options because
vibrate is controlled by the IME setting in this case.

Change-Id: Idc8c73048a0c396037457638faed02331ed104f3
 2011-10-12 17:46:17 -07:00
Jeff Sharkey
6be91d3811 am 1247d192: Merge "Add disclaimer string." 
* commit '1247d19204f6eb1e8d3c560c8ba8e1ef900a897c':
  Add disclaimer string.
 2011-10-10 17:22:48 -07:00
Jeff Sharkey
1247d19204 Merge "Add disclaimer string." 2011-10-10 17:20:53 -07:00
Jeff Sharkey
cad3b87067 Add disclaimer string. 
Bug: 5337015
Change-Id: Iabeb8490ed51f77e98f3c5317e31d30e4e780178
 2011-10-10 17:04:12 -07:00
Eric Fischer
c44ae7a14f am b6acb953: Merge "Import revised translations." 
* commit 'b6acb95370f62d1cc1a3b78428b70b123b638032':
  Import revised translations.
 2011-10-10 11:51:37 -07:00
Eric Fischer
b6acb95370 Merge "Import revised translations." 2011-10-10 11:48:47 -07:00
Eric Fischer
8963a6493d Import revised translations. 
Change-Id: I064a55b4923fcc09ae2172e1b21cb81eee0db653
 2011-10-10 11:25:09 -07:00
Peter Ng
7691a6c502 am f1cd9a00: Merge "Data usage grid asset updates" 
* commit 'f1cd9a00452267601797a51913a64770ed1a40c2':
  Data usage grid asset updates
 2011-10-07 13:28:24 -07:00
Peter Ng
f1cd9a0045 Merge "Data usage grid asset updates" 2011-10-07 12:32:13 -07:00
Peter Ng
fad1bf3ce7 Data usage grid asset updates 
Change-Id: I232e784c8552f4f185814f4d5b8082894438c500
 2011-10-06 18:35:13 -07:00
Romain Guy
b1f0cad4fe am 3d32d00e: Fix string for hdpi devices 
* commit '3d32d00edd41aaedd426f2ab1a2309a8cd8a03b6':
  Fix string for hdpi devices
 2011-10-06 15:18:41 -07:00
Romain Guy
3d32d00edd Fix string for hdpi devices 
Change-Id: Icfad64a4c7df0a6c68336cc361e60ec626b5d735
 2011-10-06 14:37:34 -07:00
Jeff Sharkey
38914c9ad9 am 051cda2e: Merge "Third time is the charm." 
* commit '051cda2e46d7b41d6216fe44ce7e0af35e34e925':
  Third time is the charm.
 2011-10-05 22:58:36 -07:00
Jeff Sharkey
051cda2e46 Merge "Third time is the charm." 2011-10-05 22:57:19 -07:00
Jeff Sharkey
3a546ebacb Third time is the charm. 
Change-Id: Ic58a7f80e3be0c5d1a0531727f0abac0c8f96fba
 2011-10-05 22:54:52 -07:00
Jeff Sharkey
49a2d9bfc9 am 3a5a82c7: Merge "Fix string breakage." 
* commit '3a5a82c756f8001fabe1ddd158825565354425a6':
  Fix string breakage.
 2011-10-05 22:16:17 -07:00
Jeff Sharkey
3a5a82c756 Merge "Fix string breakage." 2011-10-05 22:14:24 -07:00
Jeff Sharkey
82bf63496b Fix string breakage. 
Change-Id: Ib81c1bfd9ef49f7e410887ab5c22e3e3cc31ca22
 2011-10-05 22:13:02 -07:00
Jeff Sharkey
da5bc13f8c am 0c927302: Merge "Adjust data usage strings." 
* commit '0c927302d7b05c4c9bc6a5d28669ed57e7804388':
  Adjust data usage strings.
 2011-10-05 22:01:50 -07:00
Jeff Sharkey
0c927302d7 Merge "Adjust data usage strings." 2011-10-05 21:59:42 -07:00
Danielle Millett
5d962052ba am c7a15ec8: Merge "Update string to match wireframe" 
* commit 'c7a15ec8e8fb30fe2b613b98c61d66e4ecc3960c':
  Update string to match wireframe
 2011-10-05 19:06:08 -07:00
Danielle Millett
76d9af0a87 Update string to match wireframe 
Change-Id: If406ab1364451e28352d120b473a7a58a124bff4
 2011-10-05 21:49:03 -04:00
Jeff Sharkey
d86e9b207a Adjust data usage strings. 
Bug: 5337015
Change-Id: I55c7ea8175945a6d799845e196299d45bb412403
 2011-10-05 17:44:12 -07:00