Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,864 Commits 1 Branch 0 Tags
87c04ba668ed856ec61326e90c1fade980d4e893
Commit Graph

659 Commits

Author SHA1 Message Date
Jaikumar Ganesh
87c04ba668 am f3670df2: am 2c85966d: Merge "New strings for Bluetooth" into gingerbread 
* commit 'f3670df2ca8e521179907978c7009cba791df7c4':
  New strings for Bluetooth
 2011-06-20 15:58:25 -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
Dianne Hackborn
8d7ecabc68 am 60d8b3f8: am 55c86911: Mark access to private resources now that aapt enforces this. 
* commit '60d8b3f875ae5630330feacc450169223e605166':
  Mark access to private resources now that aapt enforces this.
 2011-06-09 16:09:00 -07:00
Dianne Hackborn
60d8b3f875 am 55c86911: Mark access to private resources now that aapt enforces this. 
* commit '55c869119aabc27d3b6c6b4aab0e69faf57f1250':
  Mark access to private resources now that aapt enforces this.
 2011-06-09 16:04:44 -07:00
Dianne Hackborn
55c869119a Mark access to private resources now that aapt enforces this. 
Change-Id: Ifea6854d8295294011b5253640198a10e1b5c1e1
 2011-06-09 15:33:56 -07:00
Marco Nelissen
079e30cd2a resolved conflicts for merge of 531bed61 to honeycomb-plus-aosp 
Change-Id: I28154c6feb563712eeda3e1176d62c7d2a28eff8
 2011-06-06 16:29:34 -07:00
Jeff Brown
bb8fc4a4ea am 9fc039e7: Merge "Add a preference panel for mouse speed." into honeycomb-mr2 
* commit '9fc039e7bcea7f1845a51fcb70d608663ceec227':
  Add a preference panel for mouse speed.
 2011-06-02 17:27:39 -07:00
Jeff Brown
d82487b0ff Add a preference panel for mouse speed. 
Bug: 4124987

Change-Id: Icf166810ebbd3745f0065331c140a074b58a363c
 2011-06-02 15:13:27 -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
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
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
Dianne Hackborn
b4799fc9ee am aef746c4: Implement new manage apps UI for compat mode. 
* commit 'aef746c45f14c8a170dba48c4b55f93cae0e24e4':
  Implement new manage apps UI for compat mode.
 2011-05-26 10:02:22 -07:00
Dianne Hackborn
aef746c45f Implement new manage apps UI for compat mode. 
Change-Id: Ia8db7f534b7294fbbb34e0acdedab3a96cea59e9
 2011-05-26 01:06:11 -07:00
Gilles Debunne
ecb43e5e67 am 5d48be98: Merge "Storage stats on external SD card in Settings." into honeycomb-mr2 
* commit '5d48be9845eea3c4539f78f06ed24c592803e10c':
  Storage stats on external SD card in Settings.
 2011-05-25 14:28:34 -07:00
Gilles Debunne
104ea2873d Storage stats on external SD card in Settings. 
Storage categories are dynamically created from list of StorageVolumes instead
of a static XML.

Unknown files' sizes are part of Misc rather than Apps.

Categories with a size of 0 are removed.

TODO : remove the notion of a "nosdcard" product. Change strings accordingly.
See all TODO in code

Change-Id: I017ac20f5fa50ad9bdeba8e666754ec84acf3858
 2011-05-25 12:12:22 -07:00
John Wang
22e5279382 Update the MEID setting label. 
Currently show MEID for CDMA devices. For LTE devices, this should be IMEI.

Both values are the same for CDMA-LTE devices. Update "MEID" to "IMEI / MEID".

bug:4356748
Change-Id: I39b1f1c4c776a4acb045aa9ef7d8869ed66a30e4
 2011-05-09 11:36:19 -07: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
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
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
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
Amith Yamasani
f3b325f54d Debug feature for HDCP compliance testing. 
Bug: 4149811

Add a setting in Application->Development to change HDCP checking.

Change-Id: I5561b097b3fd7dbfc4eaf1977b80a37fc29572aa
 2011-03-23 14:39:43 -07:00
Vasu Nori
75e17aa8cc bug:3514023 fix string formatting 
Change-Id: I1d07e94f3693db09b29c621c5afae1cbaae24674
 2011-03-15 14:44:50 -07: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
c777ee29c8 Improve Bluetooth tethering UI usability. 
- Updated hint text for BT tethering checkbox to
  "[Sharing|not sharing] this [tablet|phone]'s mobile data connection".
- Show correct hint text when user enters tethering screen.
- Show correct status after user enables tethering when Bluetooth is off.
  When BluetoothPan.setBluetoothTethering(true) is called with BT off,
  BluetoothPanProfileHandler will add a broadcast receiver to enable
  tethering after BT turns on. This happens too late to show the correct
  status when TetherSettings gets the adapter state changed event, so set
  a flag (mBluetoothEnableForTether) instead, and call setBluetoothTethering
  ourselves after the state changes to ON. Also, clear the flag if the
  adapter state changes to OFF or ERROR.
- Show correct status when user enables tethering, then disables Bluetooth,
  then returns to the tethering screen. Previously it would show
  Bluetooth tethering enabled, even though adapter state was OFF.
- Show the number of connected devices in tethering preference screen.
- Distinguish between PANU and NAP in device profiles screen, and show
  appropriate text to clarify the direction of tethering.
- Remove profiles from device profiles list when the device removes the UUID
  (e.g. Mac OS X turning NAP on/off) and after a NAP disconnection when the
  remote device only supports PANU.

Bug: 3414575
Change-Id: I2c0830876d5b9bddb293e57c4d3ca74f105911b8
 2011-03-09 14:56:56 -08:00
Justin Ho
6adc2ee87f Merge "Updated storage display colors in Settings" into honeycomb-mr1 2011-03-08 14:11:40 -08:00
Justin Ho
bfbe8a07ce Updated storage display colors in Settings 
Bug: 3321005
Change-Id: Ia6b254d758beeb755703f5e9c86854079841c59b
 2011-03-08 13:57:28 -08:00
Amith Yamasani
1ad4824d84 am 35bc6b5f: Wifi disconnect policy summary text should not contain "mobile data". 
* commit '35bc6b5f151ea073522f14067eb92aab3a99bc7d':
  Wifi disconnect policy summary text should not contain "mobile data".
 2011-03-08 13:48:26 -08:00
Amith Yamasani
35bc6b5f15 Wifi disconnect policy summary text should not contain "mobile data". 
Bug: 4026299

Change the summary if it is a wifi-only device.

Change-Id: I433113d9fc430ab06efec81b6934a03dbb17ca1b
 2011-03-08 12:03:13 -08:00
Vasu Nori
e875c73505 bug:3514023 fix strings 
Change-Id: I3662b4eeaa4da9df9d007e3e0ad4a3dd59e429c0
 2011-03-07 11:14:27 -08:00
Lorenzo Colitti
a4fb8c8684 am f4393101: Merge "Support configuring the protocol in APN settings." into gingerbread 
* commit 'f4393101f80f0ca1a10771613a18565323b69fa2':
  Support configuring the protocol in APN settings.
 2011-03-03 17:07:39 -08:00
Eric Fischer
e39213e225 Merge changes I33bf228d,I18d2329e into honeycomb-mr1 
* changes:
  Remove unneeded large-screen-specific translations.
  Mark placeholders in format strings as placeholders.
 2011-03-03 16:20:18 -08:00
Eric Fischer
43d495987d Mark placeholders in format strings as placeholders. 
Bug: 3422176

Change-Id: I18d2329e72fa9a521c2349fea638e4435f737ca7
 2011-03-03 15:17:05 -08:00
Irfan Sheriff
216a58c882 Merge "DO NOT MERGE Proxy and IP fixes" into honeycomb-mr1 2011-03-03 15:02:05 -08:00
Irfan Sheriff
00615cf5dc DO NOT MERGE Proxy and IP fixes 
Fix dual display of IP addresses for static IP
Fix inputType for proxy and IP fields
Add hint texts for IP fields

Change-Id: I5b556a07c2a5b69ecec959c933f2872e70496946
 2011-03-03 15:01:07 -08:00
Svetoslav Ganov
c82b60dcc7 Updated the strings for configuring long press timeout. 
Change-Id: I1a4b2e05bf63933861198b8bcf7a34d0f4f6b1fd
 2011-03-03 13:21:20 -08:00
Amith Yamasani
fb6f306a2b am 665fc6aa: am b7e393bf: Merge "Bring back Wi-Fi sleep policy setting for wifi-only devices." into honeycomb 
* commit '665fc6aadd07b831dcb72d1e04199fd26b6049b6':
  Bring back Wi-Fi sleep policy setting for wifi-only devices.
 2011-03-02 22:16:41 -08:00
Amith Yamasani
e1e1e61d23 Merge "Fix the string for empty dictionary on the tablet." 2011-03-02 22:09:38 -08:00
Svetoslav Ganov
dded90c67e Merge "Adding system wide long press timeout configurability under accessibility." 2011-03-02 19:17:30 -08:00
Amith Yamasani
26797fefdc Fix the string for empty dictionary on the tablet. 
Bug: 3335775
Change-Id: Iee7fbf6a25d61c761ea4cb125454c08a579b5a7e
 2011-03-02 19:03:01 -08:00
Vasu Nori
4602996430 Merge "bug:3321005 make Settings --> Storage screen display little less ugly" 2011-03-02 17:52:42 -08:00