OSDN Git Service
The Android Automerger [Tue, 23 Aug 2011 13:34:45 +0000 (06:34 -0700)]
merge in ics-release history after reset to master
Gilles Debunne [Tue, 23 Aug 2011 00:39:21 +0000 (17:39 -0700)]
Merge "Bug
5161247: More... is aligned with other main menu entries"
Gilles Debunne [Tue, 23 Aug 2011 00:39:07 +0000 (17:39 -0700)]
Merge "Bug
5078738: some options moved to overflow menu"
Gilles Debunne [Sat, 20 Aug 2011 00:55:06 +0000 (17:55 -0700)]
Bug
5161247: More... is aligned with other main menu entries
Change-Id: I813d9f674f1bcff940e5e57051e4ced8b56911a6
Amith Yamasani [Mon, 22 Aug 2011 22:06:57 +0000 (15:06 -0700)]
Reduce the minimum size of buttons in App details screen.
The earlier reduction was not sufficient for all cases.
If the min width is totally removed, it makes the buttons too
small in portrait, causing wrapping. Forcing to 0.5 weight will
make it too wide in landscape.
Change-Id: I02a71a065f14d5f75bea68aab25c8b16941589e9
Eric Fischer [Mon, 22 Aug 2011 19:07:13 +0000 (12:07 -0700)]
Merge "Import revised translations."
Eric Fischer [Mon, 22 Aug 2011 18:34:42 +0000 (11:34 -0700)]
Import revised translations.
Change-Id: I90d6935c58330a986ce67086f7af4ae9eb96e8ba
The Android Automerger [Mon, 22 Aug 2011 13:32:24 +0000 (06:32 -0700)]
merge in ics-release history after reset to master
Gilles Debunne [Fri, 19 Aug 2011 23:20:57 +0000 (16:20 -0700)]
Bug
5078738: some options moved to overflow menu
Change-Id: I4ea41dfcd2b0d05de870fb8af5a7614970538491
Irfan Sheriff [Fri, 19 Aug 2011 23:04:44 +0000 (16:04 -0700)]
Merge "Changing wifi connection dialog per UX"
Amith Yamasani [Fri, 19 Aug 2011 21:39:04 +0000 (14:39 -0700)]
Merge "Vertically center adjacent buttons in App Info screen."
Amith Yamasani [Fri, 19 Aug 2011 21:12:53 +0000 (14:12 -0700)]
Vertically center adjacent buttons in App Info screen.
Also reduce the min width of the buttons because the horizontal space
available has reduced.
Bug:
5156394
Change-Id: Ib7adfa208565503bbf537cb469e7d8feded2c5b8
Wink Saville [Fri, 19 Aug 2011 20:55:17 +0000 (13:55 -0700)]
Merge "Allow SIM PIN on CDMA LTE devices"
Jeff Sharkey [Fri, 19 Aug 2011 19:41:22 +0000 (12:41 -0700)]
Merge "More TabWidget and padding tweaks to match spec."
Wink Saville [Fri, 19 Aug 2011 00:09:38 +0000 (17:09 -0700)]
Allow SIM PIN on CDMA LTE devices
Bug:
5161360
Change-Id: I6f98da08e6be08403d9b3b08b02b02b9a63b14fe
Justin Ho [Fri, 19 Aug 2011 16:00:35 +0000 (09:00 -0700)]
Updated Settings icons for Backup and Security
Bug:
5174358
Change-Id: I0306d918fc85701b5278f82989883938457dd83b
Justin Ho [Fri, 19 Aug 2011 14:45:40 +0000 (07:45 -0700)]
Merge "Updates to screen security settings UI text per design. Bug:
5173985"
Isaac Levy [Tue, 16 Aug 2011 23:11:44 +0000 (16:11 -0700)]
Changing wifi connection dialog per UX
- Added an advanced options checkbox and moving WPS, DHCP, Proxy to there
- Minor string changes
Change-Id: I7a135a483435379692a54ea0ef2663136c468945
Ben Komalo [Fri, 19 Aug 2011 01:13:47 +0000 (18:13 -0700)]
Merge "Stop leaking wakelocks in cryptkeeper."
Claudia de Veaux [Thu, 18 Aug 2011 23:53:45 +0000 (16:53 -0700)]
Updates to screen security settings UI text per design.
Bug:
5173985
Change-Id: Icdb1873fd9867e3aed7752e90a00c2f725c1fa6a
Edit to lock_after_timeout_summary to rephrase so new option values will
read correctly.
Also, this change includes a fix for embarrassing spelling/grammar mistakes
in Accessibility hint text.
Bug:
5184517
Matthew Xie [Fri, 19 Aug 2011 00:12:33 +0000 (17:12 -0700)]
Merge "Remember user choice for phone book access permission dialog"
Matthew Xie [Tue, 9 Aug 2011 03:29:18 +0000 (20:29 -0700)]
Remember user choice for phone book access permission dialog
Change the always-allowed checkbox to be don't-ask-again checkbox to remember
user's decision so that user will not be bothered agian if he/she checks
the don't-ask-again checkbox
bug
5099661
Change-Id: If32ab8e93313bbd33ff040553083f0cf9359b69e
Amith Yamasani [Thu, 18 Aug 2011 22:58:42 +0000 (15:58 -0700)]
Merge "Power widget - track brightness changes."
Amith Yamasani [Thu, 18 Aug 2011 01:55:53 +0000 (18:55 -0700)]
Power widget - track brightness changes.
Also, don't change background data setting when changing auto-sync state.
Bug:
3030482
Change-Id: Iad19cac8375d2d38004dbe401ceaec5402e11989
Jeff Sharkey [Thu, 18 Aug 2011 18:59:19 +0000 (11:59 -0700)]
More TabWidget and padding tweaks to match spec.
Also fix NPE in UserDictionarySettings.
Bug:
5184822
Change-Id: I082981c3bcf9b1e6575dcf9f42495a17f0ec8672
Jeff Sharkey [Thu, 18 Aug 2011 22:01:21 +0000 (15:01 -0700)]
Merge "Allow data usage policy on Wi-Fi networks."
Jeff Sharkey [Thu, 18 Aug 2011 22:01:18 +0000 (15:01 -0700)]
Merge "Reinforce limited networks in data usage UI."
Ben Komalo [Thu, 18 Aug 2011 21:50:26 +0000 (14:50 -0700)]
Stop leaking wakelocks in cryptkeeper.
Also add in logging for certain events, as well as progress update to
help hunt down a stuck-in-progress bug
Bug:
5163155
Change-Id: I2e01a56b012f41f178beba0becfbe8173a1715ee
Martijn Coenen [Thu, 18 Aug 2011 21:20:19 +0000 (14:20 -0700)]
Merge "ShareTap: add some more descriptive text."
Martijn Coenen [Thu, 18 Aug 2011 20:57:50 +0000 (22:57 +0200)]
ShareTap: add some more descriptive text.
Change-Id: I34c54c3f171ab02706ac3c4e3e15ea2629f91a7b
Jeff Sharkey [Thu, 18 Aug 2011 00:08:19 +0000 (17:08 -0700)]
Allow data usage policy on Wi-Fi networks.
Create NetworkPolicy when it doesn't already exist.
Bug:
4646471,
5085110
Change-Id: I38b8b03689710df06d1734a4b4d9e12d98794154
Jeff Sharkey [Wed, 17 Aug 2011 22:08:12 +0000 (15:08 -0700)]
Reinforce limited networks in data usage UI.
When restricting background data, list the networks the restriction
applies to.
Bug:
5131685,
5058106
Change-Id: Idde084dfa5ac6313a8d145cb6f2603aedb154590
Nick Pelly [Thu, 18 Aug 2011 18:42:51 +0000 (11:42 -0700)]
Fix first-share notification intent.
Change-Id: I9190e977bfd416b3292889abc86d78dc3816ede4
Jeff Sharkey [Thu, 18 Aug 2011 17:52:06 +0000 (10:52 -0700)]
Merge "Follow preferences padding changes in framework."
Martijn Coenen [Thu, 18 Aug 2011 07:48:34 +0000 (09:48 +0200)]
Sharetap settings screen animation and text.
Change-Id: Ia19426be5a38a191a2786c1e75c4c5833a7c155f
The Android Automerger [Thu, 18 Aug 2011 13:34:52 +0000 (06:34 -0700)]
merge in ics-release history after reset to master
Freeman Ng [Thu, 18 Aug 2011 00:01:28 +0000 (17:01 -0700)]
Merge "remove obsolete background bitmaps"
Freeman Ng [Wed, 17 Aug 2011 23:58:56 +0000 (16:58 -0700)]
remove obsolete background bitmaps
Change-Id: I5ca2b3eeda1f9d2e63c495e5f5b88e28592c5655
repo sync [Wed, 17 Aug 2011 23:39:46 +0000 (16:39 -0700)]
Merge "Add p2p settings only in debug mode"
Justin Ho [Wed, 17 Aug 2011 21:18:05 +0000 (14:18 -0700)]
Merge "Part of effort to remove "failure" messaging to end-users. Bug:
5165745"
Jeff Sharkey [Wed, 17 Aug 2011 21:09:42 +0000 (14:09 -0700)]
Merge "Remove "background data" from accounts settings."
Ben Komalo [Wed, 17 Aug 2011 00:48:42 +0000 (17:48 -0700)]
Fixes to CryptKeeper layout for phones
- prevents crash when trying to show error state
- makes progress screen not look horribly broken
Bug:
5174783
Bug:
4671153
Change-Id: Ia72830e2fdb72f174b3ed01b6fc14be7152d1932
Ben Komalo [Wed, 17 Aug 2011 18:08:15 +0000 (11:08 -0700)]
Merge "Allow CryptKeeper to be started for UI debugging"
Amith Yamasani [Wed, 17 Aug 2011 17:54:31 +0000 (10:54 -0700)]
Merge "Match preference title with dialog title for font size."
Ben Komalo [Wed, 17 Aug 2011 00:48:25 +0000 (17:48 -0700)]
Allow CryptKeeper to be started for UI debugging
Change-Id: I3ca6e00018da39123b470c3960c00c8cd43f9f72
The Android Automerger [Wed, 17 Aug 2011 13:32:26 +0000 (06:32 -0700)]
merge in ics-release history after reset to master
repo sync [Wed, 17 Aug 2011 04:39:55 +0000 (21:39 -0700)]
Add p2p settings only in debug mode
Bug:
5002384
Change-Id: I12d691ea5b2c820c33ef8735d997a0c04b636aa7
Irfan Sheriff [Wed, 17 Aug 2011 03:48:45 +0000 (20:48 -0700)]
Merge "Changed wifi status lines per UX consult"
Amith Yamasani [Wed, 17 Aug 2011 01:25:40 +0000 (18:25 -0700)]
Match preference title with dialog title for font size.
Bug:
5156411
Change-Id: I4894dbf9fd4fbb70d1ec95c01503f3594b366120
Jeff Sharkey [Wed, 17 Aug 2011 00:28:15 +0000 (17:28 -0700)]
Remove "background data" from accounts settings.
This has been replaced by setting in data usage panel.
Bug:
4979025
Change-Id: I4e3011233aa2522c05b1497abc54fd421f4a25fb
Isaac Levy [Fri, 12 Aug 2011 06:55:04 +0000 (23:55 -0700)]
Changed wifi status lines per UX consult
Change-Id: I656fa2c5c52338b320796a919edb5018e7b68851
Jeff Sharkey [Tue, 16 Aug 2011 23:14:49 +0000 (16:14 -0700)]
Follow preferences padding changes in framework.
Change-Id: Ia83237290da035e5ee7a2e92ef56fc02838aac56
Claudia de Veaux [Tue, 16 Aug 2011 23:29:03 +0000 (16:29 -0700)]
Part of effort to remove "failure" messaging to end-users.
Bug:
5165745
Change-Id: I26ba08c783ede59e503deea2f1018af503fa0f33
repo sync [Tue, 16 Aug 2011 21:51:06 +0000 (14:51 -0700)]
Merge "Use updated wifip2pmanager API"
Amith Yamasani [Tue, 16 Aug 2011 20:36:52 +0000 (13:36 -0700)]
Adjust the margins for the volume seekbars.
Bug:
5165547
Change-Id: Ic82c03a4b39895f872bfd8ef4e46c795502f78a4
The Android Automerger [Tue, 16 Aug 2011 13:34:52 +0000 (06:34 -0700)]
merge in ics-release history after reset to master
Jeff Sharkey [Tue, 16 Aug 2011 01:44:17 +0000 (18:44 -0700)]
Merge "Foreground/background network stats pie chart."
Jake Hamby [Mon, 15 Aug 2011 23:02:47 +0000 (16:02 -0700)]
Merge "Bluetooth : fix for Settings crashes while rotating the screen."
Jeff Sharkey [Fri, 12 Aug 2011 01:26:57 +0000 (18:26 -0700)]
Foreground/background network stats pie chart.
Load foreground/background network stats, showing combined in chart
series, and also separated in pie chart. Padding to match spec,
updated action bar tabs, and limit width for wide devices. Also
clear UI options for requesting fragments. Move to action bar
overflow menu instead of custom icon. Show detail chart data outside
current inspection range.
Bug:
5106163,
5143670,
5163064,
5162671,
5148713,
5129036,
5096626
Change-Id: I548fef209e1f714f70ee6bf7098dbdb881692df4
jhtop.kim [Wed, 20 Jul 2011 05:03:07 +0000 (14:03 +0900)]
Bluetooth : fix for Settings crashes while rotating the screen.
- Add some codes preventing setting crash when rotating the screen
when the Rename device or Visibility timeout dialogs are visible.
Change-Id: I5e142a5d869a0d5c91c6ace80093d09178d79558
Signed-off-by: jhtop.kim <jhtop.kim@samsung.com>
Eric Fischer [Mon, 15 Aug 2011 17:22:27 +0000 (10:22 -0700)]
Merge "Import revised translations."
The Android Automerger [Mon, 15 Aug 2011 13:34:41 +0000 (06:34 -0700)]
merge in ics-release history after reset to master
Christopher Tate [Sat, 13 Aug 2011 00:34:54 +0000 (17:34 -0700)]
Merge "Move the desktop backup pw from "Backup and reset" to "Developer" settings"
Christopher Tate [Sat, 13 Aug 2011 00:22:41 +0000 (17:22 -0700)]
Move the desktop backup pw from "Backup and reset" to "Developer" settings
Addresses bug
5136161
Change-Id: Ia26258e0c8b0378184e4bac32a5da47de5da686f
Eric Fischer [Sat, 13 Aug 2011 00:21:28 +0000 (17:21 -0700)]
Import revised translations.
Change-Id: I5792da0377dcc34efd14e0c23db5b85d5a6382ae
Amith Yamasani [Fri, 12 Aug 2011 23:26:54 +0000 (16:26 -0700)]
am
7e1c6cc0: am
d7d6c7ff: am
34d9b03f: Merge "Fix wrong behavior when changing pin code in settings"
* commit '
7e1c6cc0fe3c3520d9d026c0dabbfb6e38113df9':
Fix wrong behavior when changing pin code in settings
Amith Yamasani [Fri, 12 Aug 2011 23:26:49 +0000 (16:26 -0700)]
am
f14f96ef: am
b3f6116e: am
fd73824d: Merge "Fix: Text is cut in Edit word edit box when adding word to dictionary"
* commit '
f14f96efa831e9a81983869d8959e7cef6caba9a':
Fix: Text is cut in Edit word edit box when adding word to dictionary
Amith Yamasani [Fri, 12 Aug 2011 22:43:43 +0000 (15:43 -0700)]
Merge "Potential fix for NPE in AccessibilitySettings."
Gilles Debunne [Fri, 12 Aug 2011 20:53:43 +0000 (13:53 -0700)]
Merge "Format volume option restored"
Amith Yamasani [Fri, 12 Aug 2011 20:16:18 +0000 (13:16 -0700)]
am
d7d6c7ff: am
34d9b03f: Merge "Fix wrong behavior when changing pin code in settings"
* commit '
d7d6c7ffad195e40db69c9ea0401f6717bcaeaf0':
Fix wrong behavior when changing pin code in settings
Amith Yamasani [Fri, 12 Aug 2011 20:16:17 +0000 (13:16 -0700)]
am
b3f6116e: am
fd73824d: Merge "Fix: Text is cut in Edit word edit box when adding word to dictionary"
* commit '
b3f6116e2bd8bfa1b23b724526badaa6b1602a12':
Fix: Text is cut in Edit word edit box when adding word to dictionary
Amith Yamasani [Fri, 12 Aug 2011 18:14:51 +0000 (11:14 -0700)]
Potential fix for NPE in AccessibilitySettings.
Bug:
5093363
Change-Id: I1e6b9bf0fd25b0298606035155bb87e6f64711c4
satok [Fri, 12 Aug 2011 02:45:52 +0000 (11:45 +0900)]
Fix the title of the input method subtype enabler
Bug:
5097548
Change-Id: If01e13bd1ab7ac851b613450018f68f7f42f1e14
Amith Yamasani [Thu, 11 Aug 2011 19:44:55 +0000 (12:44 -0700)]
am
34d9b03f: Merge "Fix wrong behavior when changing pin code in settings"
* commit '
34d9b03f1c6c5bf7d8caa74dc07124a6e67f89d5':
Fix wrong behavior when changing pin code in settings
Amith Yamasani [Thu, 11 Aug 2011 19:33:37 +0000 (12:33 -0700)]
Merge "Fix wrong behavior when changing pin code in settings"
Irfan Sheriff [Thu, 11 Aug 2011 19:33:29 +0000 (12:33 -0700)]
Merge "Wifi state reset when disconnected"
Amith Yamasani [Thu, 11 Aug 2011 19:31:47 +0000 (12:31 -0700)]
am
fd73824d: Merge "Fix: Text is cut in Edit word edit box when adding word to dictionary"
* commit '
fd73824d60ca92e297f354986cad525b947d05dd':
Fix: Text is cut in Edit word edit box when adding word to dictionary
Amith Yamasani [Thu, 11 Aug 2011 19:17:03 +0000 (12:17 -0700)]
Merge "Fix: Text is cut in Edit word edit box when adding word to dictionary"
Amith Yamasani [Thu, 11 Aug 2011 18:30:55 +0000 (11:30 -0700)]
Merge "Fix mute toggle behavior in Volume dialog."
The Android Automerger [Thu, 11 Aug 2011 13:34:26 +0000 (06:34 -0700)]
merge in ics-release history after reset to master
Amith Yamasani [Thu, 11 Aug 2011 00:10:04 +0000 (17:10 -0700)]
Fix mute toggle behavior in Volume dialog.
Adjust some padding and alignment.
Bug:
5128528
Fix highlighted entry when using Battery shortcut.
Bug:
5099767
Change-Id: I830dbb40b0b8a6448d33b2be2c36b9b80ff14bc4
Amith Yamasani [Wed, 10 Aug 2011 21:21:03 +0000 (14:21 -0700)]
Merge "Volumes panel shouldn't depend on Silent mode setting."
Claudia de Veaux [Wed, 10 Aug 2011 19:58:53 +0000 (12:58 -0700)]
Merge "Edit to label for regional date format to "Regional" from "Normal" Bug:
3471626"
The Android Automerger [Wed, 10 Aug 2011 13:34:22 +0000 (06:34 -0700)]
merge in ics-release history after reset to master
Ken Wakasa [Wed, 10 Aug 2011 07:58:53 +0000 (16:58 +0900)]
Prevent crashes when IME's settings activity is missing
bug:
5029444
Change-Id: I5c045123dbca2581f2e7d9f602e7511398b83504
Nick Pelly [Wed, 10 Aug 2011 05:27:01 +0000 (22:27 -0700)]
Merge "Add support for NFC in airplane mode."
Claudia de Veaux [Wed, 10 Aug 2011 01:23:26 +0000 (18:23 -0700)]
Edit to label for regional date format to "Regional" from "Normal"
Bug:
3471626
Change-Id: Ife611299a4ce0ce26d94d6fdd15581102a2e869f
Justin Ho [Tue, 9 Aug 2011 21:29:37 +0000 (14:29 -0700)]
Merge "Updated Settings icons Removed More wifi settings icon Bug:
5084184"
Amith Yamasani [Tue, 9 Aug 2011 17:52:38 +0000 (10:52 -0700)]
Volumes panel shouldn't depend on Silent mode setting.
Otherwise it wont be possible to adjust alarm and music volumes.
Also fixes an inconsistent state when screen is turned off and on.
Bug:
5128528
Bug:
5128850
Change-Id: I3bfae44956de291b086905b9f43ca4ff5c7b9bbf
Justin Ho [Tue, 9 Aug 2011 18:58:47 +0000 (11:58 -0700)]
Updated Settings icons
Removed More wifi settings icon
Bug:
5084184
Change-Id: I4ed948bd24544d512179765eb917f3932f60751b
Jake Hamby [Tue, 9 Aug 2011 20:29:25 +0000 (13:29 -0700)]
Merge "Bluetooth : fix for unexpected discovery summary string changing"
Jake Hamby [Tue, 9 Aug 2011 20:29:12 +0000 (13:29 -0700)]
Merge "Bluetooth : fix for handling back key during pair dialog display"
Claudia de Veaux [Tue, 9 Aug 2011 18:07:13 +0000 (11:07 -0700)]
Merge "Fix for
5088341 Security settings: String changes related to renaming "Timeout" to "Automatically lock". Changed instance of "Timeout" to "Automatically lock", and summary text to be shorter."
Claudia de Veaux [Tue, 9 Aug 2011 16:56:16 +0000 (09:56 -0700)]
Fix for
5088341 Security settings: String changes related to renaming "Timeout" to "Automatically lock". Changed instance of "Timeout" to "Automatically lock", and summary text to be shorter.
Change-Id: I93b380b97ebfb4611fda9315ed8ea770ad3e8fb5
Nick Pelly [Tue, 9 Aug 2011 14:10:16 +0000 (07:10 -0700)]
Add support for NFC in airplane mode.
Also update logic in Settings for new async NfcAdapter.enable() and disable().
Change-Id: Ie1e5407498ac7beb5a4e21daec0ada0e8ae9c388
The Android Automerger [Tue, 9 Aug 2011 13:35:03 +0000 (06:35 -0700)]
merge in ics-release history after reset to master
Dianne Hackborn [Tue, 9 Aug 2011 03:14:59 +0000 (20:14 -0700)]
Merge "Fix issue #
5137681: et_source_broad_Android - GoogleJob..."
Chia-chi Yeh [Tue, 9 Aug 2011 00:45:41 +0000 (17:45 -0700)]
Merge "VpnSettings: fix bugs."
Dianne Hackborn [Tue, 9 Aug 2011 00:23:27 +0000 (17:23 -0700)]
Fix issue #
5137681: et_source_broad_Android - GoogleJob...
...[ 91639 / - ]-GTT _request "0.85" clarification
Whatever that means.
To me it means, "do not translate."
Change-Id: Ieedd1251f3956f72ac7f22095cc82f839736e3bc
jhtop.kim [Thu, 4 Aug 2011 03:09:17 +0000 (12:09 +0900)]
Bluetooth : fix for unexpected discovery summary string changing
- While Visibility timeout setting is never,
the summary string "Visible to all nearby Bluetooth devices" is shown.
but if rotating screen or unpairing, pairing actions make the summary
be changed "Not visible to other Bluetooth devices" or
"Only visible to paired devices"
- call handleModeChanged() to refresh summary state.
Change-Id: I4b324f2a9530e5e4ca4571f3dd47e8992bdae0cb
Signed-off-by: jhtop.kim <jhtop.kim@samsung.com>