PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,168 Commits 1 Branch 0 Tags
6807ecbfad92c9af77b66ca849c1afbc57ae960c
Commit Graph

4168 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Fischer
b755002696 am 43f36859: (-s ours) am dd68cde8: am 24d61952: Import revised translations. DO NOT MERGE 
* commit '43f3685910399716ffea76a91e6116a6ce37b3dc':
  Import revised translations.  DO NOT MERGE
 2011-03-16 17:12:09 -07:00
Eric Fischer
43f3685910 am dd68cde8: am 24d61952: Import revised translations. DO NOT MERGE 
* commit 'dd68cde8fe7195ec99f973f550dfb2737e9c630d':
  Import revised translations.  DO NOT MERGE
 2011-03-16 17:09:45 -07:00
Eric Fischer
dd68cde8fe am 24d61952: Import revised translations. DO NOT MERGE 
* commit '24d6195266848c20cb0e2b0a737b9c2871f68346':
  Import revised translations.  DO NOT MERGE
 2011-03-16 17:08:19 -07:00
Eric Fischer
24d6195266 Import revised translations. DO NOT MERGE 
Change-Id: Ia5e71db67c6c9985d6b0c72c482cc45cd0563927
 2011-03-16 17:01:59 -07:00
Eric Fischer
54cf703526 am 79c42480: (-s ours) am d1a2e38a: am d2f68160: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit '79c424805d5710994795797033cdfe901f5e7292':
  Import revised translations.  DO NOT MERGE
 2011-03-16 11:00:30 -07:00
Eric Fischer
79c424805d am d1a2e38a: am d2f68160: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit 'd1a2e38ae2c8d64b7fadc979ac7a58c138809745':
  Import revised translations.  DO NOT MERGE
 2011-03-16 10:54:24 -07:00
Eric Fischer
d1a2e38ae2 am d2f68160: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit 'd2f68160437d1e84cd6d320fbad3e84e8955099a':
  Import revised translations.  DO NOT MERGE
 2011-03-16 10:51:39 -07:00
Eric Fischer
d2f6816043 Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 2011-03-16 10:21:43 -07:00
Eric Fischer
ef32822861 Import revised translations. DO NOT MERGE 
Change-Id: I14c07d29f1cea3cedb6e9b0492d549e692c72612
 2011-03-16 10:14:34 -07:00
The Android Automerger
4d146a4028 merge in gingerbread-release history after reset to gingerbread 2011-03-16 05:43:54 -07:00
Justin Ho
06fd4b0681 am 7f9f83fc: am dce7719c: am dc4f7ac4: Merge "Flip the icon states for Bluetooth profile auto-connect settings" into honeycomb-mr1 
* commit '7f9f83fc894f46cc55cc1927e33160d3492382bb':
  Flip the icon states for Bluetooth profile auto-connect settings
 2011-03-15 23:50:31 -07:00
Justin Ho
7f9f83fc89 am dce7719c: am dc4f7ac4: Merge "Flip the icon states for Bluetooth profile auto-connect settings" into honeycomb-mr1 
* commit 'dce7719cb86104920ce0305bb4f5971dc18374b3':
  Flip the icon states for Bluetooth profile auto-connect settings
 2011-03-15 23:47:11 -07:00
Justin Ho
dce7719cb8 am dc4f7ac4: Merge "Flip the icon states for Bluetooth profile auto-connect settings" into honeycomb-mr1 
* commit 'dc4f7ac40112f1cace8bb335d12b8164752527d5':
  Flip the icon states for Bluetooth profile auto-connect settings
 2011-03-15 23:44:05 -07:00
Eric Fischer
048c07ae25 am a92c00e9: (-s ours) am 69720655: am 9a81c122: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit 'a92c00e995ae63e938961cecac9984e48bf781e6':
  Import revised translations.  DO NOT MERGE
 2011-03-15 23:34:02 -07:00
Eric Fischer
a92c00e995 am 69720655: am 9a81c122: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit '69720655fdbcffeb34deb03e767007cc20a0f525':
  Import revised translations.  DO NOT MERGE
 2011-03-15 23:31:53 -07:00
Eric Fischer
69720655fd am 9a81c122: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit '9a81c12275501ec7d2163c63a177bacd51938e18':
  Import revised translations.  DO NOT MERGE
 2011-03-15 23:28:53 -07:00
Eric Fischer
f18535a9d1 am 4835f31c: (-s ours) am dbb44b20: Import revised translations. DO NOT MERGE 
* commit '4835f31c7b73ec75525f8108ba510bbae2997a84':
  Import revised translations.  DO NOT MERGE
 2011-03-15 23:26:48 -07:00
Eric Fischer
4835f31c7b am dbb44b20: Import revised translations. DO NOT MERGE 
* commit 'dbb44b2025b680f0df3a0fe049cfb023f7ffab56':
  Import revised translations.  DO NOT MERGE
 2011-03-15 23:23:50 -07:00
Eric Fischer
dbb44b2025 Import revised translations. DO NOT MERGE 
Change-Id: Ifbdca414f22a58d1828780183518c0214f0ce0f6
 2011-03-15 23:14:16 -07:00
Vasu Nori
78252114b4 am 4a1f3569: am 85d1f883: am b24dfbcc: Merge "bug:3514023 fix string formatting" into honeycomb-mr1 
* commit '4a1f356928207333513595487240efe2be302c7e':
  bug:3514023 fix string formatting
 2011-03-15 21:44:14 -07:00
Vasu Nori
4a1f356928 am 85d1f883: am b24dfbcc: Merge "bug:3514023 fix string formatting" into honeycomb-mr1 
* commit '85d1f883150129237fd98173ab345acd259bd2b3':
  bug:3514023 fix string formatting
 2011-03-15 21:42:08 -07:00
Vasu Nori
85d1f88315 am b24dfbcc: Merge "bug:3514023 fix string formatting" into honeycomb-mr1 
* commit 'b24dfbcc35842d5b6ed1f7d23348bada08ae0445':
  bug:3514023 fix string formatting
 2011-03-15 21:37:37 -07:00
Dianne Hackborn
3f5a9b3c4a Merge "Whoops forgot to add this file." 2011-03-15 17:25:29 -07:00
Dianne Hackborn
a9d11a8593 Whoops forgot to add this file. 
Change-Id: Ic040d02e6985bff8c2ee4afea133ff865d252b79
 2011-03-15 17:24:29 -07:00
Amith Yamasani
ef84d1edd8 Merge "Fix possible NPE when Screen settings is launched quickly in succession." 2011-03-15 17:17:53 -07:00
Dianne Hackborn
b9db2c372e Merge "Fix to launch sub-preference activities." 2011-03-15 16:52:50 -07:00
Justin Ho
dc4f7ac401 Merge "Flip the icon states for Bluetooth profile auto-connect settings" into honeycomb-mr1 2011-03-15 16:46:49 -07:00
Gilles Debunne
e2255e2f18 Merge "Unused assets removed from Settings" 2011-03-15 16:24:36 -07:00
Dianne Hackborn
b7258186de Fix to launch sub-preference activities. 
Change-Id: Ie7b5a6737b30159467d5ff5786b22107d73daedc
 2011-03-15 16:23:55 -07:00
Amith Yamasani
f502eaba0a Flip the icon states for Bluetooth profile auto-connect settings 
Bug: 4109035
Change-Id: Idb37a583957eeb8ea4c0b804e7933fd8e9af98e3
 2011-03-15 15:14:48 -07:00
Eric Fischer
9a81c12275 Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 2011-03-15 14:58:35 -07:00
Eric Fischer
74a8594ee9 Import revised translations. DO NOT MERGE 
Change-Id: I4889db13857a44d69b095e8004c407edad9e6756
 2011-03-15 14:49:02 -07:00
Vasu Nori
b24dfbcc35 Merge "bug:3514023 fix string formatting" into honeycomb-mr1 2011-03-15 14:47:32 -07:00
Vasu Nori
75e17aa8cc bug:3514023 fix string formatting 
Change-Id: I1d07e94f3693db09b29c621c5afae1cbaae24674
 2011-03-15 14:44:50 -07:00
Gilles Debunne
c59a3a431c Unused assets removed from Settings 
preview moved from drawable to drawable-mdpi

Change-Id: Id58d2cf38d52483057960b7ef176acf61e84dba3
 2011-03-15 14:43:51 -07:00
Jason parks
eeaa242a34 am 0b9c7ed1: am 8693ba5c: am e481eaf9: Remove logging of the password. 
* commit '0b9c7ed10fdc0fd7e697e737404b5c00f9d35666':
  Remove logging of the password.
 2011-03-15 13:49:24 -07:00
Jason parks
0b9c7ed10f am 8693ba5c: am e481eaf9: Remove logging of the password. 
* commit '8693ba5cdc219929078710bbeac7d7a7d94088b3':
  Remove logging of the password.
 2011-03-15 13:47:36 -07:00
Jason parks
8693ba5cdc am e481eaf9: Remove logging of the password. 
* commit 'e481eaf9618c435ea340a8312ecf8ca8093c7a76':
  Remove logging of the password.
 2011-03-15 13:44:47 -07:00
Jason parks
e481eaf961 Remove logging of the password. 
Change-Id: I2b3595089be8fc1d8c197dfa1ef8783c9dd2cf40
 2011-03-15 15:24:16 -05:00
Eric Fischer
860445b2de Merge "Import revised translations." 2011-03-15 11:57:50 -07:00
Eric Fischer
d503062723 Import revised translations. 
Change-Id: Id09b1bd5cf6247e40b156f0ce7cb850d17687009
 2011-03-15 10:46:16 -07:00
The Android Automerger
c538eece94 merge in gingerbread-release history after reset to gingerbread 2011-03-14 22:34:00 -07:00
Mike Lockwood
175884f388 am d205bfe3: (-s ours) am 61487da6: (-s ours) am e6c7e45f: DO NOT MERGE: IUsbManager hasDefaults() and clearDefaults() no longer take UID parameter 
* commit 'd205bfe361c1de857e8013d6acd36f3f831eb979':
  DO NOT MERGE: IUsbManager hasDefaults() and clearDefaults() no longer take UID parameter
 2011-03-14 17:53:45 -07:00
Mike Lockwood
d205bfe361 am 61487da6: (-s ours) am e6c7e45f: DO NOT MERGE: IUsbManager hasDefaults() and clearDefaults() no longer take UID parameter 
* commit '61487da6ace3c83c71b164edd307a6ea87f9ff0c':
  DO NOT MERGE: IUsbManager hasDefaults() and clearDefaults() no longer take UID parameter
 2011-03-14 17:48:59 -07:00
Eric Fischer
78391ae77f am e88b157a: (-s ours) am 7d3d72ba: (-s ours) Import revised translations. DO NOT MERGE 
* commit 'e88b157a8289802d2b862ae3f0e0adad04921a98':
  Import revised translations.  DO NOT MERGE
 2011-03-14 15:18:37 -07:00
Eric Fischer
e88b157a82 am 7d3d72ba: (-s ours) Import revised translations. DO NOT MERGE 
* commit '7d3d72ba46a33f2b0ea3da880986858663535ed1':
  Import revised translations.  DO NOT MERGE
 2011-03-14 14:28:55 -07:00
Eric Fischer
7d3d72ba46 Import revised translations. DO NOT MERGE 
Change-Id: Ifbdca414f22a58d1828780183518c0214f0ce0f6
 2011-03-14 14:07:45 -07:00
Mike Lockwood
61487da6ac am e6c7e45f: DO NOT MERGE: IUsbManager hasDefaults() and clearDefaults() no longer take UID parameter 
* commit 'e6c7e45fdb5f23462693ea76eeac9489dd5c8dac':
  DO NOT MERGE: IUsbManager hasDefaults() and clearDefaults() no longer take UID parameter
 2011-03-14 13:34:57 -07:00
The Android Automerger
074adca729 merge in gingerbread-release history after reset to gingerbread 2011-03-12 11:56:24 -08:00
Irfan Sheriff
f5fe437842 Merge "Fix numeric strings to not be translated" 2011-03-11 17:31:05 -08:00