OSDN Git Service
Fabrice Di Meglio [Wed, 12 Sep 2012 01:01:38 +0000 (18:01 -0700)]
Fix bug #
7132595 Settings - UI mirroring for RTL locales (Arabic, Hebrew, farsi)
- fix Data Usage text direction for list items
Change-Id: I938fa77e7cfb2a900daa9f5d081c8e2fd63a42cf
Fabrice Di Meglio [Tue, 11 Sep 2012 22:17:40 +0000 (15:17 -0700)]
Fix bug #
7132595 Settings - UI mirroring for RTL locales (Arabic, Hebrew, farsi)
- fix "Network SSID" string direction
Change-Id: I8491f8f9d52f80863ee78b645e2e34f5f5ff3656
John Spurlock [Mon, 10 Sep 2012 20:35:39 +0000 (13:35 -0700)]
Merge "Dream Settings: Disable settings icon if not selected." into jb-mr1-dev
Matthew Xie [Mon, 10 Sep 2012 19:53:51 +0000 (12:53 -0700)]
Merge "Fix NPE in bluetooth Permission Activity" into jb-mr1-dev
Ganesh Ganapathi Batta [Mon, 10 Sep 2012 18:13:54 +0000 (11:13 -0700)]
Fix NPE in bluetooth Permission Activity
This fixes a NPE by ensuring that cached device list has
a cached device associated with a given BDA before accessing
the cached device
Bug:
5964529
Change-Id: Ib2c3596e6e008c78f9f1137134e421ca710e1217
John Spurlock [Mon, 10 Sep 2012 19:17:10 +0000 (15:17 -0400)]
Dream Settings: Disable settings icon if not selected.
Bug:
7129176
Change-Id: I6ceb6b7bd37032197ab3777901156c9424cbc301
Matthew Xie [Mon, 10 Sep 2012 19:05:19 +0000 (12:05 -0700)]
Merge "Fixed the display count of connected panu device." into jb-mr1-dev
zzy [Sat, 8 Sep 2012 00:33:59 +0000 (17:33 -0700)]
Fixed the display count of connected panu device.
Root cause: Bluez relies on the count of activated pan network
interfaces to show how many panu devices are connected. But
Bluedroid has only one shared pan network interface for any
number of connected panu devices.
Change-Id: I52e3d6d79e2f1b9f8afab1d70c9ff1eca3ef2349
rich cannings [Sun, 9 Sep 2012 19:48:50 +0000 (12:48 -0700)]
Grey out App Check setting when no verifiers exist
Bug:
7082362
Change-Id: I6e8a6032b58145fe6e2918f364ffd92cbb97ed67
rich cannings [Sun, 9 Sep 2012 05:17:10 +0000 (22:17 -0700)]
Merge "Add package verification to settings app" into jb-mr1-dev
Jeff Brown [Sat, 8 Sep 2012 22:12:19 +0000 (15:12 -0700)]
Enable auto-brightness adjustment feature with system prop.
This feature is experimental and disabled by default.
Change-Id: I9c3c77d6d207ceec65e0babc7915db8d439d5da2
rich cannings [Fri, 7 Sep 2012 20:20:44 +0000 (13:20 -0700)]
Add package verification to settings app
Adds a dialog/toggle in security settings to turn package verification on and
off.
Bug:
7082362
Change-Id: I9985437ae28e4a999992c91a7e88547495ccbda2
Svetoslav Ganov [Fri, 7 Sep 2012 23:20:36 +0000 (16:20 -0700)]
Merge "Settings for the screen magnification feature." into jb-mr1-dev
Svetoslav Ganov [Mon, 6 Aug 2012 17:55:11 +0000 (10:55 -0700)]
Settings for the screen magnification feature.
1. Screen magnification on the device has to he explicitly enabled
by the user before allowing a global gesture related interactions.
The feature toggle setting is in Settings->Accessibility and it
is a separate screen with instructions how to use the feature
and a toggle switch.
2. Added a setting in developer options for toggling the magnification
auto update feature. If this features is on the screen is zoomed
out or rotation or activity start. Also if the feature is enabled
the magnified viewport will scroll to show popped up windows.
bug:
5587727
Change-Id: Ic45a21d3a3928e2f5aac034751801f090b261488
Christopher Tate [Fri, 7 Sep 2012 21:37:03 +0000 (14:37 -0700)]
Merge "Update Settings app to manipulate now-global settings properly" into jb-mr1-dev
Christopher Tate [Fri, 7 Sep 2012 20:35:31 +0000 (13:35 -0700)]
Update Settings app to manipulate now-global settings properly
Change-Id: I6c269051c7d2db87f70f44df74e06456588c3b6f
Jeff Sharkey [Fri, 7 Sep 2012 20:23:47 +0000 (13:23 -0700)]
Iteration on multi-user storage UI.
Adds headers to distinguish between current and other users. Also
correctly orders color chips.
Bug:
7003520
Change-Id: I871f1a38d41dad5a5f7d97d91d2ebaac5951066c
Jeff Sharkey [Fri, 7 Sep 2012 05:46:21 +0000 (22:46 -0700)]
Progress towards split storage categories.
Cleans up StorageVolumePreferenceCategory creation, and uses new
isPrimary() API instead of passing around hacky "i == 0" derived
value.
Bug:
7003520
Change-Id: I9eb7164035b5368ee795e35b22e750aebbf3b159
Elliott Hughes [Thu, 6 Sep 2012 23:41:16 +0000 (16:41 -0700)]
am
4ad02d02: am
a76ba7bb: am
cfbc61de: Merge "Stop using getDSTSavings."
* commit '
4ad02d02b8a27c627eace2bdf1fe8e0b3cfe08fb':
Stop using getDSTSavings.
Elliott Hughes [Thu, 6 Sep 2012 23:40:09 +0000 (16:40 -0700)]
am
a76ba7bb: am
cfbc61de: Merge "Stop using getDSTSavings."
* commit '
a76ba7bb301e2349541ddeeb492d3bf4f6e6b70c':
Stop using getDSTSavings.
Elliott Hughes [Thu, 6 Sep 2012 23:39:41 +0000 (16:39 -0700)]
am
98d9380a: am
680c8c8e: resolved conflicts for merge of
33f86196 to stage-aosp-master
* commit '
98d9380a5c3c6a6bfa5687af993ea43c882226b9':
Stop hard-coding sample 12- and 24-hour times.
Elliott Hughes [Thu, 6 Sep 2012 23:38:37 +0000 (16:38 -0700)]
am
cfbc61de: Merge "Stop using getDSTSavings."
* commit '
cfbc61de3f94a620153ca83a790e4d1b03a9078e':
Stop using getDSTSavings.
Elliott Hughes [Thu, 6 Sep 2012 23:37:44 +0000 (16:37 -0700)]
am
680c8c8e: resolved conflicts for merge of
33f86196 to stage-aosp-master
* commit '
680c8c8e43804d9bf69568d4748b3bd3a4aea0ee':
Stop hard-coding sample 12- and 24-hour times.
Elliott Hughes [Thu, 6 Sep 2012 23:09:04 +0000 (16:09 -0700)]
resolved conflicts for merge of
33f86196 to stage-aosp-master
Change-Id: Ifc5a986179d010358a93869d9e8867af8c30f9b8
Elliott Hughes [Thu, 6 Sep 2012 22:50:10 +0000 (15:50 -0700)]
Merge "Stop using getDSTSavings."
Elliott Hughes [Thu, 6 Sep 2012 22:30:51 +0000 (15:30 -0700)]
Stop using getDSTSavings.
The original code was actually correct, but code calling inDaylightTime
and getDSTSavings directly is inherently suspect, so I want to clean up
this false positive along with the real abusers.
Bug:
6901488
Change-Id: I6c89e7aa29d88b81ed2c7fd6c915e0346b90a442
Elliott Hughes [Thu, 6 Sep 2012 22:29:46 +0000 (15:29 -0700)]
Merge "Stop hard-coding sample 12- and 24-hour times."
Elliott Hughes [Thu, 6 Sep 2012 21:49:35 +0000 (14:49 -0700)]
Stop hard-coding sample 12- and 24-hour times.
Bug:
6881640
Change-Id: I6b0d6404b0299f9efa8fd12779799f703f1c764f
Baligh Uddin [Thu, 6 Sep 2012 18:16:17 +0000 (11:16 -0700)]
Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev
Baligh Uddin [Thu, 6 Sep 2012 18:15:52 +0000 (11:15 -0700)]
Revert "Import translations. DO NOT MERGE"
Broke the build.
This reverts commit
9dcb0727d0d7be183d615d7bdfb6836d2017966a
Change-Id: I3a468f51981456476ca9c76086f0a5c08ba6a61b
Baligh Uddin [Thu, 6 Sep 2012 17:53:13 +0000 (10:53 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
The Android Open Source Project [Thu, 6 Sep 2012 15:21:38 +0000 (08:21 -0700)]
am
c53ce268: (-s ours) Reconcile with jb-release - do not merge
* commit '
c53ce26836eccfe9c0bb315d965bc73a9bd7b214':
The Android Open Source Project [Thu, 6 Sep 2012 15:09:26 +0000 (08:09 -0700)]
Reconcile with jb-release - do not merge
Change-Id: I34fdfc427ea0fd0dc887303e7c019226a665f4de
Charles Chen [Thu, 6 Sep 2012 00:13:24 +0000 (17:13 -0700)]
Merge "Add content descriptions to power control widget." into jb-mr1-dev
Baligh Uddin [Wed, 5 Sep 2012 21:02:53 +0000 (14:02 -0700)]
Import translations. DO NOT MERGE
Change-Id: If5b1608924c422e97c0a12ff0a41f0ade35b2822
Auto-generated-cl: translation import
John Spurlock [Tue, 4 Sep 2012 11:55:46 +0000 (07:55 -0400)]
Dream settings: list items back to constant height
Expanding/collapsing items removed, settings icon shown on right
with divider if applicable.
New "Start" action on the action bar to start dreaming. This is
no longer in preview/test mode, but a call to .dream().
Bug:
7010260
Change-Id: Ia1d8b9a70218dcc598bf62befbf545f572bbc6b1
Matthew Xie [Tue, 4 Sep 2012 22:31:03 +0000 (15:31 -0700)]
Merge "Clear profile connnection status of bonded devices when BT is turned off" into jb-mr1-dev
Ganesh Ganapathi Batta [Wed, 29 Aug 2012 21:32:26 +0000 (14:32 -0700)]
Clear profile connnection status of bonded devices when BT is turned off
When BT is turned off in mid of a profile connection, sometimes
profile connection status change message with status= DISCONNECTED
does not reach Settings app which results in stale connection status
for the device when BT is enabled next time. Fixed the issue
By explicitly clearing the connection status for all paired devices
when BT is turning OFF
Change-Id: I5d0c158636f3b62eff9094821abe2ef3a7cab16e
Przemyslaw Szczepaniak [Mon, 3 Sep 2012 13:53:10 +0000 (14:53 +0100)]
Make TTS languages list sorted.
Also makes sure that languages list always have underlying array after onCreate.
Bug:
5640782
Change-Id: Id85d0099efccc9a64458d24853b5c98a35307b38
Mathias Agopian [Fri, 31 Aug 2012 08:59:05 +0000 (01:59 -0700)]
FIX BUILD (DO NOT MERGE)
Revert "Import translations. DO NOT MERGE"
This reverts commit
b3e78cc41f16b0227a5fd31431c95f911c268567.
Change-Id: Ifbff2b21c249dab09126b03a8cbbccde964781df
Baligh Uddin [Fri, 31 Aug 2012 05:10:15 +0000 (22:10 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Amith Yamasani [Fri, 31 Aug 2012 00:25:20 +0000 (17:25 -0700)]
Rename settings title for user management screen
Change-Id: I0a57d52eb0c4e4fb8a8ab1449b98751927da2519
alanv [Fri, 31 Aug 2012 00:08:01 +0000 (17:08 -0700)]
Add content descriptions to power control widget.
Bug:
6361285
Change-Id: I4fd7ed519de9a5b7e50e6905550695fad02bcc42
Jeff Sharkey [Thu, 30 Aug 2012 22:26:50 +0000 (15:26 -0700)]
Merge "Surface storage usage of other users." into jb-mr1-dev
Jeff Sharkey [Thu, 30 Aug 2012 22:20:10 +0000 (15:20 -0700)]
Surface storage usage of other users.
Bring up separate StorageMeasurement sessions bound to other users
on device, and surface their total usage as teal colors. Exclude
app code size when measuring secondary users. Shift preferences to
using keys instead of fragile index ordering.
Bug:
7003520
Change-Id: I214d0b223e53955df71104502596743f049f2027
John Spurlock [Thu, 30 Aug 2012 18:58:16 +0000 (14:58 -0400)]
More traditional list item style for dreams settings.
Other improvements:
- remove "Start dreaming now", promote "When to dream" to action bar
- added logging
- hide dream settings button if n/a
- new flat style for settings/preview + dividers
- refresh dreams list when packages are installed/uninstalled
- added placeholder for help url
Bug:
7010260
Change-Id: Ia443b4f76678eaf1a52b907d50aefb0d8f7e4748
Baligh Uddin [Thu, 30 Aug 2012 03:17:20 +0000 (20:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie33abb2dac44b49a64040688f9ffe7a1d7add9f3
Auto-generated-cl: translation import
John Spurlock [Wed, 29 Aug 2012 22:55:25 +0000 (15:55 -0700)]
Merge "New dream settings - first cut" into jb-mr1-dev
The Android Automerger [Wed, 29 Aug 2012 21:29:55 +0000 (14:29 -0700)]
merge in jb-release history after reset to jb-dev
John Spurlock [Wed, 22 Aug 2012 13:21:58 +0000 (09:21 -0400)]
New dream settings - first cut
First draft implementation of mocks for dream settings.
Want to merge for the weekly build, so a few things remain, namely:
- flat style for preview/settings buttons + dividers
- animation between dream row expanded/collapsed state
- wire up the help url
- possibly ditch the non-standard style
- add logging
- refresh when packages are installed/uninstalled
Bug:
7010260
Change-Id: I96e3ab944170925bd76edf7b8b1127adfffc6262
The Android Automerger [Wed, 29 Aug 2012 19:43:12 +0000 (12:43 -0700)]
merge in jb-release history after reset to jb-dev
Jeff Brown [Wed, 29 Aug 2012 09:33:06 +0000 (02:33 -0700)]
Add new setting to control overlay displays.
Change-Id: I9582bb149dca716699ef5977ef8f84bb3136e0c0
Baligh Uddin [Tue, 28 Aug 2012 22:15:08 +0000 (15:15 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Tue, 28 Aug 2012 21:29:09 +0000 (14:29 -0700)]
Import translations. DO NOT MERGE
Change-Id: I884b6bb2bd0045049a7578235563896afe9414a7
Auto-generated-cl: translation import
Nick Kralevich [Tue, 28 Aug 2012 17:33:45 +0000 (10:33 -0700)]
ChooseLockPassword: allow spaces in passwords
This fixes http://code.google.com/p/android/issues/detail?id=35988
Change-Id: I1880d7e41028f034e75a048226cce3bf96845a09
Wink Saville [Tue, 28 Aug 2012 19:18:57 +0000 (12:18 -0700)]
am
c5fc6231: am
2d6b52bd: Merge "Fix memory leak in ApnSettings-activity"
* commit '
c5fc6231312b21efb601367bae28d63f9b26ac52':
Fix memory leak in ApnSettings-activity
Wink Saville [Tue, 28 Aug 2012 19:13:59 +0000 (12:13 -0700)]
am
2d6b52bd: Merge "Fix memory leak in ApnSettings-activity"
* commit '
2d6b52bd38046abe1761cf0cc1f0c415e4a24fef':
Fix memory leak in ApnSettings-activity
Wink Saville [Tue, 28 Aug 2012 19:01:28 +0000 (12:01 -0700)]
Merge "Fix memory leak in ApnSettings-activity"
Jean-Baptiste Queru [Tue, 28 Aug 2012 18:15:22 +0000 (11:15 -0700)]
am
300457ba: am
38ce5194: Merge "Enable to delete a stored persistent group from p2p settings."
* commit '
300457bad289f547430da21e72747e8840840832':
Enable to delete a stored persistent group from p2p settings.
Jean-Baptiste Queru [Tue, 28 Aug 2012 18:10:06 +0000 (11:10 -0700)]
am
38ce5194: Merge "Enable to delete a stored persistent group from p2p settings."
* commit '
38ce5194e89b83697466abe2994016507109ec54':
Enable to delete a stored persistent group from p2p settings.
Jean-Baptiste Queru [Tue, 28 Aug 2012 17:46:59 +0000 (10:46 -0700)]
Merge "Enable to delete a stored persistent group from p2p settings."
Yoshihiko Ikenaga [Mon, 27 Aug 2012 13:10:05 +0000 (22:10 +0900)]
Enable to delete a stored persistent group from p2p settings.
Enable to delete a stored persistent group from p2p settings.
The multilingualization has NOT been done yet.
Change-Id: I84bd89343c9e3ce5e62b8b96dfce9d286675b145
Signed-off-by: Yoshihiko Ikenaga <yoshihiko.ikenaga@jp.sony.com>
Baligh Uddin [Mon, 27 Aug 2012 23:03:30 +0000 (16:03 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Mon, 27 Aug 2012 22:08:09 +0000 (15:08 -0700)]
Import translations. DO NOT MERGE
Change-Id: I61710e208f305569f238c02cc7aa8a3da8a0154b
Auto-generated-cl: translation import
Jeff Sharkey [Mon, 27 Aug 2012 20:58:02 +0000 (13:58 -0700)]
Merge "Always-on VPN." into jb-mr1-dev
Jeff Sharkey [Sat, 25 Aug 2012 07:06:08 +0000 (00:06 -0700)]
Always-on VPN.
Adds support for always-on VPN profiles. Users pick an always-on VPN
from list of existing VPN profiles, which must use an IP address for
both VPN server and DNS. Moved "add" operation into action bar.
Bug:
5756357
Change-Id: I4c7ed7f2a3b027be1baf65c08213336a61f3acfe
Amith Yamasani [Sun, 26 Aug 2012 05:09:53 +0000 (22:09 -0700)]
Merge "Avoid re-creating a user when activity is resumed" into jb-mr1-dev
Amith Yamasani [Sun, 26 Aug 2012 04:52:38 +0000 (21:52 -0700)]
Merge "Settings: Fix crash seen when setting the radio band" into jb-mr1-dev
Jeevaka Badrappan [Fri, 1 Jun 2012 07:57:31 +0000 (10:57 +0300)]
Settings: Fix crash seen when setting the radio band
When the user presses back before the set radio band
result dialog is shown, crash is seen as the activity
associated with this is already finishing.
Check the activity status before displaying the
set radio band result alert dialog.
Change-Id: I34104773f5cce0be6d0021823b2889aad0fdb945
Author: Jeevaka Badrappan <jeevaka.badrappan@intel.com>
Signed-off-by: Xiaokang Qin <xiaokang.qin@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 39317
Amith Yamasani [Sat, 25 Aug 2012 19:58:18 +0000 (12:58 -0700)]
am
41446512: am
52d996ed: Merge "Settings: Fix crash seen when setting the radio band"
* commit '
41446512cfa6e009187b7cc67fa34a29f82ddccc':
Settings: Fix crash seen when setting the radio band
Amith Yamasani [Sat, 25 Aug 2012 19:56:23 +0000 (12:56 -0700)]
am
52d996ed: Merge "Settings: Fix crash seen when setting the radio band"
* commit '
52d996edeb7958d386bbf6655e9acfec3b10fdf2':
Settings: Fix crash seen when setting the radio band
Amith Yamasani [Sat, 25 Aug 2012 18:55:41 +0000 (11:55 -0700)]
Merge "Settings: Fix crash seen when setting the radio band"
Amith Yamasani [Sat, 25 Aug 2012 14:47:43 +0000 (07:47 -0700)]
Avoid re-creating a user when activity is resumed
onCreate() was getting called again, resulting in another user being
created. Keeping the new userid across pause/resume.
Change-Id: Id7930227895e95a60a77efddf361ab9408a8f797
Baligh Uddin [Fri, 24 Aug 2012 22:03:15 +0000 (15:03 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Fri, 24 Aug 2012 20:29:14 +0000 (13:29 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8087ddd4451aef7aa8b07a1ab4019aab89723d8d
Auto-generated-cl: translation import
Dianne Hackborn [Fri, 24 Aug 2012 01:44:31 +0000 (18:44 -0700)]
Make settings a little aware of multi-user install.
Change-Id: Id04f137dbc80dfee7b6c436efc2225ceccb88faa
Jeff Sharkey [Fri, 24 Aug 2012 18:33:02 +0000 (11:33 -0700)]
Merge "Migrate legacy VPN arguments to system_server." into jb-mr1-dev
Jeff Sharkey [Fri, 24 Aug 2012 18:17:49 +0000 (11:17 -0700)]
Migrate legacy VPN arguments to system_server.
Generate the racoon and mtpd daemon arguments in system_server,
instead of accepting them from Settings.
Bug:
5756357
Change-Id: Ied048ca465aab03b2ae1c004388f49b82848b3f7
Jean-Baptiste Queru [Fri, 24 Aug 2012 14:29:43 +0000 (07:29 -0700)]
am
88f37936: am
1183f487: Merge "MTP/PTP: disable erasing/unmount operation for SD card while MTP/PTP is active"
* commit '
88f379367f208a75dfe95a081b25c27a54b06a1a':
MTP/PTP: disable erasing/unmount operation for SD card while MTP/PTP is active
Baligh Uddin [Fri, 24 Aug 2012 01:11:17 +0000 (18:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9f722cc1c8451683f176ec7de9c62931426072f2
Auto-generated-cl: translation import
Amith Yamasani [Thu, 23 Aug 2012 18:28:06 +0000 (11:28 -0700)]
Merge "Show the license dialog only if the activity is still showing" into jb-mr1-dev
Amith Yamasani [Thu, 23 Aug 2012 18:25:18 +0000 (11:25 -0700)]
Show the license dialog only if the activity is still showing
Bug:
6888990
Change-Id: Ide267739c7fd296356f26293f02bd794906fbd0a
John Spurlock [Thu, 23 Aug 2012 17:47:15 +0000 (10:47 -0700)]
Merge "Settings: Minimal refactor to support new dreams api." into jb-mr1-dev
Jean-Baptiste Queru [Thu, 23 Aug 2012 16:47:04 +0000 (09:47 -0700)]
am
1183f487: Merge "MTP/PTP: disable erasing/unmount operation for SD card while MTP/PTP is active"
* commit '
1183f487c8ea8660415fcd30914844e8dc2de2bb':
MTP/PTP: disable erasing/unmount operation for SD card while MTP/PTP is active
Jean-Baptiste Queru [Thu, 23 Aug 2012 16:31:35 +0000 (09:31 -0700)]
Merge "MTP/PTP: disable erasing/unmount operation for SD card while MTP/PTP is active"
John Spurlock [Wed, 22 Aug 2012 13:59:44 +0000 (09:59 -0400)]
Settings: Minimal refactor to support new dreams api.
Fix breaking changes to the dreams api. Master toggle
and multiple dreams support in Settings will be done in
a subsequent change.
Bug:
7028665
Change-Id: Ia56dd00ec50323fbba06473b1747e5015a3f1898
Baligh Uddin [Thu, 23 Aug 2012 02:39:04 +0000 (19:39 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Amith Yamasani [Thu, 23 Aug 2012 01:45:51 +0000 (18:45 -0700)]
Merge "Simplify User management settings to bare minimum" into jb-mr1-dev
Amith Yamasani [Thu, 23 Aug 2012 01:43:54 +0000 (18:43 -0700)]
Simplify User management settings to bare minimum
No need to restrictions or account association at this time.
Change-Id: Ic4ae43d5bb9d4308e67499495d44c12de9e61777
Irfan Sheriff [Wed, 22 Aug 2012 21:21:41 +0000 (14:21 -0700)]
Merge "Simplify proxy regex" into jb-mr1-dev
Irfan Sheriff [Wed, 22 Aug 2012 21:19:52 +0000 (14:19 -0700)]
Simplify proxy regex
Bug:
6950756
Change-Id: I535be03073cf9f502631498939c841f88fb1617d
Baligh Uddin [Wed, 22 Aug 2012 19:58:12 +0000 (12:58 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8a85d98874da3ff59642198c05dccfe50974fdcd
Auto-generated-cl: translation import
Irfan Sheriff [Wed, 22 Aug 2012 18:57:18 +0000 (11:57 -0700)]
Merge "Update view on UI thread" into jb-mr1-dev
Irfan Sheriff [Wed, 22 Aug 2012 18:36:01 +0000 (11:36 -0700)]
Update view on UI thread
Bug:
6970872
Change-Id: I05bec7cb8a8292de522cbfe11c0ecd5a79375014
Jeff Brown [Wed, 22 Aug 2012 06:15:26 +0000 (23:15 -0700)]
Merge "Add a flag to control auto-brightness adjustment." into jb-mr1-dev
Jeff Brown [Wed, 22 Aug 2012 04:13:48 +0000 (21:13 -0700)]
Add a flag to control auto-brightness adjustment.
The feature is still disabled, it's just disabled using
a flag now.
Change-Id: I43ceaa5ab9b7252e3882c8b2d48c9844afb806c3
Jean-Baptiste Queru [Tue, 21 Aug 2012 21:34:56 +0000 (14:34 -0700)]
am
997b1f74: am
578700af: Merge "Settings: disable Lock SIM card till response is received"
* commit '
997b1f74c49314162635c5976fa369dfcd3385fb':
Settings: disable Lock SIM card till response is received
Jean-Baptiste Queru [Tue, 21 Aug 2012 21:33:50 +0000 (14:33 -0700)]
am
578700af: Merge "Settings: disable Lock SIM card till response is received"
* commit '
578700afb1f14c7b3a0ab8c7daa7a1e94628c1cb':
Settings: disable Lock SIM card till response is received
Jean-Baptiste Queru [Tue, 21 Aug 2012 20:40:29 +0000 (13:40 -0700)]
Merge "Settings: disable Lock SIM card till response is received"
Baligh Uddin [Tue, 21 Aug 2012 18:57:11 +0000 (11:57 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev