PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,087 Commits 1 Branch 0 Tags
903dd8ac93b499264cfff39c40955b5d6ce01ded
Commit Graph

2087 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jaikumar Ganesh
903dd8ac93 New strings for Bluetooth 
This is for the user dialog for incoming BT requests.

Change-Id: Ifa8f8e9e00861c65cf1d2f0520d072935b845785
 2011-08-02 16:09:36 -07:00
The Android Automerger
4c0753a7db merge in gingerbread-release history after reset to gingerbread 2011-06-16 17:29:47 -07:00
Eric Fischer
5bdc3e9139 Import revised Croatian translations. 
Change-Id: Ib0067e98d8e3ce35d5e2868e61a8ad3680c62f1e
 2011-06-15 12:09:02 -07:00
The Android Automerger
c4496591d3 merge in gingerbread-release history after reset to gingerbread 2011-06-06 15:00:36 -07:00
Jaikumar Ganesh
015788ca92 Merge "Import translations for cherry-picked Bluetooth changes." into gingerbread 2011-05-27 13:28:57 -07:00
Jaikumar Ganesh
eddb21a2eb Merge "Changes for API of Bluetooth Discoverability. DO NOT MERGE" into gingerbread 2011-05-27 13:28:49 -07:00
Jaikumar Ganesh
c955d8ee1d Merge "Allow users to change the length of BT disoverability. DO NOT MERGE" into gingerbread 2011-05-27 13:28:41 -07:00
Eric Fischer
afe7b0466a Import translations for cherry-picked Bluetooth changes. 
Change-Id: I03caaf58d9fd357801c05ae99b6131df992e7bdf
 2011-05-27 12:46:07 -07:00
Jaikumar Ganesh
32c7a774f5 Changes for API of Bluetooth Discoverability. DO NOT MERGE 
1. Apps can ask for any time between 0 and 3600 secs
2. O implies always discoverable
3. Any invalid values will default to the default - 120 secs.
A dialog is shown by the system to the users to accept the change
in discoverability values.

Change-Id: I34ebd907656a87508b0f0b1a4bce78134edcaebf
 2011-05-27 10:32:18 -07:00
Chris Wren
cdd9d033b0 Allow users to change the length of BT disoverability. DO NOT MERGE 
It can set to be two minues, five minutes, an hour, or forever discoverable.
The default is 120 secs.
This addresses the internal bug 2413429:
	http://b/issue?id=2413429
and external issue 6348:
	http://code.google.com/p/android/issues/detail?id=6348

Original Author: Chris Wren <crwen@google.com>
Modifications done by: Jaikumar Ganesh<jaikumar@google.com>

Change-Id: Ie12e56ac41aa01a161d263c7525b6e021d4eeb1f
 2011-05-27 10:27:14 -07:00
The Android Automerger
5f15f45d76 merge in gingerbread-release history after reset to gingerbread 2011-05-26 21:28:34 -07:00
sy310.choi
95364e4af3 Allow alternate string to be used for min_number 
"MSID" can be shown instead of "MIN" if config_msid_enable
is set to true.

Change-Id: I6d072a5db9a5b46b17a57257221e109ba9a86698
 2011-05-26 10:45:07 -07:00
The Android Automerger
859683148b merge in gingerbread-release history after reset to gingerbread 2011-05-13 14:27:44 -07:00
Eric Fischer
7c284c2c62 Import revised translations. DO NOT MERGE 
Change-Id: I56239c7b2a936acc9b93b8592a2a04e42a55458b
 2011-04-27 13:53:57 -07:00
Simon Wilson
37063d6adf DO NOT MERGE Clarify additional system update string length/usage 
Change-Id: I627c3d50de1af23a620fe6ca3abac03ad3aa7d49
 2011-04-11 12:38:54 -07:00
Eric Fischer
0aa34b70d0 Reimport Settings translations. DO NOT MERGE 
Change-Id: I90c528fe4f87a3f53875eae9f98b2a6aaa4d1b6a
 2011-04-06 13:47:49 -07:00
Simon Wilson
bcb8ec76e8 DO NOT MERGE Put additional update package names in config.xml 
Prevents them from being duplicated to other language resources,
which in turn prevents the overlay from working. This fixes the
bug where we see a blank menu item in Settings->About phone
when the non-default language is selected.

Change-Id: I73056716156c580606433bb63abfdd35c1b9892a
 2011-04-06 13:47:27 -07:00
Eric Fischer
5efe251f40 Revert "Import revised translations. DO NOT MERGE" 
This reverts commit 955ab98f03.

Bug 4204088 requires that these strings not be translated.

Change-Id: I98044cc669a9ee70a8892123a05c0fc33599d404
 2011-04-06 13:46:58 -07:00
Eric Fischer
fcb089c942 Merge "Reimport Settings translations. DO NOT MERGE" into gingerbread 2011-04-01 16:52:28 -07:00
Simon Wilson
ca572fb64b Merge "DO NOT MERGE Put additional update package names in config.xml" into gingerbread 2011-04-01 16:47:22 -07:00
Eric Fischer
3ac5c8cfd2 Reimport Settings translations. DO NOT MERGE 
Change-Id: I90c528fe4f87a3f53875eae9f98b2a6aaa4d1b6a
 2011-04-01 16:42:38 -07:00
Eric Fischer
b4bd78f523 Revert "Import revised translations. DO NOT MERGE" 
This reverts commit 955ab98f03.

Bug 4204088 requires that these strings not be translated.

Change-Id: I98044cc669a9ee70a8892123a05c0fc33599d404
 2011-04-01 16:13:11 -07:00
Simon Wilson
5014f281d7 DO NOT MERGE Put additional update package names in config.xml 
Prevents them from being duplicated to other language resources,
which in turn prevents the overlay from working. This fixes the
bug where we see a blank menu item in Settings->About phone
when the non-default language is selected.

Change-Id: I73056716156c580606433bb63abfdd35c1b9892a
 2011-04-01 13:59:32 -07:00
The Android Automerger
bc294b551d merge in gingerbread-release history after reset to gingerbread 2011-04-01 13:28:16 -07:00
The Android Automerger
b49792e1a4 merge in gingerbread-release history after reset to gingerbread 2011-03-30 18:33:05 -07:00
Eric Fischer
955ab98f03 Import revised translations. DO NOT MERGE 
Change-Id: Ic2e2fd3330cb069f55054e08aad153c1b342e0a4
 2011-03-29 10:58:24 -07:00
The Android Automerger
4bc6021abf merge in gingerbread-release history after reset to gingerbread 2011-03-28 16:31:26 -07:00
The Android Automerger
84283381b3 merge in gingerbread-release history after reset to gingerbread 2011-03-28 05:44:08 -07:00
The Android Automerger
4a85487c14 merge in gingerbread-release history after reset to gingerbread 2011-03-25 22:26:02 -07:00
Park Sanghyun
e5da8565ca DO NOT MERGE Add support for additional System Update menu item 
Change-Id: I21bf87b5d2805da672c0617a098258e0e2b78915
 2011-03-25 19:18:01 -07:00
The Android Automerger
f23fdcfc40 merge in gingerbread-release history after reset to gingerbread 2011-03-25 14:32:35 -07:00
The Android Automerger
4d3b3b6bc5 merge in gingerbread-release history after reset to gingerbread 2011-03-25 06:04:51 -07:00
The Android Automerger
ae21674907 merge in gingerbread-release history after reset to gingerbread 2011-03-24 08:49:17 -07:00
The Android Automerger
c735b0934a merge in gingerbread-release history after reset to gingerbread 2011-03-23 05:43:33 -07:00
The Android Automerger
39f39109c0 merge in gingerbread-release history after reset to gingerbread 2011-03-22 13:10:40 -07:00
The Android Automerger
fc887fffe8 merge in gingerbread-release history after reset to gingerbread 2011-03-22 05:43:42 -07:00
The Android Automerger
7fc53428fb merge in gingerbread-release history after reset to gingerbread 2011-03-21 05:42:43 -07:00
The Android Automerger
b1482f06dd merge in gingerbread-release history after reset to gingerbread 2011-03-18 17:35:45 -07:00
Eric Fischer
c4eeeb29c5 Import revised translations. DO NOT MERGE 
Change-Id: I512bfadfc427f0676bce9e79c20babe006324ca1
 2011-03-18 15:17:01 -07:00
The Android Automerger
153ab94502 merge in gingerbread-release history after reset to gingerbread 2011-03-18 10:42:03 -07:00
The Android Automerger
8250810b23 merge in gingerbread-release history after reset to gingerbread 2011-03-17 05:44:04 -07:00
TK MUN
e0e845fee6 DO NOT MERGE Do not allow shortcut for "4G Settings" 
Settings shortcuts are only for the modules inside the settings
application. The pathclassloader is /system/app/Settings.apk for
all the settings shortcuts. Since 4G settings is outside of
Settings.apk, we cannot support a shortcut for this.

Change-Id: I1b5523618ef5e8eea8535793f3a983e6ba21d551
 2011-03-16 18:10:28 -07:00
The Android Automerger
4d146a4028 merge in gingerbread-release history after reset to gingerbread 2011-03-16 05:43:54 -07:00
The Android Automerger
c538eece94 merge in gingerbread-release history after reset to gingerbread 2011-03-14 22:34:00 -07:00
The Android Automerger
074adca729 merge in gingerbread-release history after reset to gingerbread 2011-03-12 11:56:24 -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
The Android Automerger
39544fce59 merge in gingerbread-release history after reset to gingerbread 2011-03-11 10:35:43 -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
The Android Automerger
8d36266ffe merge in gingerbread-release history after reset to gingerbread 2011-03-09 08:54:05 -08:00
The Android Automerger
5f82f5ac4d merge in gingerbread-release history after reset to gingerbread 2011-03-07 16:40:15 -08:00