OSDN Git Service
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
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
Eric Fischer [Mon, 8 Aug 2011 22:04:44 +0000 (15:04 -0700)]
Merge "Import revised translations."
Chia-chi Yeh [Mon, 8 Aug 2011 21:33:53 +0000 (14:33 -0700)]
VpnSettings: fix bugs.
1. Support identifier in L2TP/IPSec PSK.
2. Fix profile validation for IPSec Hybrid RSA.
3. Fix crash when the user does not want to initialize keystore.
Change-Id: Id46dbbc84915dfb69f8bab6b540426e7614ab7c6
Claudia de Veaux [Mon, 8 Aug 2011 21:15:28 +0000 (14:15 -0700)]
Merge "Fix for
5088373 Display settings: String changes related to renaming "Timeout" to "Sleep". Changed one instance of "Timeout" to "Sleep" and modified the setting description per bug."
Jake Hamby [Mon, 8 Aug 2011 21:07:34 +0000 (14:07 -0700)]
Merge "Fix multiple BT settings bugs."
Jim Miller [Mon, 8 Aug 2011 20:21:31 +0000 (13:21 -0700)]
Merge "Fix
5044847: Minor tweaks to SecuritySettings."
Claudia de Veaux [Mon, 8 Aug 2011 19:22:18 +0000 (12:22 -0700)]
Fix for
5088373 Display settings: String changes related to renaming "Timeout" to "Sleep". Changed one instance of "Timeout" to "Sleep" and modified the setting description per bug.
Change-Id: Iab9084851b1fbf6bd1e8d3b730219f91232decb4
Dianne Hackborn [Mon, 8 Aug 2011 04:55:54 +0000 (21:55 -0700)]
Merge "Update to work with the activity manager taking over OOM settings."
Dianne Hackborn [Sun, 7 Aug 2011 23:29:05 +0000 (16:29 -0700)]
Update to work with the activity manager taking over OOM settings.
The values it needs are no longer in properties.
Also fix a few problems: bug with apps being left in the services
list, sorting of internal storage.
Change-Id: Ife9706e004931269c36a7bc37b9dbb016064c2e4
Jim Miller [Sun, 7 Aug 2011 23:06:13 +0000 (16:06 -0700)]
Fix
5044847: Minor tweaks to SecuritySettings.
Fix for
5044847 removes "Press menu for help" which is no longer used on any device.
Fix for
5092312 removes black background from pattern/pin/password settings.
Change-Id: I849ea0296aa9f0e9ace65086f9b154a961959f00
Claudia de Veaux [Sat, 6 Aug 2011 01:24:20 +0000 (18:24 -0700)]
Merge "Fix for Bug
5110980 Settings: "VPN settings" renamed to "VPN". Changed two instances of "VPN settings" to "VPN"."
Dianne Hackborn [Sat, 6 Aug 2011 00:51:48 +0000 (17:51 -0700)]
Use new more efficient API for retrieving pss.
Change-Id: Ibcbcc397c2a7c19acd2de640528392df9bb780bb
Claudia de Veaux [Sat, 6 Aug 2011 00:24:20 +0000 (17:24 -0700)]
Fix for Bug
5110980 Settings: "VPN settings" renamed to "VPN". Changed two instances of "VPN settings" to "VPN".
Change-Id: I631ff361d32e0ee063e7fefde6a130e42e5f4dfd
Eric Fischer [Sat, 6 Aug 2011 00:07:14 +0000 (17:07 -0700)]
Import revised translations.
Change-Id: I5cec26c7b9e6dc27c347bfc830589eda1ad4f4d6
Jeff Sharkey [Fri, 5 Aug 2011 07:14:43 +0000 (00:14 -0700)]
Merge "Data usage app icons and details, chart labels."
Jeff Sharkey [Fri, 5 Aug 2011 04:17:23 +0000 (21:17 -0700)]
Data usage app icons and details, chart labels.
Add app icons into both summary list and details pane. Also show list
of all applications merged under a UID. Draw dates on chart axis, and
avoid flashing policy sweeps when switching networks in detail mode.
Bug:
5087283,
5038812
Change-Id: I1dcd03ca85b517f8726452af8a46b4be9b3d20f1
The Android Open Source Project [Fri, 5 Aug 2011 01:46:20 +0000 (18:46 -0700)]
Reconcile with gingerbread-release gingerbread-mr4-release
Change-Id: I2e05e29384ce13de26514fd1e120c00cd0e39112
Eric Fischer [Thu, 4 Aug 2011 23:13:54 +0000 (16:13 -0700)]
Merge "Import revised translations."
Eric Fischer [Thu, 4 Aug 2011 23:13:03 +0000 (16:13 -0700)]
Import revised translations.
Change-Id: Ifefc82b6cc09d33cf62244bf5e22c5185946d4e0
Jeff Sharkey [Thu, 4 Aug 2011 22:39:27 +0000 (15:39 -0700)]
Merge "Data usage disabled state, smaller parcels."
Mike Cleron [Thu, 4 Aug 2011 22:30:57 +0000 (15:30 -0700)]
Merge "Save and restore wifi dialogs on screen rotation."
Eric Fischer [Thu, 4 Aug 2011 21:26:41 +0000 (14:26 -0700)]
Merge "Remove unused string reference."
Amith Yamasani [Thu, 4 Aug 2011 21:21:06 +0000 (14:21 -0700)]
Remove unused string reference.
Change-Id: I411a924c22c84d1a62e0e42df7429e4d869fe3ed
Amith Yamasani [Wed, 3 Aug 2011 22:06:10 +0000 (15:06 -0700)]
Save and restore wifi dialogs on screen rotation.
Bug:
4981732
Change-Id: If065f9af93af405d954fde044351e473d62ea91b
Chia-chi Yeh [Thu, 4 Aug 2011 20:04:51 +0000 (13:04 -0700)]
Merge "VpnSettings: the field has been renamed."
Eric Fischer [Thu, 4 Aug 2011 18:25:44 +0000 (11:25 -0700)]
Merge "Restore deleted strings that are still in use."
Irfan Sheriff [Thu, 4 Aug 2011 17:29:30 +0000 (10:29 -0700)]
Merge "Fix package path for p2p settings"
Irfan Sheriff [Wed, 3 Aug 2011 22:40:04 +0000 (15:40 -0700)]
Fix package path for p2p settings
Split p2p change to avoid eclipse errors on master
Bug:
5002384
Change-Id: I446d4524b823d42c79daa24d43aa24012743e734
Adam Powell [Thu, 4 Aug 2011 03:12:41 +0000 (20:12 -0700)]
Give Settings back its split action bars
Change-Id: I0b8572fee84833a8495125643542380d7f90aa3e
Jake Hamby [Mon, 1 Aug 2011 23:36:35 +0000 (16:36 -0700)]
Fix multiple BT settings bugs.
- Change Bluetooth profiles screen to match ICS wireframes
- Remove BluetoothProfilePreference.java (no longer used)
- Remove "Pair with this device" summary below every unpaired device
- Remove "Paired but not connected" summary below unconnected paired devices
- Fix auto connection after pairing (reuse existing CachedBluetoothDevice)
- Add "Connected (no phone/media)" summaries based on ICS wireframes
- Fix visibility timeout strings.
- Fix crash when starting Bluetooth from Settings shortcut widget.
Bug:
5064139
Bug:
5064324
Bug:
5080404
Bug:
5093513
Bug:
5104485
Change-Id: Ie87103e183ce414c86cb1831a38ef0178b1b1292
Jeff Sharkey [Thu, 4 Aug 2011 00:16:09 +0000 (17:16 -0700)]
Data usage disabled state, smaller parcels.
Hide policy controls when low-level bandwidth controls are disabled
or when radio is disabled. Only request byte counters from history
to reduce parcel size by about 60%.
Bug:
5096903,
5096752
Change-Id: I407b7a01bf60b7105994052cc6e3262054f51184
Chia-chi Yeh [Wed, 3 Aug 2011 22:44:08 +0000 (15:44 -0700)]
VpnSettings: the field has been renamed.
Change-Id: I1e234e96d0fa4af6f03a5b902073460acffd8e28
Amith Yamasani [Wed, 3 Aug 2011 21:51:28 +0000 (14:51 -0700)]
Merge "Sound settings screen and volumes dialog reconfiguration."
Amith Yamasani [Wed, 3 Aug 2011 20:54:56 +0000 (13:54 -0700)]
Merge "Center button text in the InstalledAppDetails screens."
Amith Yamasani [Wed, 3 Aug 2011 19:08:23 +0000 (12:08 -0700)]
Center button text in the InstalledAppDetails screens.
Bug:
5098457
Change-Id: I2ae0083c9547d17324ebbd667eb85f58da88ec15
Amith Yamasani [Mon, 1 Aug 2011 22:55:06 +0000 (15:55 -0700)]
Sound settings screen and volumes dialog reconfiguration.
Removed the "Notifications use ring volume" checkbox.
Show the current ringtones in the summary area.
Bug:
5032308
Change-Id: I17e63f32c1775dd2097904df1aa6aaf699bd8ae2
Adam Powell [Wed, 3 Aug 2011 01:45:24 +0000 (18:45 -0700)]
Merge "Follow framework API changes"
Christopher Tate [Wed, 3 Aug 2011 00:43:21 +0000 (17:43 -0700)]
Merge "Tweak font-size summary display"
Christopher Tate [Wed, 3 Aug 2011 00:42:57 +0000 (17:42 -0700)]
Merge "Always put 'USB COMPUTER CONNECTION' into the overflow menu"
Dianne Hackborn [Wed, 3 Aug 2011 00:05:52 +0000 (17:05 -0700)]
Merge "Clear bitmaps from canvses after done drawing to them."
Dianne Hackborn [Wed, 3 Aug 2011 00:01:30 +0000 (17:01 -0700)]
Clear bitmaps from canvses after done drawing to them.
Change-Id: I902edf771c66485269289aeeb4d64c56fe899906
Dianne Hackborn [Tue, 2 Aug 2011 23:58:30 +0000 (16:58 -0700)]
Merge "New development setting for ANRs."
Adam Powell [Tue, 2 Aug 2011 23:52:34 +0000 (16:52 -0700)]
Follow framework API changes
Change-Id: Ieb06a35a65d70d7b65f801814a0a46c9acc80445
Eric Fischer [Tue, 2 Aug 2011 23:46:51 +0000 (16:46 -0700)]
Restore deleted strings that are still in use.
Change-Id: I491bbe4576c6995b082d197f80b3a6b54443bd84
Christopher Tate [Tue, 2 Aug 2011 23:43:47 +0000 (16:43 -0700)]
Tweak font-size summary display
Now the setting title & summary are presented as e.g.:
Font size
Extremely large
Bug
5022057
Change-Id: I28e0d84705b0c9190431ed5419866ebd66d68dc7
Christopher Tate [Tue, 2 Aug 2011 23:24:35 +0000 (16:24 -0700)]
Always put 'USB COMPUTER CONNECTION' into the overflow menu
Bug
5011831
Change-Id: I93d24a16508cfcc9f81b8bd3ad43cfffe52db1d5
Sean Cotter [Tue, 2 Aug 2011 23:16:11 +0000 (16:16 -0700)]
Merge "String changes for Location services Settings screen Bug:
5098817"
Eric Fischer [Mon, 27 Jun 2011 21:50:05 +0000 (14:50 -0700)]
Import new translations.
Change-Id: I7b45aed12328a25b81878f29364bcc837c956509
Jaikumar Ganesh [Mon, 20 Jun 2011 21:47:27 +0000 (14:47 -0700)]
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
Jaikumar Ganesh [Mon, 20 Jun 2011 23:13:38 +0000 (16:13 -0700)]
Remove CHAR LIMIT from string to fix build.
Change-Id: I590126db92329efcc6aea95bb97bb9d053905276
Jaikumar Ganesh [Mon, 20 Jun 2011 19:21:14 +0000 (12:21 -0700)]
New strings for Bluetooth
This is for the user dialog for incoming BT requests.
Change-Id: Ifa8f8e9e00861c65cf1d2f0520d072935b845785
Dianne Hackborn [Tue, 2 Aug 2011 22:08:04 +0000 (15:08 -0700)]
New development setting for ANRs.
Change-Id: I1fcde9d371bbb6e0eef0da7749a8c8cfb9a2c881
Martijn Coenen [Tue, 2 Aug 2011 17:40:08 +0000 (10:40 -0700)]
Merge "Fix ActionBar title for NFC sharing."
Martijn Coenen [Tue, 2 Aug 2011 17:29:43 +0000 (10:29 -0700)]
Fix ActionBar title for NFC sharing.
Change-Id: I9d7c479d06437ece3f598506ce1cf2be322b12d0
Sean Cotter [Fri, 29 Jul 2011 23:36:30 +0000 (16:36 -0700)]
String changes for Location services Settings screen
Bug:
5098817
Change-Id: I11cf170e06e5cc117d62ffe1f72dbb47c7fc9e0e
Mike Lockwood [Tue, 2 Aug 2011 16:56:56 +0000 (12:56 -0400)]
USB: Fix problem updating status of MTP/PTP checkboxes
Change-Id: Idc12e8cce2cde6aca71e05943e2f2d9a0becce6c
Bug:
5108883
Signed-off-by: Mike Lockwood <lockwood@android.com>
satok [Tue, 2 Aug 2011 07:05:48 +0000 (00:05 -0700)]
Merge "Add a way to choose the current spell checker"
satok [Mon, 1 Aug 2011 12:40:23 +0000 (21:40 +0900)]
Add a way to choose the current spell checker
Bug:
5057977
Change-Id: I86366d6be0d59dfb7a80431fcc87f55b1f27a014
Jeff Sharkey [Tue, 2 Aug 2011 00:13:10 +0000 (17:13 -0700)]
Always use non-solid action bar theme.
Change-Id: I1fa004b7c34aac424ac9ff9c4d743410e25f5068
Jeff Sharkey [Mon, 1 Aug 2011 22:29:30 +0000 (15:29 -0700)]
Data usage axis grow/shrink, other fixes.
When dragging vertical sweeps near edges, grow or shrink axis scale
to give users access to larger limits. Triggers 10% for each 250ms
that user continues holding. Change axis math to support arbitrary
ranges beyond [0,5GB].
Show "empty" message when no application details found. Added strings
that didn't appear in default language. Better sweep margins using
dip instead of scale units. Format time ranges in local time instead
of UTC. Only show dashed estimate when it would reach near warning
or limit. Extend app usage series until "now" when buckets missing.
Bug:
5096685,
5092538,
5058158,
5058114,
5058024,
4643457
Change-Id: I45cf33f7f3baeba1bfa5b21f31cb0a12006f62fa
Mike Lockwood [Mon, 1 Aug 2011 22:27:08 +0000 (15:27 -0700)]
Merge "Shorten summary text for MTP widget in USB settings"
Amith Yamasani [Mon, 1 Aug 2011 21:49:16 +0000 (14:49 -0700)]
Merge "Limit the list of settings that can have shortcuts on home."
Mike Lockwood [Mon, 1 Aug 2011 21:41:41 +0000 (17:41 -0400)]
Shorten summary text for MTP widget in USB settings
Change-Id: I1d005e9926fac59fcc225eb9200520a6ab36e823
Bug:
4335199
Signed-off-by: Mike Lockwood <lockwood@android.com>
Mike Lockwood [Mon, 1 Aug 2011 13:53:37 +0000 (09:53 -0400)]
USB Settings: Remove AFT installer CD; add help text to MTP and PTP widget summary
Bug:
4335199
Change-Id: I5f2a5d650a184b528028596e03e01ea98bf3815f
Signed-off-by: Mike Lockwood <lockwood@android.com>
Svetoslav Ganov [Sat, 30 Jul 2011 00:51:53 +0000 (17:51 -0700)]
Merge "Accessibility settings crash when run for the first time on clean device"
Christopher Tate [Sat, 30 Jul 2011 00:41:44 +0000 (17:41 -0700)]
Merge "Report current font size in the 'Font size' setting summary"
Christopher Tate [Fri, 29 Jul 2011 23:16:22 +0000 (16:16 -0700)]
Report current font size in the 'Font size' setting summary
Bug
5022057
Change-Id: I74a266bc70fd885fd15ac09915b205b9b3e10679
Svetoslav Ganov [Fri, 29 Jul 2011 22:49:24 +0000 (15:49 -0700)]
Accessibility settings crash when run for the first time on clean device
Change-Id: I9bb0b9d1ab381ba00838b1be3a76f549f32be655
Gilles Debunne [Fri, 29 Jul 2011 22:47:15 +0000 (15:47 -0700)]
Merge "Bug
5003361: No Android Dreams in Settings / Display"
Svetoslav Ganov [Fri, 29 Jul 2011 22:32:53 +0000 (15:32 -0700)]
Merge "Polish of the accessibility settings."
Svetoslav Ganov [Wed, 27 Jul 2011 21:54:52 +0000 (14:54 -0700)]
Polish of the accessibility settings.
Change-Id: Ifb32ec6745e566cf7ffafe20019b68d95661b45d
Gilles Debunne [Fri, 29 Jul 2011 18:46:56 +0000 (11:46 -0700)]
Merge "Bug AOSP 12476: Manual time setting resets seconds to 0."
Matthew Xie [Fri, 29 Jul 2011 00:47:19 +0000 (17:47 -0700)]
Merge "Save changed name from CachedBluetoothDevice to native storage"
Svetoslav Ganov [Thu, 28 Jul 2011 23:30:21 +0000 (16:30 -0700)]
Merge "Added contentDescription to IME settings image button."
Alan Viverette [Thu, 28 Jul 2011 23:11:37 +0000 (16:11 -0700)]
Added contentDescription to IME settings image button.
Bug:
5092506
Change-Id: Ibd27e4b0d798dd21df0e6eb69babc0df2292bf5f
Gilles Debunne [Thu, 28 Jul 2011 22:31:26 +0000 (15:31 -0700)]
Bug
5003361: No Android Dreams in Settings / Display
I just commented it. Should we remove everything instead to avoid a possible
leak of this feature?
Remove src/com/android/settings/DreamSettings.java too in that case.
Change-Id: I52addca1d1b316254b7a495966eaa374ff0e97b3
Christopher Tate [Mon, 25 Jul 2011 19:09:10 +0000 (12:09 -0700)]
Add backup password setting UI
Bug
4901637
Change-Id: I515f1475d3675285a830b4b5ddd1f011f1b56e3a
Gilles Debunne [Thu, 28 Jul 2011 21:16:51 +0000 (14:16 -0700)]
Bug AOSP 12476: Manual time setting resets seconds to 0.
Change-Id: If24d25050b3537832c3229cd84205f3b6cef1989
Amith Yamasani [Thu, 28 Jul 2011 19:14:47 +0000 (12:14 -0700)]
Limit the list of settings that can have shortcuts on home.
Updated some strings as well, to be shorter.
Bug:
5087499
Bug:
5082543
Change-Id: I1b38ceda377a6cf9fcb6cd000af2ec0c96b243bb
Mike Lockwood [Thu, 28 Jul 2011 18:38:50 +0000 (11:38 -0700)]
Merge "Add preference category to USB transfer settings"
Martijn Coenen [Thu, 28 Jul 2011 16:27:34 +0000 (11:27 -0500)]
Add NFC sharing intent filter.
Change-Id: I34d5525fd43bbf4933ab459f4f310ad16196710d
Mike Lockwood [Thu, 28 Jul 2011 16:47:44 +0000 (12:47 -0400)]
Add preference category to USB transfer settings
This allows us to shorten the text for the file transfer options so they
will fit on a phone screen in portrait mode.
Change-Id: If664fd22061ddc1173e57b18799378e055e7135e
Signed-off-by: Mike Lockwood <lockwood@android.com>
Martijn Coenen [Thu, 28 Jul 2011 13:48:55 +0000 (06:48 -0700)]
Merge "Add on/off actionbar switch for NFC Tap To Share."
Jeff Sharkey [Thu, 28 Jul 2011 05:08:05 +0000 (22:08 -0700)]
Merge "Data usage fit and finish."
Jeff Sharkey [Wed, 27 Jul 2011 02:30:26 +0000 (19:30 -0700)]
Data usage fit and finish.
Show time range and data summary based on current sweep selection for
both network and app details. Fix animations by opting-out of parent
hierarchy animation, since it fights with ListView.
Switch to using NPMS "restrict background" instead of overloading
setBackgroundDataSetting(), and hide app background checkbox when
global background is restricted.
Limit sweeps to valid historical data, and activate sweeps on touch
instead of requiring separate tap. Fix z-order and avoid animating
sweeps. Align all elements along vertical edge, and fix item layout
to handle long app title.
Bug:
4979025,
5058107,
5038590,
5079887,
5058108,
5058026,
5037381
Change-Id: Ib45b61ff2a62303f47aa3f47f88d2e688fe4d076
Irfan Sheriff [Thu, 28 Jul 2011 03:40:27 +0000 (20:40 -0700)]
Merge "Fix NPE from monkey run"
Irfan Sheriff [Thu, 28 Jul 2011 03:11:54 +0000 (20:11 -0700)]
Fix NPE from monkey run
Bug:
5037499
Change-Id: Ic12fab174d19b759899ce8b3f92f202f549e7c00
Chia-chi Yeh [Thu, 28 Jul 2011 01:35:44 +0000 (18:35 -0700)]
Merge "VpnSettings: make more fields available as advanced options."
Chia-chi Yeh [Wed, 27 Jul 2011 22:49:43 +0000 (15:49 -0700)]
VpnSettings: make more fields available as advanced options.
Now users can manually override DNS search domains, DNS servers,
and forwarding routes for each VPN network.
Change-Id: I10b8e383ac19fd19d23938dff78201a71724d58f
Matthew Xie [Wed, 27 Jul 2011 04:27:34 +0000 (21:27 -0700)]
Save changed name from CachedBluetoothDevice to native storage
The change preserves the friendly name change over power cycle.
bug
5081605
Change-Id: I2b2cce5a789c72d52439511c42df369639eb0b4b
Jeff Sharkey [Wed, 27 Jul 2011 22:52:26 +0000 (15:52 -0700)]
Merge "Move data over-limit dialog, reset policy snooze."
Svetoslav Ganov [Wed, 27 Jul 2011 22:33:14 +0000 (15:33 -0700)]
Merge "Temporarily enable touch exploration in Accessibility tutorial"
Martijn Coenen [Wed, 27 Jul 2011 22:31:41 +0000 (17:31 -0500)]
Add on/off actionbar switch for NFC Tap To Share.
Change-Id: I009a31d8862a23e15d89fe9813eca02e06469531
Irfan Sheriff [Wed, 27 Jul 2011 21:20:30 +0000 (14:20 -0700)]
Merge "Restart soft Ap on a running config change"
Alan Viverette [Wed, 27 Jul 2011 21:07:06 +0000 (14:07 -0700)]
Temporarily enable touch exploration in Accessibility tutorial
Change-Id: I630f037f909a8941b9547fea95aecc2a1b374451
Irfan Sheriff [Tue, 26 Jul 2011 21:01:22 +0000 (14:01 -0700)]
Restart soft Ap on a running config change
Bug:
5079339
Change-Id: I083548ef5ab3ce177e7fa3e7375a68b52bb576d7