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
Eric Fischer
f1800408e0
am 0e1dbb94
: Remove unused layout to fix the build.
...
* commit '0e1dbb94211cd20ed58ef9f4edd3a90337fb0e15':
Remove unused layout to fix the build.
2012-01-26 15:34:47 -08:00
Eric Fischer
0e1dbb9421
Remove unused layout to fix the build.
...
Change-Id: Ibc704c30305ac33f3478c3c5ded0ddb976e3c3ce
2012-01-26 15:29:32 -08:00
Eric Fischer
7984907a11
am b0fd2e6f
: Import translations. DO NOT MERGE
...
* commit 'b0fd2e6f09a70f477c3d3b06bd7e365bbb7ebf60':
Import translations. DO NOT MERGE
2012-01-26 14:44:17 -08:00
Eric Fischer
b0fd2e6f09
Import translations. DO NOT MERGE
...
Change-Id: I117ca72749afc39352db58b33b01a1fb52752c35
2012-01-26 14:41:27 -08:00
Shuhrat Dehkanov
f9237f6e3c
Do not set minimum value for mobile data limit dialog higher than the actual set value
...
When mobile data limit and warning limit are set to 0, pressing mobile data limit text
(0.0 GB) pops up mobile data limit dialog with minimum value 1. But the value set is 0,
which is causing the dialog to show its maximum value 2^31-1.
Change-Id: I79ed4df5fbf095a7e60bda640ff2ca26bcbd3cc4
Signed-off-by: Shuhrat Dehkanov <uzbmaster@gmail.com >
2012-01-26 23:04:02 +09:00
Dianne Hackborn
c21aff20ea
am 93a2856e
: Merge "When auto-brightness is on, you can now adjust its brightness."
...
* commit '93a2856e834e3c0fb138784ecb3fd8e8da605eb7':
When auto-brightness is on, you can now adjust its brightness.
2012-01-23 12:39:44 -08:00
Dianne Hackborn
93a2856e83
Merge "When auto-brightness is on, you can now adjust its brightness."
2012-01-23 12:37:44 -08:00
The Android Open Source Project
4dcd1c343f
am e8964d4b
: am 4fc84091
: Reconcile with ics-mr1-release
...
* commit 'e8964d4b9593ea5c9f32bfd9cb933f81f3e8bfaf':
2012-01-23 10:44:16 -08:00
The Android Open Source Project
e8964d4b95
am 4fc84091
: Reconcile with ics-mr1-release
...
* commit '4fc8409176ae3dcb7f255b3cdc8f9247ad08cc31':
2012-01-23 10:41:35 -08:00
Dianne Hackborn
9907f6b274
When auto-brightness is on, you can now adjust its brightness.
...
Change-Id: Ie152def12cf7befd9c15a19f9975c207cbb5c541
2012-01-23 10:22:08 -08:00
The Android Open Source Project
4fc8409176
Reconcile with ics-mr1-release
...
Change-Id: I84213bb4f44dbb3fbe69d5f79cda246552535059
2012-01-23 10:16:07 -08:00
Justin Ho
70a451430d
am 8a3703d9
: am 1fea4322
: am 43c9dcc1
: Merge "Fix a pseudo race condition in TtsEngineSettingsFragment." into ics-mr1
...
* commit '8a3703d909278fd7574086a7dec41ea8cfd324b6':
Fix a pseudo race condition in TtsEngineSettingsFragment.
2012-01-23 09:23:12 -08:00
Narayan Kamath
7626f7dd60
am 2580eb60
: am cf3f7abb
: am 999f23e2
: Locale string comparisons must ignore case.
...
* commit '2580eb60a356ecb854185e815f8a9654fdb0848d':
Locale string comparisons must ignore case.
2012-01-23 09:23:11 -08:00
Justin Ho
8a3703d909
am 1fea4322
: am 43c9dcc1
: Merge "Fix a pseudo race condition in TtsEngineSettingsFragment." into ics-mr1
...
* commit '1fea43224ce3b84e248d9e49b8597fe58351db65':
Fix a pseudo race condition in TtsEngineSettingsFragment.
2012-01-23 09:18:28 -08:00
Narayan Kamath
2580eb60a3
am cf3f7abb
: am 999f23e2
: Locale string comparisons must ignore case.
...
* commit 'cf3f7abbeb9a31e73ef41b3f6512ebb095ac9e90':
Locale string comparisons must ignore case.
2012-01-23 09:18:25 -08:00
Jean Chalard
67976a25b2
am 75eba8cf
: Make the layout of the add word dialog easier to understand
...
* commit '75eba8cf56e13554fbb91b6411a3007676371357':
Make the layout of the add word dialog easier to understand
2012-01-22 23:20:35 -08:00
Jean Chalard
75eba8cf56
Make the layout of the add word dialog easier to understand
...
Change-Id: I1a71d5c95c142655219c7ab3ae4f67fa0b1f3d1a
2012-01-23 16:14:37 +09:00
The Android Automerger
73ff4af39d
merge in ics-mr1-release history after reset to ics-mr1
2012-01-20 16:13:29 -08:00
Justin Ho
e898d23cd9
am 43c9dcc1
: Merge "Fix a pseudo race condition in TtsEngineSettingsFragment." into ics-mr1
...
* commit '43c9dcc18e4e1137c59b847eadde7ae27302b08f':
Fix a pseudo race condition in TtsEngineSettingsFragment.
2012-01-20 14:42:34 -08:00
Narayan Kamath
08883b572b
am 999f23e2
: Locale string comparisons must ignore case.
...
* commit '999f23e2c304bde3a5c27f7f882d4616f5abdf9e':
Locale string comparisons must ignore case.
2012-01-20 14:42:34 -08:00