Commit Graph

6319 Commits

Author SHA1 Message Date
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
Justin Ho
1fea43224c 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:33 -08:00
Narayan Kamath
cf3f7abbeb am 999f23e2: Locale string comparisons must ignore case.
* commit '999f23e2c304bde3a5c27f7f882d4616f5abdf9e':
  Locale string comparisons must ignore case.
2012-01-20 14:42:33 -08:00
Justin Ho
43c9dcc18e Merge "Fix a pseudo race condition in TtsEngineSettingsFragment." into ics-mr1 2012-01-20 14:40:04 -08:00
Narayan Kamath
2d8101bc8b Fix a pseudo race condition in TtsEngineSettingsFragment.
The issue is that Fragment.setVoiceDataDetails can
be called before Fragment.getView. We guard against this
issue. No thread visibility issues here because both functions
are called on the UI thread.

bug:5884355
Change-Id: Iad91b91c58b04dcb9f34f6b5ff8752f2e8295423
2012-01-20 17:52:02 +00:00
Narayan Kamath
999f23e2c3 Locale string comparisons must ignore case.
The spec does not specify case sensitivity and support
for 3 letter locales is currently poor.

bug:5885830
Change-Id: I1b8f582bd19b1b0aed220036c5f17904478dba46
2012-01-20 17:42:59 +00:00
Irfan Sheriff
d37422a3a0 Concurrency wifi p2p and client operation support
Change-Id: I095b7e7ce143cc37ec454a8e43ed579258d72ea1
2012-01-18 15:33:31 -08:00
Tadashi G. Takaoka
f918fcac48 am faee5f4b: Use EditorInfo.IME_FLAG_FORCE_ASCII instead of privateImeOptions
* commit 'faee5f4bdfce82b920dc27119cafcdda7b4c4a8a':
  Use EditorInfo.IME_FLAG_FORCE_ASCII instead of privateImeOptions
2012-01-17 16:59:26 -08:00
Tadashi G. Takaoka
faee5f4bdf Use EditorInfo.IME_FLAG_FORCE_ASCII instead of privateImeOptions
This change overrides Id40a164c.

Bug: 5850605
Change-Id: Id14aa2ebdf4087c88412ed82de75442785396b84
2012-01-17 15:04:00 +09:00
Svetoslav Ganov
cb2e2de904 am 4de315b8: Merge "AccessibilityService description not internationalized (Settings)."
* commit '4de315b8de9e87cc9d073f87146c303a9382a8bb':
  AccessibilityService description not internationalized (Settings).
2012-01-12 15:38:55 -08:00
Svetoslav Ganov
4de315b8de Merge "AccessibilityService description not internationalized (Settings)." 2012-01-12 15:37:11 -08:00
Jean-Baptiste Queru
5c9de0fc98 am 99bf694a: am d96abecc: am 02bc3ffe: am 1e78bd01: Merge "Observer for GPS is never added back."
* commit '99bf694ae8d0e66b01b353bfa75b7ce3ccf09758':
  Observer for GPS is never added back.
2012-01-12 11:07:22 -08:00
Jean-Baptiste Queru
99bf694ae8 am d96abecc: am 02bc3ffe: am 1e78bd01: Merge "Observer for GPS is never added back."
* commit 'd96abeccfd04de5a89599d2b041022bef9e58669':
  Observer for GPS is never added back.
2012-01-12 11:05:22 -08:00
Jean-Baptiste Queru
d96abeccfd am 02bc3ffe: am 1e78bd01: Merge "Observer for GPS is never added back."
* commit '02bc3ffe311f8cc5f9e9464ed0ecdd73ea576020':
  Observer for GPS is never added back.
2012-01-12 11:03:02 -08:00
Jean-Baptiste Queru
02bc3ffe31 am 1e78bd01: Merge "Observer for GPS is never added back."
* commit '1e78bd01ca308eec6a08ad376a889240635d6c24':
  Observer for GPS is never added back.
2012-01-12 11:00:21 -08:00
Jean-Baptiste Queru
1e78bd01ca Merge "Observer for GPS is never added back." 2012-01-12 09:13:00 -08:00
The Android Open Source Project
6cbdf013cd am d20d3686: am 3c246e65: Reconcile with ics-mr1-release
* commit 'd20d3686e19ab5f08b45e2573258f7780e83bceb':
2012-01-12 09:03:57 -08:00
The Android Open Source Project
d20d3686e1 am 3c246e65: Reconcile with ics-mr1-release
* commit '3c246e6574ff069f0bf454e1b3a5f7e316cb80eb':
2012-01-12 09:00:19 -08:00
The Android Open Source Project
3c246e6574 Reconcile with ics-mr1-release
Change-Id: I4907309d47ab642baf4a2ca0c65b563400f52ee9
2012-01-12 08:56:52 -08:00
The Android Automerger
76b9d3ef47 merge in ics-mr1-release history after reset to ics-mr1 2012-01-11 16:29:50 -08:00
Jim Miller
43509d6edf am 325d1ab1: am 340990a2: am af487099: Merge "Fix 4560303: Add setting to lock later when power button pressed" into ics-mr1
* commit '325d1ab157bccb203b526baef366f19bcd7636b0':
  Fix 4560303: Add setting to lock later when power button pressed
2012-01-10 10:34:54 -08:00
Jim Miller
325d1ab157 am 340990a2: am af487099: Merge "Fix 4560303: Add setting to lock later when power button pressed" into ics-mr1
* commit '340990a2d29f566b83dc551e3c5f748c96bd99f2':
  Fix 4560303: Add setting to lock later when power button pressed
2012-01-10 10:32:40 -08:00
Jim Miller
340990a2d2 am af487099: Merge "Fix 4560303: Add setting to lock later when power button pressed" into ics-mr1
* commit 'af48709993faeb0d3665eb6a491aaec701e1ccd5':
  Fix 4560303: Add setting to lock later when power button pressed
2012-01-10 10:30:39 -08:00
Jim Miller
659fffcda2 am af487099: Merge "Fix 4560303: Add setting to lock later when power button pressed" into ics-mr1
* commit 'af48709993faeb0d3665eb6a491aaec701e1ccd5':
  Fix 4560303: Add setting to lock later when power button pressed
2012-01-10 10:29:59 -08:00
Jim Miller
af48709993 Merge "Fix 4560303: Add setting to lock later when power button pressed" into ics-mr1 2012-01-10 10:28:31 -08:00
Amith Yamasani
143ad9ef19 am 201896e9: am 79ffc669: am aaff44c8: Don\'t allow wifi tethering when running monkeys.
* commit '201896e9838c067102b5ec10f883d84e75ed276c':
  Don't allow wifi tethering when running monkeys.
2012-01-10 09:02:55 -08:00
Amith Yamasani
201896e983 am 79ffc669: am aaff44c8: Don\'t allow wifi tethering when running monkeys.
* commit '79ffc669173325e62fdb9f5a1f96fe2a5c3c230b':
  Don't allow wifi tethering when running monkeys.
2012-01-09 16:37:34 -08:00
Amith Yamasani
82df66c3eb am aaff44c8: Don\'t allow wifi tethering when running monkeys.
* commit 'aaff44c84f4e88184276064dff9e36eefde3ffcb':
  Don't allow wifi tethering when running monkeys.
2012-01-09 16:03:59 -08:00
Amith Yamasani
79ffc66917 am aaff44c8: Don\'t allow wifi tethering when running monkeys.
* commit 'aaff44c84f4e88184276064dff9e36eefde3ffcb':
  Don't allow wifi tethering when running monkeys.
2012-01-09 16:03:30 -08:00
Amith Yamasani
aaff44c84f Don't allow wifi tethering when running monkeys.
Bug: 5607825

Remove the wifi access point settings and wifi tethering checkbox when
monkeys are running.

Change-Id: I64b930ddb791013a08c178561fe29130f1f0e4b8
2012-01-09 14:52:58 -08:00
Jim Miller
071742d838 Fix 4560303: Add setting to lock later when power button pressed
This adds a feature to delay locking the device when the power button
is pressed.  This fixes a use case where the user wants to turn off
the display (e.g. to save power) but doesn't want to lock the device.

Change-Id: I711a81c3e79f7accdc1d9cb217b7806a0b8fcf63
2012-01-09 14:25:04 -08:00