PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,249 Commits 1 Branch 0 Tags
38ae9125b4535d44b608359f3345fd75d99cc7a5
Commit Graph

2249 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jaikumar Ganesh
38ae9125b4 am 7ab66973: Merge "DO NOT MERGE Show user dialog for BT." into gingerbread 
* commit '7ab66973a973b9d23c411bf1c6631fa93c4903bf':
  DO NOT MERGE Show user dialog for BT.
 2011-06-21 13:24:22 -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
a7bb204a1a am c6f14410: Merge "Remove CHAR LIMIT from string to fix build." into gingerbread 
* commit 'c6f144106c627b28d90d33c54564c70890bc2f42':
  Remove CHAR LIMIT from string to fix build.
 2011-06-20 16:28:09 -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
f3670df2ca am 2c85966d: Merge "New strings for Bluetooth" into gingerbread 
* commit '2c85966dd881917b426eefd9643adedf6b0d4ffc':
  New strings for Bluetooth
 2011-06-20 15:54:16 -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
3c75fbc556 am 5bdc3e91: Import revised Croatian translations. 
* commit '5bdc3e9139a7b37b97a56554cc9a89abc196b437':
  Import revised Croatian translations.
 2011-06-16 15:48:43 -07:00
Eric Fischer
5bdc3e9139 Import revised Croatian translations. 
Change-Id: Ib0067e98d8e3ce35d5e2868e61a8ad3680c62f1e
 2011-06-15 12:09:02 -07:00
Jaikumar Ganesh
a6daa21db8 am 015788ca: Merge "Import translations for cherry-picked Bluetooth changes." into gingerbread 
* commit '015788ca9228312dfca30785b1801f33a3a32e9a':
  Import translations for cherry-picked Bluetooth changes.
 2011-05-27 13:47:08 -07:00
Jaikumar Ganesh
bd34e568bf am eddb21a2: Merge "Changes for API of Bluetooth Discoverability. DO NOT MERGE" into gingerbread 
* commit 'eddb21a2ebd39900893da63749a00570f37e5038':
  Changes for API of Bluetooth Discoverability. DO NOT MERGE
 2011-05-27 13:47:01 -07:00
Jaikumar Ganesh
aeca185107 am c955d8ee: Merge "Allow users to change the length of BT disoverability. DO NOT MERGE" into gingerbread 
* commit 'c955d8ee1d2b134f8c41989b545b7b3ed830d058':
  Allow users to change the length of BT disoverability. DO NOT MERGE
 2011-05-27 13:46:59 -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
531bed610c am 95364e4a: Allow alternate string to be used for min_number 
* commit '95364e4af3cb09bff58baab6fa4a6a2218e7fc94':
  Allow alternate string to be used for min_number
 2011-05-26 13:47:20 -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
643e48b7fd am 7c284c2c: Import revised translations. DO NOT MERGE 
* commit '7c284c2c62ce565dacfae641108a2a5033e78721':
  Import revised translations.  DO NOT MERGE
 2011-04-27 15:31:22 -07:00
Eric Fischer
7c284c2c62 Import revised translations. DO NOT MERGE 
Change-Id: I56239c7b2a936acc9b93b8592a2a04e42a55458b
 2011-04-27 13:53:57 -07:00
Conley Owens
47cd8a47f7 am bc20d67f: Merge "Avoid crash when switching to 2G/3G network." 
* commit 'bc20d67fedd453eec9dcb127cf9df909a192baf5':
  Avoid crash when switching to 2G/3G network.
 2011-04-27 09:55:23 -07:00
Conley Owens
bc20d67fed Merge "Avoid crash when switching to 2G/3G network." 2011-04-27 09:51:22 -07:00
Kenneth Westin
dd9131dcdf Avoid crash when switching to 2G/3G network. 
Adding test that active APN array is not empty.

Change-Id: I16246aa45c991a9396ef03d9bb083d97c3ca2e1a
 2011-04-26 14:08:45 +02:00
Simon Wilson
f927cccd79 am 37063d6a: DO NOT MERGE Clarify additional system update string length/usage 
* commit '37063d6adf9b472a8bb4bd58493517e04aafba95':
  DO NOT MERGE Clarify additional system update string length/usage
 2011-04-11 14:12:43 -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
84c9005375 am fcb089c9: Merge "Reimport Settings translations. DO NOT MERGE" into gingerbread 
* commit 'fcb089c94280dd3b5a1ed8f90610d258a43abb78':
  Reimport Settings translations.  DO NOT MERGE
 2011-04-04 14:43:04 -07:00
Simon Wilson
2ca7add59f am ca572fb6: Merge "DO NOT MERGE Put additional update package names in config.xml" into gingerbread 
* commit 'ca572fb64b77a2fe3ff93874ee5956214368b104':
  DO NOT MERGE Put additional update package names in config.xml
 2011-04-04 14:43:02 -07:00
Eric Fischer
6735ae141f am b4bd78f5: Revert "Import revised translations. DO NOT MERGE" 
* commit 'b4bd78f52305aa1b47fe9ac09d99e00116f201a6':
  Revert "Import revised translations.  DO NOT MERGE"
 2011-04-04 14:42:59 -07:00
Eric Fischer
dfb7882776 am 955ab98f: Import revised translations. DO NOT MERGE 
* commit '955ab98f030cd198d838bdff8768ff87a17be9a8':
  Import revised translations.  DO NOT MERGE
 2011-04-04 12:21:25 -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
Park Sanghyun
2b2959b321 am e5da8565: DO NOT MERGE Add support for additional System Update menu item 
* commit 'e5da8565ca7930483c2e8c6467710716cf51ba51':
  DO NOT MERGE Add support for additional System Update menu item
 2011-03-30 09:31:15 -07:00
Kenny Root
70a1ff0357 am 7fceefa7: Merge "Settings: Improved UX when viewing open source license info." 
* commit '7fceefa79229ece2efab0446841543a8f8f20a1d':
  Settings: Improved UX when viewing open source license info.
 2011-03-29 15:43:38 -07:00
Kenny Root
7fceefa792 Merge "Settings: Improved UX when viewing open source license info." 2011-03-29 15:03:25 -07:00
Henrik Carlsson
2cb19ab9e2 Settings: Improved UX when viewing open source license info. 
Added spinning progress indicator to the open source license dialog.
The actual file loading is now handled by a separate thread, in
order to provide user feedback and reduce risk for ANR.

Change-Id: Ia12727ecc2fe8114e0d1384769b568142c8a1db6
 2011-03-29 15:02:44 -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
9567622d32 am c4eeeb29: Import revised translations. DO NOT MERGE 
* commit 'c4eeeb29c5c72d9ceb16c373c4d3902c155a0f26':
  Import revised translations.  DO NOT MERGE
 2011-03-18 16:52:30 -07:00
Eric Fischer
c4eeeb29c5 Import revised translations. DO NOT MERGE 
Change-Id: I512bfadfc427f0676bce9e79c20babe006324ca1
 2011-03-18 15:17:01 -07:00
TK MUN
8c2a02defc am e0e845fe: DO NOT MERGE Do not allow shortcut for "4G Settings" 
* commit 'e0e845fee6703a1a2ed75c4fe67cb0202dd076c0':
  DO NOT MERGE Do not allow shortcut for "4G Settings"
 2011-03-17 16:20:42 -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
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
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