PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,041 Commits 1 Branch 0 Tags
9cb97c44eefff70fd0fc1c1b8dd7ba87f15ba9e6
Commit Graph

2041 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ryan PC Gibson
9cb97c44ee Merge "DO NOT MERGE Fix crash when device is null in Connection Access Cancel." into gingerbread 2011-08-30 09:04:44 -07:00
Jaikumar Ganesh
ba69d3bd7d DO NOT MERGE Fix crash when device is null in Connection Access Cancel. 
Bug: 5203970
Change-Id: Ic0604174c0ac9b40685e883f37e1a54070ee0463
 2011-08-23 15:11:35 -07:00
Eric Fischer
a18484fb38 Import new translations. 
Change-Id: I7b45aed12328a25b81878f29364bcc837c956509
 2011-06-27 14:50:05 -07:00
Jaikumar Ganesh
7ab66973a9 Merge "DO NOT MERGE Show user dialog for BT." into gingerbread 2011-06-21 11:23:47 -07:00
Jaikumar Ganesh
7bfa6dca07 DO NOT MERGE Show user dialog for BT. 
Show user dialog for incoming BT connection
requests from unknown devices.

Contribution by: Wei (Matthew) Xie

Change-Id: I7e9e8bbbd8808a7569f84d213fa3d716f7f5bc80
 2011-06-20 19:30:21 -07:00
Jaikumar Ganesh
c6f144106c Merge "Remove CHAR LIMIT from string to fix build." into gingerbread 2011-06-20 16:19:35 -07:00
Jaikumar Ganesh
a5ff907328 Remove CHAR LIMIT from string to fix build. 
Change-Id: I590126db92329efcc6aea95bb97bb9d053905276
 2011-06-20 16:14:11 -07:00
Jaikumar Ganesh
2c85966dd8 Merge "New strings for Bluetooth" into gingerbread 2011-06-20 15:29:43 -07:00
Jaikumar Ganesh
0f44329c74 New strings for Bluetooth 
This is for the user dialog for incoming BT requests.

Change-Id: Ifa8f8e9e00861c65cf1d2f0520d072935b845785
 2011-06-20 15:10:53 -07:00
Eric Fischer
5bdc3e9139 Import revised Croatian translations. 
Change-Id: Ib0067e98d8e3ce35d5e2868e61a8ad3680c62f1e
 2011-06-15 12:09:02 -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
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
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
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
Eric Fischer
955ab98f03 Import revised translations. DO NOT MERGE 
Change-Id: Ic2e2fd3330cb069f55054e08aad153c1b342e0a4
 2011-03-29 10:58:24 -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
Eric Fischer
c4eeeb29c5 Import revised translations. DO NOT MERGE 
Change-Id: I512bfadfc427f0676bce9e79c20babe006324ca1
 2011-03-18 15:17:01 -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
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
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
Lorenzo Colitti
f4393101f8 Merge "Support configuring the protocol in APN settings." into gingerbread 2011-03-03 17:03:45 -08:00
Mike Lockwood
0552d33664 DO NOT MERGE: InstalledAppDetails: "Clear defaults" button now clears USB service settings 
The USB service caches the preferred activity preferences for USB devices
and accessories and allows permission to access the hardware based on the
user's selection.  The "Clear defaults" button can now be used to clear
these settings.

Change-Id: If865df98214506cf2f1e35c8c6a3dbe319b125f2
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-03-02 00:00:09 -08:00
Lorenzo Colitti
a52c5698ca Support configuring the protocol in APN settings. 
Bug: 3333633
Change-Id: I0797cd97074fe1b8a1318168b86fe4627488215a
 2011-02-22 01:42:32 -08:00
Eric Fischer
bd0448185f Import revised translations. DO NOT MERGE 
Change-Id: I8e7d2652c85f2bd516881e11283af62ee760adb1
 2011-02-14 17:25:07 -08:00
Amith Yamasani
aae04e43ec Prevent monkeys from USB tethering. It disconnects the test host. DO NOT MERGE. 
Bug: 3443747
Change-Id: Ied9c842e306e299fec7cd201415e0cfad0d29630
 2011-02-10 17:19:11 -08:00
Eric Fischer
47d2ecd0c4 Import revised translations. DO NOT MERGE 
Change-Id: If53b83d77929ba02915eeafd3c614599316cca1e
 2011-02-07 13:38:01 -08:00
Eric Fischer
93580e222c Import revised translations. DO NOT MERGE 
Change-Id: I7189d018da1a65d6e37b16353b1133b6a51d0df1
 2011-01-31 12:25:49 -08:00
Eric Fischer
5a2bb8c0dc Import revised translations. DO NOT MERGE 
Change-Id: Ic85518cac2e5c92d829bc71da778b68259524624
 2011-01-28 13:21:54 -08:00
Eric Fischer
95112e5b98 Import revised translations. DO NOT MERGE 
Change-Id: I64435ed3b620c5e748b0f15017d548eadf7adbd5
 2011-01-27 14:04:11 -08:00
Eric Fischer
6418d37367 Import translations for additional languages. 
Change-Id: Ic94b9ae9229478ad7d0a49d3af9a954b50c8fdf5
 2011-01-06 10:39:31 -08:00
Nick Pelly
c1286804cc Merge "Update Settings for new NfcAdapter.getDefaultAdapter(Context)" into gingerbread 2010-12-10 17:18:54 -08:00
Nick Pelly
267419ff8b Update Settings for new NfcAdapter.getDefaultAdapter(Context) 
Change-Id: I3321d9ebd90313f98664d66b53bb36690808911a
 2010-12-09 19:39:58 -08:00
Eric Fischer
99d2471d8d Import revised translations. DO NOT MERGE 
Bug 3272618

Change-Id: Id1c49e216342247bf8574db0bf2a53f8e15bdc6e
 2010-12-09 16:57:40 -08:00
Jean-Baptiste Queru
2a7c542594 reconcile with open-source gingerbread 
Change-Id: I2c27148958dbc2c47121d4874e1108389da804c0
 2010-12-09 10:18:44 -08:00
Jake Hamby
c681e939dd Reduce max BT device length to 246 bytes due to Bluez bug. (DO NOT MERGE) 
The maximum Bluetooth device name length is 248 bytes. There are bugs in
Bluez and D-Bus that can cause the Bluetooth service to go into a reboot
loop when the device name is set to the maximum length. Changed Settings
app to limit the device name length to 246 bytes.

Bug: 3246147
Change-Id: I2f46303cf44951f0b3907c43d4b096736f08765b
 2010-12-09 07:50:04 -08:00
Jake Hamby
b0fda6f56a Reduce max BT device length to 246 bytes due to Bluez bug. (DO NOT MERGE) 
The maximum Bluetooth device name length is 248 bytes. There are bugs in
Bluez and D-Bus that can cause the Bluetooth service to go into a reboot
loop when the device name is set to the maximum length. Changed Settings
app to limit the device name length to 246 bytes.

Bug: 3246147
Change-Id: I320fc7a9a0bfdf8067387ec8de80efccaca2b5f6
 2010-12-03 17:24:21 -08:00
Irfan Sheriff
fa04d89fd8 avoid view creation on orientation change 
Bug: 3238075
Change-Id: Ia245e701b9663a1a8eb0457b8a181a7899e8d6c5
 2010-12-01 15:07:02 -08:00
Eric Fischer
e1e257f4b4 Import revised translations. DO NOT MERGE 
Change-Id: I74acfc5708208509b1afe3ad55ba8a4777c7b34f
 2010-11-29 16:21:55 -08:00
Eric Fischer
5c20526246 Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-11-11 15:43:19 -08:00
Dianne Hackborn
83d2698f4f Merge "Fix issue #3177284: Account for wake lock power usage on Crespo" into gingerbread 2010-11-10 17:58:58 -08:00