Commit Graph

5094 Commits

Author SHA1 Message Date
Gilles Debunne
1a4301b758 Merge "Unused assets removed from Settings" 2011-10-31 10:59:53 -07:00
Eric Fischer
100ab4953c am fdda65cf: (-s ours) am 6fded4ab: (-s ours) Import revised translations. DO NOT MERGE
* commit 'fdda65cfc7a2422519842bbe0fb402be46234c25':
  Import revised translations.  DO NOT MERGE
2011-10-31 12:26:46 +00:00
Eric Fischer
fdda65cfc7 am 6fded4ab: (-s ours) Import revised translations. DO NOT MERGE
* commit '6fded4ab3fca2d79a82c40f90370b12489456dff':
  Import revised translations.  DO NOT MERGE
2011-10-29 03:15:30 +00:00
Gilles Debunne
5f8ebe2ee8 Unused assets removed from Settings
Change-Id: I32cbeba75d46e536191f55a94185ec0e896fa397
2011-10-28 17:41:08 -07:00
Eric Fischer
6fded4ab3f Import revised translations. DO NOT MERGE
Change-Id: Ib938444059955eab65a79afef9d9ec3c971dcd8c
2011-10-28 17:06:49 -07:00
Eric Fischer
c72f73181a am f96a1767: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit 'f96a17676fccb6e08605b9f43a867db0924bb9e9':
  Import revised translations.  DO NOT MERGE
2011-10-28 22:27:57 +00:00
Eric Fischer
f96a17676f Merge "Import revised translations. DO NOT MERGE" into ics-mr1 2011-10-28 14:01:37 -07:00
Eric Fischer
05b52f122e Import revised translations. DO NOT MERGE
Change-Id: I8a28a888b322b379800fae19299e91a3b485b2f8
2011-10-28 13:54:20 -07:00
Svetoslav Ganov
1d437a9a4a Merge "Updated tutorial string to use passive voice" 2011-10-28 12:33:10 -07:00
Eric Fischer
260ec1971d Merge "Import revised translations." 2011-10-28 12:15:42 -07:00
Eric Fischer
fe5c95216c Import revised translations.
Change-Id: I70742032bee9036bdfd2e6b2ca118bd517c2ad10
2011-10-28 11:36:43 -07:00
Narayan Kamath
17d15b07f4 am 15dc52f9: (-s ours) Merge "Hide the "install voice data" preference by default. DO NOT MERGE" into ics-mr1
* commit '15dc52f9e9d5c5c88ab32f688618a4ee4384e874':
  Hide the "install voice data" preference by default. DO NOT MERGE
2011-10-28 09:19:13 +00:00
Narayan Kamath
15dc52f9e9 Merge "Hide the "install voice data" preference by default. DO NOT MERGE" into ics-mr1 2011-10-28 02:15:38 -07:00
Jaikumar Ganesh
27fb42a472 am c89fa2fb: am d9bf0d1a: Merge "Fix UI issue with Bluetooth Settings." into ics-mr0
* commit 'c89fa2fbfb90cae676a2a24c970c3d18efd781e4':
  Fix UI issue with Bluetooth Settings.
2011-10-28 02:18:13 +00:00
Jaikumar Ganesh
c89fa2fbfb am d9bf0d1a: Merge "Fix UI issue with Bluetooth Settings." into ics-mr0
* commit 'd9bf0d1afa7857ec3f678ac2aa041b42bcf2ef5a':
  Fix UI issue with Bluetooth Settings.
2011-10-28 02:14:06 +00:00
Jaikumar Ganesh
d9bf0d1afa Merge "Fix UI issue with Bluetooth Settings." into ics-mr0 2011-10-27 16:49:39 -07:00
Jaikumar Ganesh
f5754a078c Fix UI issue with Bluetooth Settings.
When a profile fails to connect, the preference was getting unset.

Patch generated in conversation with Jake Hamby.

Bug: 5526404
Change-Id: I27ab8d337b6d121f8d369841d3f9a691293ef922
2011-10-27 16:39:50 -07:00
Alan Viverette
fe5c8cecda Updated tutorial string to use passive voice
Change-Id: I4a7bcbbe0a2400e977c278aec1e90acfdf82bae2
2011-10-27 16:31:17 -07:00
Eric Fischer
79f1ec76e7 am 36fb196c: (-s ours) am 65c61ef8: (-s ours) Import revised translations. DO NOT MERGE
* commit '36fb196ce3107f6bf25015045785f993bd695854':
  Import revised translations.  DO NOT MERGE
2011-10-27 21:54:08 +00:00
Eric Fischer
36fb196ce3 am 65c61ef8: (-s ours) Import revised translations. DO NOT MERGE
* commit '65c61ef8cd6904c4b378cb04dbe564229ff70cd7':
  Import revised translations.  DO NOT MERGE
2011-10-27 21:46:47 +00:00
Eric Fischer
65c61ef8cd Import revised translations. DO NOT MERGE
Change-Id: I2731df18113b720c7b2894c670302330c9c29f9f
2011-10-27 09:53:19 -07:00
Eric Fischer
803ba958e1 am bb16d168: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit 'bb16d168a163220da1a0925f7c87378ab7734cf7':
  Import revised translations.  DO NOT MERGE
2011-10-27 16:51:06 +00:00
Eric Fischer
bb16d168a1 Merge "Import revised translations. DO NOT MERGE" into ics-mr1 2011-10-27 09:45:59 -07:00
Narayan Kamath
687e22bcf9 Hide the "install voice data" preference by default. DO NOT MERGE
Re-added if there are voices to install.
DO NOT MERGE : Was already submitted to master.

bug:5511343
Change-Id: Iac95f37c3dda3b213f6ba34c32b7dc725673d64d
2011-10-27 17:15:51 +01:00
Narayan Kamath
b7fb9e0eed Hide the "install voice data" preference by default.
Re-added if there are voices to install.

bug:5511343

Change-Id: I135db7dd083a8b2be40c16e9c8cae3e177a007cb
2011-10-27 17:03:31 +01:00
Eric Fischer
d7cb5c7359 Import revised translations. DO NOT MERGE
Change-Id: I22ad234b19bb6270f7edd9461590d119d7dc4eff
2011-10-26 17:40:52 -07:00
Eric Fischer
8fc86b96a8 am bfdc4ecb: (-s ours) am d27fa50a: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit 'bfdc4ecb86b53fe6f2760981188714e606245730':
  Import revised translations.  DO NOT MERGE
2011-10-26 21:14:54 +00:00
Eric Fischer
bfdc4ecb86 am d27fa50a: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit 'd27fa50a0a823403fd77929f8b6a40a260a27577':
  Import revised translations.  DO NOT MERGE
2011-10-26 21:08:59 +00:00
Eric Fischer
d27fa50a0a Merge "Import revised translations. DO NOT MERGE" into ics-mr0 2011-10-26 14:06:13 -07:00
Eric Fischer
624673c2ca am 3e17577e: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '3e17577e859a370eb6701bbfd671db7142674929':
  Import revised translations.  DO NOT MERGE
2011-10-26 18:32:17 +00:00
Eric Fischer
3e17577e85 Merge "Import revised translations. DO NOT MERGE" into ics-mr1 2011-10-26 11:27:35 -07:00
Eric Fischer
59ecd1667a Import revised translations. DO NOT MERGE
Change-Id: I9d5e132b9d4a9e505269ef9998acabfba8ffa975
2011-10-26 11:09:44 -07:00
Eric Fischer
c57348f035 Import revised translations. DO NOT MERGE
Change-Id: I7d78b6f42431a906f9a8f624c9f0e573859ea4bc
2011-10-26 10:24:56 -07:00
Todd Poynor
f97709ca95 am 296f2d27: am a94320e3: Settings use minimum manual brightness from config
* commit '296f2d270f23b27446d1d85450ac0310eb9fd3ea':
  Settings use minimum manual brightness from config
2011-10-26 14:54:14 +00:00
Ed Heyl
24491bbc7c am 5f4cda38: (-s ours) merge ics-mr0
* commit '5f4cda3888934cf9bfa01695c098beedcc45247f':
2011-10-26 14:54:14 +00:00
Todd Poynor
296f2d270f am a94320e3: Settings use minimum manual brightness from config
* commit 'a94320e332f3c14b6ebb2359cc3fe363b8dfe688':
  Settings use minimum manual brightness from config
2011-10-26 12:22:41 +00:00
Todd Poynor
a94320e332 Settings use minimum manual brightness from config
Remove use of deprecated android.os.Power.BRIGHTNESS_DIM (20) + 10.

Change-Id: I24aff7d7fc93b4b67dedb1047bbbd4dbe3fae382
Signed-off-by: Todd Poynor <toddpoynor@google.com>
2011-10-25 17:14:33 -07:00
Ed Heyl
5f4cda3888 merge ics-mr0
Change-Id: I264e87a888059ada62b56a3ff7acf44cb0657cb8
2011-10-25 20:19:41 +00:00
Eric Fischer
6bf9bfac07 Merge "Import revised translations." 2011-10-25 11:46:00 -07:00
Eric Fischer
6492021d3d Import revised translations.
Change-Id: I85d5a78e41a780050884cec4669b45525bbeac0f
2011-10-25 11:00:07 -07:00
Eric Fischer
66e034cb7b am caf76c08: (-s ours) Import revised translations. DO NOT MERGE
* commit 'caf76c08b3d7044ef5cb55b1df4fd245e68889f7':
  Import revised translations.  DO NOT MERGE
2011-10-24 17:14:12 -07:00
Eric Fischer
caf76c08b3 Import revised translations. DO NOT MERGE
Change-Id: I7df445e1dff14ef16380b371d8e14af1b6a98295
2011-10-24 17:09:58 -07:00
Eric Fischer
5907e06007 am b8568b21: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit 'b8568b21118a423c6e30e736c5702b3f946b6179':
  Import revised translations.  DO NOT MERGE
2011-10-21 16:02:31 -07:00
Eric Fischer
b8568b2111 Merge "Import revised translations. DO NOT MERGE" into ics-mr0 2011-10-21 16:00:30 -07:00
Eric Fischer
d27a632d94 Import revised translations. DO NOT MERGE
Change-Id: I1ccc1ed633e301bb2db039ea8ce1041a00daccc3
2011-10-21 14:41:59 -07:00
Irfan Sheriff
cd5b0233bb am cb5fa5a4: Merge "Remove wifidirect UI listing" into ics-mr0
* commit 'cb5fa5a44779f790fae87102a573816ecc15dd3d':
  Remove wifidirect UI listing
2011-10-21 14:38:39 -07:00
Peter Ng
31373a6221 Merge "Settings applications processes viewer color updates" 2011-10-21 14:14:44 -07:00
Eric Fischer
97fb1e8e78 am 388c9e2f: (-s ours) Import revised translations. DO NOT MERGE
* commit '388c9e2f14c4b533ec9d19c1513e51353de89e75':
  Import revised translations.  DO NOT MERGE
2011-10-21 13:52:11 -07:00
Irfan Sheriff
cb5fa5a447 Merge "Remove wifidirect UI listing" into ics-mr0 2011-10-21 13:29:53 -07:00
Irfan Sheriff
74fda1065a Remove wifidirect UI listing
Was used for testing. remove it until proper UI is
added

Bug: 5497909
Change-Id: Ic8bd1afbe348ede9031f2446b30a99d7efc88f7c
2011-10-21 13:11:37 -07:00