Commit Graph

4498 Commits

Author SHA1 Message Date
satok
f61d5570ee Merge "Add an activity to show an ime switch dialog" 2011-06-21 23:09:39 -07:00
Gilles Debunne
0eb603d099 Merge "Split Location and Security settings." 2011-06-21 16:53:51 -07:00
Gilles Debunne
a6a8a1479b Split Location and Security settings.
Needs final icon for location.

Change-Id: I8d826203c4d0ca4ae768f59ecdeae2700bad7c86
2011-06-21 16:53:00 -07:00
Gilles Debunne
2454f49c93 Fixed Bluetooth availability test in Settings
Added similar test for WiFi to be consistent.

Added null tests in BluetoothEnabler.

Change-Id: Ia6e7b150a1bc060c7ce0b4db12ab3f6c958af104
2011-06-21 16:37:26 -07:00
Jaikumar Ganesh
45679d942f am 38ae9125: (-s ours) am 7ab66973: Merge "DO NOT MERGE Show user dialog for BT." into gingerbread
* commit '38ae9125b4535d44b608359f3345fd75d99cc7a5':
  DO NOT MERGE Show user dialog for BT.
2011-06-21 14:08:20 -07:00
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
Gilles Debunne
e78c187905 Settings refactoring
Wifi and bluetooth pane refactored, main toggles moved to left pane.

Change-Id: I42ea4cf3bdf24158f3c67e0dea311258206cd78a
2011-06-21 11:05:29 -07:00
Narayan Kamath
222a619668 Use the new settings API.
Check for a meta-data element instead of a hardcoded
settings class.

Change-Id: Ife67ea64ad1f4ee36749c0b6f8c96d5a22d5b6e2
2011-06-21 13:43:40 +01: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
Jeff Sharkey
a610199ef7 Merge "Detect radios in data usage, control them." 2011-06-20 17:24:23 -07:00
Jeff Sharkey
29d56b303f Detect radios in data usage, control them.
Teach data usage to inspect hardware radios to determine which tabs
and options to display.  Control "Mobile data enabled" state through
ConnectivityManager.  Persist "Show Wi-Fi" state.

Bug: 4599714, 4645276, 4620024, 4599271, 4596812
Change-Id: I4479593d74a8ba744a056767422f1e03182a7a94
2011-06-20 17:23:43 -07:00
Jaikumar Ganesh
47504c7b93 am a7bb204a: am c6f14410: Merge "Remove CHAR LIMIT from string to fix build." into gingerbread
* commit 'a7bb204a1a4a46c853c3590027ad5bffb294f738':
  Remove CHAR LIMIT from string to fix build.
2011-06-20 16:35:45 -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
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
Eric Fischer
a1307695c1 Import revised translations.
Change-Id: Ib916cb8bb0b6f45452300b50b5ac138f89a89c29
2011-06-20 14:54:12 -07:00
satok
fb0fd42fa0 Add an activity to show an ime switch dialog
Bug: 4671417

Change-Id: I8e29dbfb3d0bbb9270888ac757f53542ce658ba9
2011-06-20 21:39:06 +09:00
Jeff Sharkey
827fde31e8 Match NetworkStatsService refactoring.
Change-Id: Ia5c7fa6e60dd1915939437c859af696fb01498bc
2011-06-19 21:59:01 -07:00
Jeff Sharkey
a662e4975b NetworkTemplate refactoring for data stats.
To match framework changes.

Change-Id: I0f648ae5753149f9774c8096540834451ba41279
2011-06-18 22:22:29 -07:00
Jeff Sharkey
fd03deaef6 Merge "Refactor network policy: paid to metered." 2011-06-17 16:57:30 -07:00
Dianne Hackborn
0c2857d48b Merge "Re-enable user disabling of apps." 2011-06-17 14:53:44 -07:00
Dianne Hackborn
a12c1e3226 Re-enable user disabling of apps.
Change-Id: I5f3a474926cf2b93e311435f67f36837f5f56caa
2011-06-17 14:50:11 -07:00
Jeff Sharkey
1a3e41d629 Refactor network policy: paid to metered.
Also bind policy checkbox correctly.

Bug: 4691427
Change-Id: Ib05b39c391bf59582106afff5599d62a04c3c75b
2011-06-17 13:39:33 -07:00
Amith Yamasani
9a2442711e Merge "Wallpaper settings" 2011-06-16 17:49:37 -07:00
Amith Yamasani
fcbf7cffb6 Wallpaper settings
Added an option in Screen settings to choose a wallpaper.
It then shows a list of wallpaper sources and launches the
corresponding intent on selecting.

Bug: 4691375
Change-Id: I9de9edf56ae4cdd5145a1c5d836df66b893a05fe
2011-06-16 17:48:40 -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
9599f0a520 am 50c32a16: am 3c75fbc5: (-s ours) am 5bdc3e91: Import revised Croatian translations.
* commit '50c32a16f34ea154fe97afdc5aaebba6598f58be':
  Import revised Croatian translations.
2011-06-16 17:04:52 -07:00
Eric Fischer
50c32a16f3 am 3c75fbc5: (-s ours) am 5bdc3e91: Import revised Croatian translations.
* commit '3c75fbc55667d4b3f368afbd29ef78eab55303a2':
  Import revised Croatian translations.
2011-06-16 15:55:10 -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
8c158e2403 am 957bed6e: (-s ours) am 3bf263c9: am b5c4437f: Import revised translations. DO NOT MERGE
* commit '957bed6e528b2640b9e91abd509688759691e247':
  Import revised translations.  DO NOT MERGE
2011-06-16 14:48:09 -07:00
Eric Fischer
957bed6e52 am 3bf263c9: am b5c4437f: Import revised translations. DO NOT MERGE
* commit '3bf263c97e23eeec199bd56ef520fba17a1e3917':
  Import revised translations.  DO NOT MERGE
2011-06-16 14:41:45 -07:00
Eric Fischer
3bf263c97e am b5c4437f: Import revised translations. DO NOT MERGE
* commit 'b5c4437f336c3e79d34428de0b1b7ce22785fb29':
  Import revised translations.  DO NOT MERGE
2011-06-16 14:29:39 -07:00
John Reck
edaa5a286d Merge "SeekBarPreference -> SeekBarDialogPreference" 2011-06-16 13:21:50 -07:00
Amith Yamasani
0ae7893ab9 Merge "Enable the PowerControl widget that was disabled for honeycomb." 2011-06-16 11:10:08 -07:00
Narayan Kamath
fb52613a57 Merge "Text to speech settings UI change." 2011-06-16 07:40:29 -07:00
Narayan Kamath
d5642f7060 Text to speech settings UI change.
No more separate checkboxes for each of the engines. This brings
it more in line with the voice recognition settings. The user is
shown a data warning every time he chooses a non system engine
as the default.

Change-Id: I00fcb9c9f634a9fc13ff14da8bfade79ae6727c4
2011-06-16 13:35:34 +01:00
Amith Yamasani
b4b1b400d9 Enable the PowerControl widget that was disabled for honeycomb.
Widget will be selectively disabled for certain devices.

Change-Id: I0c8835e70e21e188d8e2131cb22980744abe8524
2011-06-15 18:00:27 -07:00
John Reck
c2ad2e4ce5 SeekBarPreference -> SeekBarDialogPreference
Change-Id: Ie1fba2633806a50b5282728dce447be2162ad67f
2011-06-15 16:49:16 -07:00
Eric Fischer
b5c4437f33 Import revised translations. DO NOT MERGE
Change-Id: I4fa5f4000565d487a86e858cb3520555b2147dd2
2011-06-15 15:13:19 -07:00
Eric Fischer
5bdc3e9139 Import revised Croatian translations.
Change-Id: Ib0067e98d8e3ce35d5e2868e61a8ad3680c62f1e
2011-06-15 12:09:02 -07:00
Jeff Sharkey
dd6efe17e0 Handle data warning/limit notification actions.
Respond to user interaction with data warning/limit notifications
shown by NetworkPolicyManager.  Show correct tab for the template that
triggered notification.  When data is disabled, prompt user with
dialog and option to re-enable.

Change-Id: I73aeecc0e840fffa2b4cdb90af269115ed0ab56c
2011-06-15 10:31:49 -07:00
Jeff Sharkey
aa5260e40a Load app usage on background thread.
Since stats service loads as needed, this may touch disk, and should
run on background thread.

Change-Id: I1d1d2583250314efa4d3d8f4faa9016c746c29d0
2011-06-14 23:28:03 -07:00
Jeff Sharkey
8e911d7b1a Data usage app labels, protect system, hide empty.
Derive better labels from PackageManager, including for sharedUid
case.  Disable "App settings" button when no ResolveInfo found, and
hide "Restrict" checkbox for system UIDs.  Also hide apps with 0
bytes usage.

Change-Id: I4b0a66f6912c02c56bfcbcb5b46f3ae2ba0df504
2011-06-14 22:45:58 -07:00
Amith Yamasani
5a259aae18 am 80cc0ffa: am e7f7643c: am 6ef6f183: Stability fixes for Settings. Asynchronous callbacks causing NPEs.
* commit '80cc0ffa2b284aee595c45f8f4142f615486f797':
  Stability fixes for Settings. Asynchronous callbacks causing NPEs.
2011-06-14 20:56:45 -07:00
Jeff Sharkey
980385b3f9 Merge "Cycle day editor and other confirmation dialogs." 2011-06-14 16:35:51 -07:00