PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,828 Commits 1 Branch 0 Tags
783be0a24f328d7e781b5765b7688c55fb24c89c
Commit Graph

3828 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Irfan Sheriff
f5fe437842 Merge "Fix numeric strings to not be translated" 2011-03-11 17:31:05 -08:00
Mike Lockwood
e6c7e45fdb DO NOT MERGE: IUsbManager hasDefaults() and clearDefaults() no longer take UID parameter 
Bug: 4061035

Change-Id: Idfec53b1da7b9b981c1c762468a3f69f78fedd7a
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-03-11 19:19:27 -05:00
Irfan Sheriff
6c7cd3bcba Fix numeric strings to not be translated 
Bug: 4086518
Change-Id: Id6cc83cfcdaea6d9658dd6cc59f94ee6a34662d6
 2011-03-11 15:42:09 -08:00
Amith Yamasani
be606d6d0e Fix possible NPE when Screen settings is launched quickly in succession. 
Bug: 3368440
Change-Id: Icbcd0474978e20a055ec27f5960e9a4b98f4a68a
 2011-03-11 13:55:29 -08:00
Daisuke Miyakawa
d4fa73f877 Stop using Switch. 
Bug: 4082929
Change-Id: Idcf8f891e9e3257ed7b0a2727fe11fe540c8a141
 2011-03-11 12:14:48 -08:00
Eric Fischer
04d9894827 am 33c5915c: (-s ours) am 91d0b304: Import revised translations. DO NOT MERGE 
* commit '33c5915cb6a02c0dad294d3055cdfb78a8b64244':
  Import revised translations.  DO NOT MERGE
 2011-03-10 14:49:18 -08:00
Eric Fischer
33c5915cb6 am 91d0b304: Import revised translations. DO NOT MERGE 
* commit '91d0b3046171117164c9400f9f45f12d4c0a69c7':
  Import revised translations.  DO NOT MERGE
 2011-03-10 14:47:54 -08:00
Eric Fischer
91d0b30461 Import revised translations. DO NOT MERGE 
Change-Id: I2f3eb8d6b9e3e8c06dbaaa372050b6688b9c0e2b
 2011-03-10 14:26:33 -08:00
Eric Fischer
89b87f828a am 52d769a7: (-s ours) am 5ce140c1: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit '52d769a7c30ee9bb884436a1ced0ef5c71812f70':
  Import revised translations.  DO NOT MERGE
 2011-03-10 13:53:55 -08:00
Eric Fischer
52d769a7c3 am 5ce140c1: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit '5ce140c13520e3adca370b3474ebf0c83c097bd1':
  Import revised translations.  DO NOT MERGE
 2011-03-10 13:46:21 -08:00
Eric Fischer
5ce140c135 Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 2011-03-10 11:40:28 -08:00
Eric Fischer
0198a30b6f Import revised translations. DO NOT MERGE 
Change-Id: I3e2bd58983b329ea0e200f138a5d861e16ce6400
 2011-03-10 11:27:50 -08:00
TK MUN
b098f5d6bd am 63cc3b92: (-s ours) am f018bd8c: (-s ours) am 36469186: DO NOT MERGE WiMAX settings menu 
* commit '63cc3b92f98758116613a5984ecd4aa65d050bbe':
  DO NOT MERGE WiMAX settings menu
 2011-03-09 23:17:01 -08:00
TK MUN
63cc3b92f9 am f018bd8c: (-s ours) am 36469186: DO NOT MERGE WiMAX settings menu 
* commit 'f018bd8cf3c27cf6ee8dc41c673e9d91b005c8a3':
  DO NOT MERGE WiMAX settings menu
 2011-03-09 23:14:51 -08:00
TK MUN
f018bd8cf3 am 36469186: DO NOT MERGE WiMAX settings menu 
* commit '36469186b7459d13688a2ca1c2316dbf172794dd':
  DO NOT MERGE WiMAX settings menu
 2011-03-09 23:11:59 -08:00
TK MUN
36469186b7 DO NOT MERGE WiMAX settings menu 
1. Show the 4G menu.
2. Show the 4G MAC address
3. Execute 4G setting apk.

Change-Id: Id9d5551e5bfdb7d79279de42b36ec0ebccdf6099
Signed-off-by: TK MUN <tk.mun@samsung.com>
 2011-03-09 23:02:21 -08:00
Jake Hamby
9fbaf432bd am 90222cf6: am f3448d1b: Merge "Improve Bluetooth tethering UI usability." into honeycomb-mr1 
* commit '90222cf6a8adbd5ae5be74c91a13a63f183a001e':
  Improve Bluetooth tethering UI usability.
 2011-03-09 19:47:44 -08:00
Jake Hamby
90222cf6a8 am f3448d1b: Merge "Improve Bluetooth tethering UI usability." into honeycomb-mr1 
* commit 'f3448d1bfda817ccb28996d3dcf5cf8791ece6ce':
  Improve Bluetooth tethering UI usability.
 2011-03-09 19:45:54 -08:00
Jake Hamby
f3448d1bfd Merge "Improve Bluetooth tethering UI usability." into honeycomb-mr1 2011-03-09 19:43:38 -08:00
Jim Miller
5451db4c4e am 615e0576: am e924ecb6: Merge "Fix 3510307: Hide PIN passwords in ConfirmLockPassword" into honeycomb-mr1 
* commit '615e05761c8ad30cfc5f827c020d6c5a79ed5c01':
  Fix 3510307: Hide PIN passwords in ConfirmLockPassword
 2011-03-09 15:49:23 -08:00
Jim Miller
615e05761c am e924ecb6: Merge "Fix 3510307: Hide PIN passwords in ConfirmLockPassword" into honeycomb-mr1 
* commit 'e924ecb6114b24d326e8a9c5f4a12179e7f5c5c2':
  Fix 3510307: Hide PIN passwords in ConfirmLockPassword
 2011-03-09 15:46:18 -08:00
Jim Miller
e924ecb611 Merge "Fix 3510307: Hide PIN passwords in ConfirmLockPassword" into honeycomb-mr1 2011-03-09 15:44:23 -08:00
Jim Miller
025269df25 Fix 3510307: Hide PIN passwords in ConfirmLockPassword 
Change-Id: I9389cc37f013fe027df7a0eb0035fc0db8678792
 2011-03-09 14:59:10 -08:00