Eric Fischer
5c474987ae
Import translations. DO NOT MERGE
...
Change-Id: Ice4cc1cd0d6b9ec2b7eca8cec68ff36aa8d49945
2012-02-03 12:47:43 -08:00
Eric Fischer
117bfe86cd
Import translations. DO NOT MERGE
...
Change-Id: Ic23ab755fb8351dfd34f1da3943b1cd8b475e923
2012-02-03 12:46:38 -08:00
Eric Fischer
6e7eac8e81
Import translations. DO NOT MERGE
...
Change-Id: I3b212608cb7a1ac013eb37ff57092adf8680a439
2012-02-03 12:45:11 -08:00
Eric Fischer
d918c28684
Import translations. DO NOT MERGE
...
Change-Id: Iecfdf16111ff8870a29cbc4d2b1280699d2997a2
2012-02-03 12:44:20 -08:00
Jeff Sharkey
f00df412fd
am 0370b9c3
: Merge "Update for NetworkPolicy refactoring."
...
* commit '0370b9c3f76584462cffc3c283fcc70d9c8419c1':
Update for NetworkPolicy refactoring.
2012-02-02 16:28:34 -08:00
Jeff Sharkey
0370b9c3f7
Merge "Update for NetworkPolicy refactoring."
2012-02-02 16:26:46 -08:00
Jeff Sharkey
0d750bba7d
Update for NetworkPolicy refactoring.
...
Bug: 5262414
Change-Id: I17db862cc20a11f022dc2d02993ad52988618681
2012-02-02 16:12:00 -08:00
Dianne Hackborn
61ccd77f30
am 840c6bfb
: Merge "New switch to enable/disable all developer settings."
...
* commit '840c6bfb96201b5e187616c11fa1944b321a65c2':
New switch to enable/disable all developer settings.
2012-02-02 15:20:27 -08:00
Dianne Hackborn
840c6bfb96
Merge "New switch to enable/disable all developer settings."
2012-02-02 15:17:32 -08:00
Dianne Hackborn
14dc2d4b84
New switch to enable/disable all developer settings.
...
Turning the switch on shows a dialog warning the user to not do this.
Turning the switch off resets all development settings.
Change-Id: I052b16e6d220fa60298799ace02e69a8a1a02ef2
2012-02-02 15:03:36 -08:00
Eric Fischer
58003afdf3
am 6fa18274
: am 175f4154
: (-s ours) resolved conflicts for merge of cbbfffca
to ics-scoop-plus-aosp
...
* commit '6fa18274e5435ba29e9bb3df812fbe980620895c':
2012-02-02 14:33:15 -08:00
Eric Fischer
6fa18274e5
am 175f4154
: (-s ours) resolved conflicts for merge of cbbfffca
to ics-scoop-plus-aosp
...
* commit '175f4154a6c0ff0917d56d67a1ad22d883eadda2':
2012-02-02 14:31:53 -08:00
Eric Fischer
175f4154a6
resolved conflicts for merge of cbbfffca
to ics-scoop-plus-aosp
...
Change-Id: I2b80331b5c56eb46b88513bc841f54001405a5fc
2012-02-02 14:07:34 -08:00
Eric Fischer
297231ca4f
resolved conflicts for merge of 67a50f99
to ics-aah
...
Change-Id: I14ffa78c503c91b615e353941a79ea0f8a85bb5a
2012-02-02 14:02:44 -08:00
Eric Fischer
cbbfffca1e
resolved conflicts for merge of 67a50f99
to ics-scoop
...
Change-Id: I75009fa3089704e2b5045fda6716f733ae2b06fa
2012-02-02 14:00:17 -08:00
Eric Fischer
160dc0f298
am ce4bce00
: am 201a77ea
: (-s ours) am 940f2a74
: (-s ours) am 67a50f99
: Import translations. DO NOT MERGE
...
* commit 'ce4bce00eb0ef282ebea715dc7cdc7fafce3f84b':
Import translations. DO NOT MERGE
2012-02-02 13:54:27 -08:00
Eric Fischer
ce4bce00eb
am 201a77ea
: (-s ours) am 940f2a74
: (-s ours) am 67a50f99
: Import translations. DO NOT MERGE
...
* commit '201a77ea399527da0f69faf14cc26162909f43c7':
Import translations. DO NOT MERGE
2012-02-02 13:51:26 -08:00
Eric Fischer
201a77ea39
am 940f2a74
: (-s ours) am 67a50f99
: Import translations. DO NOT MERGE
...
* commit '940f2a7479eb68af290f631d227bc79dcf29a7c5':
Import translations. DO NOT MERGE
2012-02-02 13:49:08 -08:00
Eric Fischer
940f2a7479
am 67a50f99
: Import translations. DO NOT MERGE
...
* commit '67a50f99d80b76337541fb71f98025c0b144e5b5':
Import translations. DO NOT MERGE
2012-02-02 13:47:17 -08:00
Eric Fischer
8a7a645ff7
am f20d3cc1
: am c61223ce
: (-s ours) am cd92dd07
: Import translations. DO NOT MERGE
...
* commit 'f20d3cc11bd2a393f7065c4c2985b0e52ffc23c7':
Import translations. DO NOT MERGE
2012-02-02 13:39:02 -08:00
Eric Fischer
893f9c7ac0
resolved conflicts for merge of f11958e1
to graphics-dev
...
Change-Id: Ib0abb05c4e2e77d64956726c35cd7a0cbd79030b
2012-02-02 13:36:41 -08:00
Eric Fischer
f20d3cc11b
am c61223ce
: (-s ours) am cd92dd07
: Import translations. DO NOT MERGE
...
* commit 'c61223ce85bc0010130c4fcbc6b3a4aa0543192b':
Import translations. DO NOT MERGE
2012-02-02 13:27:51 -08:00
Eric Fischer
c61223ce85
am cd92dd07
: Import translations. DO NOT MERGE
...
* commit 'cd92dd07546a7fe410e3d0184cfafa3561b72050':
Import translations. DO NOT MERGE
2012-02-02 13:26:26 -08:00
Eric Fischer
f11958e11e
Import translations. DO NOT MERGE
...
Change-Id: I053bb60561334722b524e129a326ca016429d233
2012-02-02 12:56:05 -08:00
Eric Fischer
cd92dd0754
Import translations. DO NOT MERGE
...
Change-Id: I1e698fedf0d3e3f8ef30cca119303dbb4ca3f402
2012-02-02 12:54:58 -08:00
Eric Fischer
67a50f99d8
Import translations. DO NOT MERGE
...
Change-Id: Icbeee105c69fdde9ca3b07350a48318bdc3d9d3a
2012-02-02 12:54:15 -08:00
Eric Fischer
3fe72b1bf1
Import translations. DO NOT MERGE
...
Change-Id: I0440527327af6700c034209be183979e9d682fd2
2012-02-02 12:53:33 -08:00
Eric Fischer
45043c6cf7
Import translations. DO NOT MERGE
...
Change-Id: I5d3728cbe385fd37350c2dd61c044e44db080577
2012-02-02 12:52:44 -08:00
Chet Haase
b8e709fb48
am b29e7870
: Add Developer Option setting for Animator scaling.
...
* commit 'b29e7870de4238cbfa8eb7f3709bed7b49eeacdb':
Add Developer Option setting for Animator scaling.
2012-02-02 10:44:45 -08:00
Chet Haase
b29e7870de
Add Developer Option setting for Animator scaling.
...
This new setting allows users to set a scale factor for the
duration and startDelay of all Animator-based animations. This
setting is very similar to the Transition animation scale and
Window animation scale settings, except this one applies specifically
to Animator animations. The property is only accessible by users
through the Settings UI, not programmatically. The value applies
system-wide and is picked up per-process at the time of the first
ValueAnimator construction.
Change-Id: I4fd02b03e508495b39481bfc8904d8771d0fd4e1
2012-02-02 07:37:15 -08:00
Daisuke Miyakawa
7f95c07186
am 7ed71b78
: Merge "Reflect name change done in Phone package"
...
* commit '7ed71b7896c2572f8f876e100a0b8c1689632e2f':
Reflect name change done in Phone package
2012-02-01 13:46:33 -08:00
Daisuke Miyakawa
7ed71b7896
Merge "Reflect name change done in Phone package"
2012-02-01 13:45:03 -08:00
Eric Fischer
32d3e4e383
resolved conflicts for merge of 746902a1
to graphics-dev
...
Change-Id: I4ed1fa0c91e8e27d718bc92e278367d0bd65f0d3
2012-02-01 11:43:10 -08:00
Eric Fischer
746902a12b
Merge "Import translations. DO NOT MERGE"
2012-02-01 11:28:32 -08:00
Eric Fischer
25e910d704
Import translations. DO NOT MERGE
...
Change-Id: I579e0e00a4b2a250792f61b4b5bb3b27cad69c22
2012-02-01 11:26:17 -08:00
The Android Open Source Project
3c52a3f904
am aed57008
: am 84beed8a
: am e3e777f7
: Reconcile with ics-mr1-release
...
* commit 'aed5700857b87e3b11cd88833a038812ec1626c3':
2012-02-01 10:10:07 -08:00
The Android Open Source Project
aed5700857
am 84beed8a
: am e3e777f7
: Reconcile with ics-mr1-release
...
* commit '84beed8a3214b71b9e29a3dbecd1af77caf6451c':
2012-02-01 10:06:17 -08:00
The Android Open Source Project
84beed8a32
am e3e777f7
: Reconcile with ics-mr1-release
...
* commit 'e3e777f7f208e6b88816225b5a1d33cfc59a2221':
2012-02-01 10:01:15 -08:00
The Android Open Source Project
e3e777f7f2
Reconcile with ics-mr1-release
...
Change-Id: I298ee044e83510a9caa19f51e94567863861a8a0
2012-02-01 08:50:41 -08:00
Daisuke Miyakawa
09086671d9
Reflect name change done in Phone package
...
I5d152bf7c55fb2f7b changes Phone's "Settings" class to
"MobileNetworkSettings", so WirelessSettings also needs to point
the new class name.
Change-Id: I994c6278c0c1a7cb2ae33cdb94f32083ce146045
2012-02-01 06:26:24 -08:00
Eric Fischer
1ab0cb8749
Import translations. DO NOT MERGE
...
Change-Id: Ib5f8ddec20efbe7719bbb5e53d4cee47a31cb2e8
2012-01-31 16:18:05 -08:00
Eric Fischer
123f482b75
Import translations. DO NOT MERGE
...
Change-Id: Ie5920a95392a12df6e2473cb11912e7747cee18c
2012-01-31 16:17:13 -08:00
Eric Fischer
6b87708c35
am 94f4f34e
: Import translations. DO NOT MERGE
...
* commit '94f4f34e57c69006fd333795bec4da267226b9d9':
Import translations. DO NOT MERGE
2012-01-30 15:53:24 -08:00
Eric Fischer
94f4f34e57
Import translations. DO NOT MERGE
...
Change-Id: Ic52d8c1bb032fa8b2d527ec8d83732acebff183e
2012-01-30 15:46:07 -08:00
Jean-Baptiste Queru
26506ec85d
am 05eb9852
: am 43cbe3ff
: am b6e57c1f
: Merge "Do not set minimum value for mobile data limit dialog higher than the actual set value"
...
* commit '05eb9852a982f0ec3e24803425a794035bcc4aef':
Do not set minimum value for mobile data limit dialog higher than the actual set value
2012-01-27 21:12:29 -08:00
Jean-Baptiste Queru
05eb9852a9
am 43cbe3ff
: am b6e57c1f
: Merge "Do not set minimum value for mobile data limit dialog higher than the actual set value"
...
* commit '43cbe3ffb4f0777d8aa833355c523f4a1ff93818':
Do not set minimum value for mobile data limit dialog higher than the actual set value
2012-01-27 21:09:22 -08:00
Jean-Baptiste Queru
43cbe3ffb4
am b6e57c1f
: Merge "Do not set minimum value for mobile data limit dialog higher than the actual set value"
...
* commit 'b6e57c1f598fd9bf0f15c1e9eed238910e9fca1f':
Do not set minimum value for mobile data limit dialog higher than the actual set value
2012-01-27 13:58:03 -08:00
Eric Fischer
ae5f4ed8e1
am da0c98b4
: Import translations. DO NOT MERGE
...
* commit 'da0c98b47032871deb63596c97398d6982804c26':
Import translations. DO NOT MERGE
2012-01-27 13:43:30 -08:00
Eric Fischer
da0c98b470
Import translations. DO NOT MERGE
...
Change-Id: I8901f881b7d8876b5ac317cbdf2f0b57ebc26192
2012-01-27 13:34:27 -08:00
Jean-Baptiste Queru
b6e57c1f59
Merge "Do not set minimum value for mobile data limit dialog higher than the actual set value"
2012-01-27 13:26:25 -08:00