OSDN Git Service
Gilles Debunne [Tue, 21 Jun 2011 23:53:51 +0000 (16:53 -0700)]
Merge "Split Location and Security settings."
Gilles Debunne [Thu, 9 Jun 2011 18:56:17 +0000 (11:56 -0700)]
Split Location and Security settings.
Needs final icon for location.
Change-Id: I8d826203c4d0ca4ae768f59ecdeae2700bad7c86
Gilles Debunne [Tue, 21 Jun 2011 23:16:06 +0000 (16:16 -0700)]
Fixed Bluetooth availability test in Settings
Added similar test for WiFi to be consistent.
Added null tests in BluetoothEnabler.
Change-Id: Ia6e7b150a1bc060c7ce0b4db12ab3f6c958af104
Gilles Debunne [Mon, 20 Jun 2011 22:00:07 +0000 (15:00 -0700)]
Settings refactoring
Wifi and bluetooth pane refactored, main toggles moved to left pane.
Change-Id: I42ea4cf3bdf24158f3c67e0dea311258206cd78a
Narayan Kamath [Mon, 20 Jun 2011 10:49:42 +0000 (11:49 +0100)]
Use the new settings API.
Check for a meta-data element instead of a hardcoded
settings class.
Change-Id: Ife67ea64ad1f4ee36749c0b6f8c96d5a22d5b6e2
Jeff Sharkey [Tue, 21 Jun 2011 00:24:23 +0000 (17:24 -0700)]
Merge "Detect radios in data usage, control them."
Jeff Sharkey [Tue, 21 Jun 2011 00:06:52 +0000 (17:06 -0700)]
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
Eric Fischer [Mon, 20 Jun 2011 21:54:12 +0000 (14:54 -0700)]
Import revised translations.
Change-Id: Ib916cb8bb0b6f45452300b50b5ac138f89a89c29
Jeff Sharkey [Mon, 20 Jun 2011 03:56:31 +0000 (20:56 -0700)]
Match NetworkStatsService refactoring.
Change-Id: Ia5c7fa6e60dd1915939437c859af696fb01498bc
Jeff Sharkey [Sun, 19 Jun 2011 04:57:06 +0000 (21:57 -0700)]
NetworkTemplate refactoring for data stats.
To match framework changes.
Change-Id: I0f648ae5753149f9774c8096540834451ba41279
Jeff Sharkey [Fri, 17 Jun 2011 23:57:30 +0000 (16:57 -0700)]
Merge "Refactor network policy: paid to metered."
Dianne Hackborn [Fri, 17 Jun 2011 21:53:44 +0000 (14:53 -0700)]
Merge "Re-enable user disabling of apps."
Dianne Hackborn [Fri, 17 Jun 2011 21:50:11 +0000 (14:50 -0700)]
Re-enable user disabling of apps.
Change-Id: I5f3a474926cf2b93e311435f67f36837f5f56caa
Jeff Sharkey [Thu, 16 Jun 2011 22:08:08 +0000 (15:08 -0700)]
Refactor network policy: paid to metered.
Also bind policy checkbox correctly.
Bug:
4691427
Change-Id: Ib05b39c391bf59582106afff5599d62a04c3c75b
Amith Yamasani [Fri, 17 Jun 2011 00:49:37 +0000 (17:49 -0700)]
Merge "Wallpaper settings"
Amith Yamasani [Thu, 16 Jun 2011 23:55:28 +0000 (16:55 -0700)]
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
Eric Fischer [Fri, 17 Jun 2011 00:04:52 +0000 (17:04 -0700)]
am
50c32a16: am
3c75fbc5: (-s ours) am
5bdc3e91: Import revised Croatian translations.
* commit '
50c32a16f34ea154fe97afdc5aaebba6598f58be':
Import revised Croatian translations.
Eric Fischer [Thu, 16 Jun 2011 22:55:10 +0000 (15:55 -0700)]
am
3c75fbc5: (-s ours) am
5bdc3e91: Import revised Croatian translations.
* commit '
3c75fbc55667d4b3f368afbd29ef78eab55303a2':
Import revised Croatian translations.
Eric Fischer [Thu, 16 Jun 2011 22:48:43 +0000 (15:48 -0700)]
am
5bdc3e91: Import revised Croatian translations.
* commit '
5bdc3e9139a7b37b97a56554cc9a89abc196b437':
Import revised Croatian translations.
Eric Fischer [Thu, 16 Jun 2011 21:48:09 +0000 (14:48 -0700)]
am
957bed6e: (-s ours) am
3bf263c9: am
b5c4437f: Import revised translations. DO NOT MERGE
* commit '
957bed6e528b2640b9e91abd509688759691e247':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 16 Jun 2011 21:41:45 +0000 (14:41 -0700)]
am
3bf263c9: am
b5c4437f: Import revised translations. DO NOT MERGE
* commit '
3bf263c97e23eeec199bd56ef520fba17a1e3917':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 16 Jun 2011 21:29:39 +0000 (14:29 -0700)]
am
b5c4437f: Import revised translations. DO NOT MERGE
* commit '
b5c4437f336c3e79d34428de0b1b7ce22785fb29':
Import revised translations. DO NOT MERGE
John Reck [Thu, 16 Jun 2011 20:21:50 +0000 (13:21 -0700)]
Merge "SeekBarPreference -> SeekBarDialogPreference"
Amith Yamasani [Thu, 16 Jun 2011 18:10:08 +0000 (11:10 -0700)]
Merge "Enable the PowerControl widget that was disabled for honeycomb."
Narayan Kamath [Thu, 16 Jun 2011 14:40:29 +0000 (07:40 -0700)]
Merge "Text to speech settings UI change."
Narayan Kamath [Tue, 14 Jun 2011 17:17:40 +0000 (18:17 +0100)]
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
Amith Yamasani [Thu, 16 Jun 2011 01:00:27 +0000 (18:00 -0700)]
Enable the PowerControl widget that was disabled for honeycomb.
Widget will be selectively disabled for certain devices.
Change-Id: I0c8835e70e21e188d8e2131cb22980744abe8524
John Reck [Wed, 15 Jun 2011 23:49:16 +0000 (16:49 -0700)]
SeekBarPreference -> SeekBarDialogPreference
Change-Id: Ie1fba2633806a50b5282728dce447be2162ad67f
Eric Fischer [Wed, 15 Jun 2011 22:13:19 +0000 (15:13 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I4fa5f4000565d487a86e858cb3520555b2147dd2
Eric Fischer [Wed, 15 Jun 2011 19:09:02 +0000 (12:09 -0700)]
Import revised Croatian translations.
Change-Id: Ib0067e98d8e3ce35d5e2868e61a8ad3680c62f1e
Jeff Sharkey [Wed, 15 Jun 2011 17:31:41 +0000 (10:31 -0700)]
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
Jeff Sharkey [Wed, 15 Jun 2011 06:21:59 +0000 (23:21 -0700)]
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
Jeff Sharkey [Wed, 15 Jun 2011 05:41:21 +0000 (22:41 -0700)]
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
Amith Yamasani [Wed, 15 Jun 2011 03:56:45 +0000 (20:56 -0700)]
am
80cc0ffa: am
e7f7643c: am
6ef6f183: Stability fixes for Settings. Asynchronous callbacks causing NPEs.
* commit '
80cc0ffa2b284aee595c45f8f4142f615486f797':
Stability fixes for Settings. Asynchronous callbacks causing NPEs.
Jeff Sharkey [Tue, 14 Jun 2011 23:35:51 +0000 (16:35 -0700)]
Merge "Cycle day editor and other confirmation dialogs."
Jeff Sharkey [Tue, 14 Jun 2011 22:01:18 +0000 (15:01 -0700)]
Cycle day editor and other confirmation dialogs.
Create dialog to edit "cycle day" when data usage resets. Also added
dialogs to confirm enabling limit and restricting an application.
Change-Id: I1e08b17fabd1fcfc2f260807a61435d0ff1a8627
Amith Yamasani [Tue, 14 Jun 2011 22:44:23 +0000 (15:44 -0700)]
am
e7f7643c: am
6ef6f183: Stability fixes for Settings. Asynchronous callbacks causing NPEs.
* commit '
e7f7643c485ed6926bc354ca28628d5179019b50':
Stability fixes for Settings. Asynchronous callbacks causing NPEs.
Amith Yamasani [Tue, 14 Jun 2011 22:41:00 +0000 (15:41 -0700)]
am
6ef6f183: Stability fixes for Settings. Asynchronous callbacks causing NPEs.
* commit '
6ef6f183e4d8be0828d1a969178a6e315d8a0ea7':
Stability fixes for Settings. Asynchronous callbacks causing NPEs.
Amith Yamasani [Tue, 14 Jun 2011 22:02:46 +0000 (15:02 -0700)]
Stability fixes for Settings. Asynchronous callbacks causing NPEs.
Bug:
4598717
Change-Id: I7f1c5bf6e079bb36301e81085096c5b82615814b
Narayan Kamath [Tue, 14 Jun 2011 15:37:11 +0000 (16:37 +0100)]
Fix a bug in the TTS settings.
Non system engines that are explicitly enabled should
show up in the "default engine" dropdown list.
bug:
4608012
Change-Id: Ic805ef6199319e44037a84ba43fc549de91d291d
Jeff Sharkey [Tue, 14 Jun 2011 05:31:09 +0000 (22:31 -0700)]
Read network policy earlier, fix ugly scrollbar.
Read policy before creating options menu, so we correctly populate
checkboxes. Also clean up Preference views so we don't crash when
returning from app details.
Change-Id: I52c38a3016ea669e27b325bfb6ae1620d2a5ca53
Jason parks [Mon, 13 Jun 2011 22:38:45 +0000 (17:38 -0500)]
Get encryption working for phones.
I've removed the "special" keyboard from the phone
layouts for now.
Change-Id: I4b18279dafb18ba7cebacfad1b7167e34a7203b4
Mike Lockwood [Mon, 13 Jun 2011 11:46:53 +0000 (04:46 -0700)]
am
c938a02b: am
c1db1192: am
d2a6f28f: Disable option to format SD card for secondary external storage
* commit '
c938a02bc69434840340dcebb8ac16b6dcfb8b60':
Disable option to format SD card for secondary external storage
Mike Lockwood [Mon, 13 Jun 2011 11:36:26 +0000 (04:36 -0700)]
am
c1db1192: am
d2a6f28f: Disable option to format SD card for secondary external storage
* commit '
c1db119250fd481341c095f47a62adb14ad09484':
Disable option to format SD card for secondary external storage
Mike Lockwood [Mon, 13 Jun 2011 11:25:51 +0000 (04:25 -0700)]
am
d2a6f28f: Disable option to format SD card for secondary external storage
* commit '
d2a6f28fa7ba8189d2a1987129db27fd840fac0f':
Disable option to format SD card for secondary external storage
Jeff Sharkey [Mon, 13 Jun 2011 07:42:03 +0000 (00:42 -0700)]
First pass at detailed app data usage, policy.
Fragment to show application data usage details, including chart with
inspection ranges. Button that invokes ACTION_MANAGE_NETWORK_USAGE
towards application, and UID-specific policy controls. Fragment is
launched when clicking list items from data usage summary page.
Change-Id: Ie1564aa8af98e1a7083817a997059a5a7b1caa50
Jeff Sharkey [Mon, 13 Jun 2011 06:11:24 +0000 (23:11 -0700)]
Modifier to combine/split mobile network policy.
Create NetworkPolicyModifier which knows about which mobile network
policies can coexist. Settings UI uses this modifier to drive UI and
persist policies.
Change-Id: Ib3f3841b0a74c14eefb99209dd644a2e7b7e525d
Mike Lockwood [Sat, 11 Jun 2011 21:56:34 +0000 (17:56 -0400)]
Disable option to format SD card for secondary external storage
This is a temporary workaround for an interoperability problem with MTP
Change-Id: Iaf63ea0ac76e12ffd635765785da027cab0fcb9a
Signed-off-by: Mike Lockwood <lockwood@android.com>
Jeff Sharkey [Fri, 10 Jun 2011 20:31:21 +0000 (13:31 -0700)]
Iterating on data usage; tabs, scrolling, cycles.
Added ActionBar items to control complexity of data surfaced; checked
state causes tabs to be shown/hidden for "Mobile", "2G-3G", "4G", and
"Wi-Fi" network templates. Loading historical stats and policy from
system services based on selected tab.
Change entire body under tabs to scroll, treating network options and
chart as ListView headers. Teach chart sweep to disable intercept to
play with ListView, and draw sweep disabled as dashed line. Hijacking
Preference views for toggles to offer consistency. No policy updates
are persisted yet.
Based on available historical network stats and policy cycle reset day,
build list of user-selectable cycles. Wired up chart to display cycle
data and reset inspection region to last week of available data.
Change-Id: Ia561578276fa23908b745fbc06a6ef828d9ccc2e
Freeman Ng [Fri, 10 Jun 2011 21:08:35 +0000 (14:08 -0700)]
am
945aac2e: am
fb096074: am
148222fd: Merge "remove disabling of Back/Dismiss button for 10" mode" into honeycomb-mr2
* commit '
945aac2e299e8a290c6ec3e5fbad84b7c28366ce':
remove disabling of Back/Dismiss button for 10" mode
Freeman Ng [Fri, 10 Jun 2011 21:08:33 +0000 (14:08 -0700)]
am
a35506c7: am
f2a9bd33: am
0a67cdb7: Merge "add "behind" screen orientation to prevent spurious flipping" into honeycomb-mr2
* commit '
a35506c7fb32906678fe541914f420d19ff17394':
add "behind" screen orientation to prevent spurious flipping
Dianne Hackborn [Fri, 10 Jun 2011 19:51:28 +0000 (12:51 -0700)]
am
8d7ecabc: am
60d8b3f8: am
55c86911: Mark access to private resources now that aapt enforces this.
* commit '
8d7ecabc6893716d78ede40aedd42683a7627f3c':
Mark access to private resources now that aapt enforces this.
Narayan Kamath [Fri, 10 Jun 2011 15:50:48 +0000 (16:50 +0100)]
Clean up some of the TTS settings code.
(a) No longer use a hardcoded default.
(b) With this change, the system engine with the highest
declared priority becomes the default.
Change-Id: I20c6036b855f008b6a83f1dac81aefc07e3ca7f3
Freeman Ng [Fri, 10 Jun 2011 14:46:40 +0000 (07:46 -0700)]
am
fb096074: am
148222fd: Merge "remove disabling of Back/Dismiss button for 10" mode" into honeycomb-mr2
* commit '
fb09607469a5cb42c833725d121e517af5daca72':
remove disabling of Back/Dismiss button for 10" mode
Freeman Ng [Fri, 10 Jun 2011 14:46:37 +0000 (07:46 -0700)]
am
f2a9bd33: am
0a67cdb7: Merge "add "behind" screen orientation to prevent spurious flipping" into honeycomb-mr2
* commit '
f2a9bd337b495b65f9e6708117835b2ff986d5af':
add "behind" screen orientation to prevent spurious flipping
Justin Ho [Fri, 10 Jun 2011 01:55:37 +0000 (18:55 -0700)]
am
9209d20a: am
ea8f103f: am
7825cb29: Fixing remaining SetupWizard backgrounds for Flyer Bug:
4523403
* commit '
9209d20adc0eea6b5fec9de0f1ca21acf5cec92a':
Fixing remaining SetupWizard backgrounds for Flyer Bug:
4523403
Freeman Ng [Fri, 10 Jun 2011 01:22:02 +0000 (18:22 -0700)]
am
148222fd: Merge "remove disabling of Back/Dismiss button for 10" mode" into honeycomb-mr2
* commit '
148222fd43499a578c16c0bdf6ae9336255facd7':
remove disabling of Back/Dismiss button for 10" mode
Freeman Ng [Fri, 10 Jun 2011 01:22:00 +0000 (18:22 -0700)]
am
0a67cdb7: Merge "add "behind" screen orientation to prevent spurious flipping" into honeycomb-mr2
* commit '
0a67cdb7e1d853ae0431c36e95930bbf355eca52':
add "behind" screen orientation to prevent spurious flipping
Freeman Ng [Fri, 10 Jun 2011 01:20:13 +0000 (18:20 -0700)]
Merge "remove disabling of Back/Dismiss button for 10" mode" into honeycomb-mr2
Freeman Ng [Fri, 10 Jun 2011 01:20:04 +0000 (18:20 -0700)]
Merge "add "behind" screen orientation to prevent spurious flipping" into honeycomb-mr2
Dianne Hackborn [Thu, 9 Jun 2011 23:09:00 +0000 (16:09 -0700)]
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.
Dianne Hackborn [Thu, 9 Jun 2011 23:04:44 +0000 (16:04 -0700)]
am
55c86911: Mark access to private resources now that aapt enforces this.
* commit '
55c869119aabc27d3b6c6b4aab0e69faf57f1250':
Mark access to private resources now that aapt enforces this.
Freeman Ng [Thu, 9 Jun 2011 22:42:25 +0000 (15:42 -0700)]
remove disabling of Back/Dismiss button for 10" mode
bug:
4580049
Change-Id: Ifee699a3ff42282a30c3c7c61b6e7799ac902700
Dianne Hackborn [Thu, 9 Jun 2011 22:33:56 +0000 (15:33 -0700)]
Mark access to private resources now that aapt enforces this.
Change-Id: Ifea6854d8295294011b5253640198a10e1b5c1e1
Jean-Baptiste Queru [Thu, 9 Jun 2011 22:01:35 +0000 (15:01 -0700)]
Reconcile with gingerbread-release
Change-Id: I59e35b5788a1c7855a97bd4577d0c44f066c0bd1
Freeman Ng [Thu, 9 Jun 2011 19:00:35 +0000 (12:00 -0700)]
add "behind" screen orientation to prevent spurious flipping
Calling setRequestedOrientation() before setContentView() used to
start activities off in the desired orientation even if the device
was in the opposite orientation, but now, there's a kind of lag
where they display briefly in the device orientation before
flipping to the request one. This change eliminates this effect.
bug:
4581374
Change-Id: I807b0a0a8a247ec8e51b85707afcbd9f75ed9956
Jeff Sharkey [Thu, 9 Jun 2011 18:22:14 +0000 (11:22 -0700)]
Merge "Checkpoint of data usage UI, graphs and lists."
Joe Onorato [Thu, 9 Jun 2011 16:44:56 +0000 (09:44 -0700)]
Merge "Remove this setting that never really got finished."
Joe Onorato [Thu, 9 Jun 2011 16:44:30 +0000 (09:44 -0700)]
Remove this setting that never really got finished.
Change-Id: Id52d7e4f735a2a289533fc9d8461f70218601764
Jeff Sharkey [Mon, 30 May 2011 23:19:56 +0000 (16:19 -0700)]
Checkpoint of data usage UI, graphs and lists.
Chart of network usage over time, with draggable "sweep" bars for
inspection region and warning/limits. Talks with NetworkStatsService
for live data, and updates list of application usage as inspection
region changes.
Change-Id: I2a406e6776daf7d74143c07ec683c10fe711c277
Justin Ho [Thu, 9 Jun 2011 06:33:05 +0000 (23:33 -0700)]
am
ea8f103f: am
7825cb29: Fixing remaining SetupWizard backgrounds for Flyer Bug:
4523403
* commit '
ea8f103f8310c869f84d8ad48a167e8e0b63923b':
Fixing remaining SetupWizard backgrounds for Flyer Bug:
4523403
Justin Ho [Thu, 9 Jun 2011 06:30:25 +0000 (23:30 -0700)]
am
7825cb29: Fixing remaining SetupWizard backgrounds for Flyer Bug:
4523403
* commit '
7825cb295c5f08f84282b4bbaeb03da0a536a826':
Fixing remaining SetupWizard backgrounds for Flyer Bug:
4523403
Justin Ho [Thu, 9 Jun 2011 02:25:29 +0000 (19:25 -0700)]
Fixing remaining SetupWizard backgrounds for Flyer
Bug:
4523403
Change-Id: I568747b5b856f0418caaf81664dcfa5b8fdb2481
Irfan Sheriff [Thu, 9 Jun 2011 00:32:04 +0000 (17:32 -0700)]
am
4a1b8898: am
f448c32d: Merge "Fix UI settings display issues" into honeycomb-LTE
* commit '
4a1b8898c76a98f14bbc1690f172ec0e6171fab2':
Fix UI settings display issues
Jaikumar Ganesh [Wed, 8 Jun 2011 21:46:27 +0000 (14:46 -0700)]
am
3f3f390b: am
a6daa21d: (-s ours) am
015788ca: Merge "Import translations for cherry-picked Bluetooth changes." into gingerbread
* commit '
3f3f390b87113444c41b38b145f9a6ce0984d31d':
Import translations for cherry-picked Bluetooth changes.
Freeman Ng [Wed, 8 Jun 2011 21:35:18 +0000 (14:35 -0700)]
Merge "fix breakage caused by recent automerge"
Freeman Ng [Wed, 8 Jun 2011 21:34:23 +0000 (14:34 -0700)]
fix breakage caused by recent automerge
Change-Id: Ifb4c8428f5ebc728146da848cb0319626854c667
Freeman Ng [Wed, 8 Jun 2011 20:33:42 +0000 (13:33 -0700)]
resolved conflicts for merge of
ab48c22e to master
Change-Id: Ia69df4acb1eed7d728e310e4fde3f75a520377a0
satok [Wed, 8 Jun 2011 11:09:14 +0000 (04:09 -0700)]
Merge "Use getDisplayName for the name of InputMethodSubtype"
satok [Wed, 8 Jun 2011 09:44:52 +0000 (18:44 +0900)]
Use getDisplayName for the name of InputMethodSubtype
Change-Id: I9ad7790bc36ff2950e0238cae8ce3b785bb8eaa1
Freeman Ng [Wed, 8 Jun 2011 01:20:19 +0000 (18:20 -0700)]
am
6beb924e: am
351367bb: am
f368d4dc: Merge "add options to lock suw wifi setup orientation into portrait or landscape" into honeycomb-mr2
* commit '
6beb924ec2b147d259cd3438f56cd88691fc57e5':
add options to lock suw wifi setup orientation into portrait or landscape
Jaikumar Ganesh [Wed, 8 Jun 2011 00:53:29 +0000 (17:53 -0700)]
am
37940170: (-s ours) am
bd34e568: (-s ours) am
eddb21a2: Merge "Changes for API of Bluetooth Discoverability. DO NOT MERGE" into gingerbread
* commit '
37940170d00130d55d379178413f115b3feb59c4':
Changes for API of Bluetooth Discoverability. DO NOT MERGE
Jaikumar Ganesh [Wed, 8 Jun 2011 00:53:26 +0000 (17:53 -0700)]
am
eeb7803a: (-s ours) am
aeca1851: (-s ours) am
c955d8ee: Merge "Allow users to change the length of BT disoverability. DO NOT MERGE" into gingerbread
* commit '
eeb7803a9545e5574ef70831285f5121fe68a564':
Allow users to change the length of BT disoverability. DO NOT MERGE
Gilles Debunne [Wed, 8 Jun 2011 00:17:56 +0000 (17:17 -0700)]
am
62634b30: am
440ca974: am
8f1bd8a7: Bug
4539424: confirmation dialog always shown
* commit '
62634b309ab6c352a37c4d79d50fc78ab806304f':
Bug
4539424: confirmation dialog always shown
Irfan Sheriff [Tue, 7 Jun 2011 20:58:28 +0000 (13:58 -0700)]
am
f448c32d: Merge "Fix UI settings display issues" into honeycomb-LTE
* commit '
f448c32d9b4718e657fd4811f43d8df0f9d921af':
Fix UI settings display issues
Irfan Sheriff [Tue, 7 Jun 2011 20:54:53 +0000 (13:54 -0700)]
Merge "Fix UI settings display issues" into honeycomb-LTE
Jaikumar Ganesh [Tue, 7 Jun 2011 20:17:35 +0000 (13:17 -0700)]
am
a6daa21d: (-s ours) am
015788ca: Merge "Import translations for cherry-picked Bluetooth changes." into gingerbread
* commit '
a6daa21db833191a4e83aac5c488f971bff4578c':
Import translations for cherry-picked Bluetooth changes.
Freeman Ng [Tue, 7 Jun 2011 20:16:13 +0000 (13:16 -0700)]
am
c47e9a1d: am
0fd7736b: Merge "use prefs-style layout for setup wizard date/time settings on non-xlarge screens" into honeycomb-mr2
* commit '
c47e9a1d65dad04f778973b2898acf96c48b8914':
use prefs-style layout for setup wizard date/time settings on non-xlarge screens
Freeman Ng [Tue, 7 Jun 2011 19:58:06 +0000 (12:58 -0700)]
am
0fd7736b: Merge "use prefs-style layout for setup wizard date/time settings on non-xlarge screens" into honeycomb-mr2
* commit '
0fd7736b7153c1a304d7c6098ecf1223052f56d5':
use prefs-style layout for setup wizard date/time settings on non-xlarge screens
Freeman Ng [Tue, 7 Jun 2011 19:53:41 +0000 (12:53 -0700)]
Merge "use prefs-style layout for setup wizard date/time settings on non-xlarge screens" into honeycomb-mr2
Irfan Sheriff [Tue, 7 Jun 2011 19:28:26 +0000 (12:28 -0700)]
Fix UI settings display issues
- Update access points to reflect the latest IP configuration
- Show IP list for static IP networks
Bug:
4391449
Change-Id: If8fb6fe8bdca9d6e635b1b12927c17e1661f200c
Freeman Ng [Tue, 7 Jun 2011 18:51:23 +0000 (11:51 -0700)]
am
351367bb: am
f368d4dc: Merge "add options to lock suw wifi setup orientation into portrait or landscape" into honeycomb-mr2
* commit '
351367bbd830646ddeed49227ab37442479556f9':
add options to lock suw wifi setup orientation into portrait or landscape
Freeman Ng [Tue, 7 Jun 2011 18:48:33 +0000 (11:48 -0700)]
am
f368d4dc: Merge "add options to lock suw wifi setup orientation into portrait or landscape" into honeycomb-mr2
* commit '
f368d4dc525f79b09bd1e36b96d0ec5b179a1e8c':
add options to lock suw wifi setup orientation into portrait or landscape
Freeman Ng [Tue, 7 Jun 2011 18:46:02 +0000 (11:46 -0700)]
Merge "add options to lock suw wifi setup orientation into portrait or landscape" into honeycomb-mr2
Marco Nelissen [Tue, 7 Jun 2011 18:15:26 +0000 (11:15 -0700)]
am
079e30cd: resolved conflicts for merge of
531bed61 to honeycomb-plus-aosp
* commit '
079e30cd2a09388ba9ad2149a66de86be4f3a7ac':
Allow alternate string to be used for min_number
Gilles Debunne [Tue, 7 Jun 2011 18:14:41 +0000 (11:14 -0700)]
am
cfe26919: am
533b7b53: am
90599cdf: Merge "Used space visible in SD Card bar graph" into honeycomb-mr2
* commit '
cfe26919abcd3c466f40b437d084311bf025d449':
Used space visible in SD Card bar graph
Gilles Debunne [Tue, 7 Jun 2011 18:14:31 +0000 (11:14 -0700)]
am
b7e7a8cb: am
2a9dfc5c: am
99da1a22: Always show unmount confirmation dialog
* commit '
b7e7a8cb9cfa8b6fb7cd6b6d10913a00c45967f9':
Always show unmount confirmation dialog
Jaikumar Ganesh [Tue, 7 Jun 2011 17:01:40 +0000 (10:01 -0700)]
am
bd34e568: (-s ours) am
eddb21a2: Merge "Changes for API of Bluetooth Discoverability. DO NOT MERGE" into gingerbread
* commit '
bd34e568bf0a986f7254b93ac3b69fe3c0459162':
Changes for API of Bluetooth Discoverability. DO NOT MERGE
Jaikumar Ganesh [Tue, 7 Jun 2011 17:01:36 +0000 (10:01 -0700)]
am
aeca1851: (-s ours) am
c955d8ee: Merge "Allow users to change the length of BT disoverability. DO NOT MERGE" into gingerbread
* commit '
aeca185107481f28ad248c4f811bd708be8f5bff':
Allow users to change the length of BT disoverability. DO NOT MERGE
Gilles Debunne [Tue, 7 Jun 2011 01:18:31 +0000 (18:18 -0700)]
am
440ca974: am
8f1bd8a7: Bug
4539424: confirmation dialog always shown
* commit '
440ca97483553d2656b90001beabe76d38773544':
Bug
4539424: confirmation dialog always shown
OSDN Git Service
