Commit Graph

6199 Commits

Author SHA1 Message Date
Mike J. Chen
ef4eb89d71 Allows auto dismissing of bluetooth activation dialogs
Create a new overlay boolean that allows products (like Android@Home
ones that have no or minimal display) to not bring up the bluetooth
activation confirmation dialog.

Change-Id: I23c2d1483a4d71b0025624c2e4aaacc688de3260
Signed-off-by: Mike J. Chen <mjchen@google.com>
2011-10-27 17:39:54 -04: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
The Android Automerger
e7609d95a8 merge in ics-mr1-release history after reset to ics-mr1 2011-10-27 06:47:48 -07:00
Eric Fischer
d7cb5c7359 Import revised translations. DO NOT MERGE
Change-Id: I22ad234b19bb6270f7edd9461590d119d7dc4eff
2011-10-26 17:40:52 -07:00
Ed Heyl
f0fc3d21f9 undo reset to ics-mr1 until we have a better method 2011-10-26 21:53:26 +00: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
Ed Heyl
b9cd9bd532 reset to ics-mr1, but keep history 2011-10-26 18:50:24 +00: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
12028a78b8 am f97709ca: am 296f2d27: am a94320e3: Settings use minimum manual brightness from config
* commit 'f97709ca956c16690a9dea8bd041962c2a351f5c':
  Settings use minimum manual brightness from config
2011-10-26 07:56:02 -07:00
Ed Heyl
249c10685d am 24491bbc: am 5f4cda38: (-s ours) merge ics-mr0
* commit '24491bbc7ca2b43ce7f9e957d3e7fbefd8e9986b':
2011-10-26 07:56:01 -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
The Android Automerger
f36cf0da90 merge in ics-mr1-release history after reset to ics-mr1 2011-10-26 07:05:34 -07: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
23a93001db am 6bf9bfac: Merge "Import revised translations."
* commit '6bf9bfac0726f5283821a53348765e46db258c3d':
  Import revised translations.
2011-10-25 11:47:45 -07: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
906902376f am 66e034cb: (-s ours) am caf76c08: (-s ours) Import revised translations. DO NOT MERGE
* commit '66e034cb7bb07d419dd5229630cd729ea81a7aa7':
  Import revised translations.  DO NOT MERGE
2011-10-24 17:16:01 -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
The Android Automerger
e4248f7ba8 merge in ics-release history after reset to master 2011-10-23 07:02:32 -07:00
Eric Fischer
5eca8c5c29 am 5907e060: (-s ours) am b8568b21: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit '5907e06007fa7a15975294e4db28c5807e3ece25':
  Import revised translations.  DO NOT MERGE
2011-10-21 16:05: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
28e8abc95b am cd5b0233: am cb5fa5a4: Merge "Remove wifidirect UI listing" into ics-mr0
* commit 'cd5b0233bb73880e4d2f40633d33f1a6eb63e4b9':
  Remove wifidirect UI listing
2011-10-21 14:40:48 -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
c70f77f4ca am 31373a62: Merge "Settings applications processes viewer color updates"
* commit '31373a62213d00dad20ed10ae8b1b4ffb85e4242':
  Settings applications processes viewer color updates
2011-10-21 14:16:13 -07:00
Peter Ng
31373a6221 Merge "Settings applications processes viewer color updates" 2011-10-21 14:14:44 -07:00
Eric Fischer
2760259942 am 97fb1e8e: (-s ours) am 388c9e2f: (-s ours) Import revised translations. DO NOT MERGE
* commit '97fb1e8e78bd62d044750f2be71a4625bff314f4':
  Import revised translations.  DO NOT MERGE
2011-10-21 13:54:24 -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
Eric Fischer
388c9e2f14 Import revised translations. DO NOT MERGE
Change-Id: Ib962f495098fdcffdcf5f75d5813bb5fb1e94d7c
2011-10-20 18:04:50 -07:00
Peter Ng
8e26e6a216 Settings applications processes viewer color updates
Change-Id: I233bed85c331aa909aebcd3358f7b985d9eaa473
2011-10-20 14:04:53 -07:00
Eric Fischer
84ba32c91b am db4a4fd7: (-s ours) am 49a681c4: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit 'db4a4fd7180810656ab7ce390ab7c82c4790fd53':
  Import revised translations.  DO NOT MERGE
2011-10-20 11:34:29 -07:00
Eric Fischer
db4a4fd718 am 49a681c4: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit '49a681c4928d63b86fca0a546ee60b4f95d16669':
  Import revised translations.  DO NOT MERGE
2011-10-20 11:32:06 -07:00
Eric Fischer
49a681c492 Merge "Import revised translations. DO NOT MERGE" into ics-mr0 2011-10-20 11:29:07 -07:00
Eric Fischer
e373aa16f7 Import revised translations. DO NOT MERGE
Change-Id: Ic01568aa596d6aa3b36ee03d37f5d128e0744886
2011-10-20 11:16:21 -07:00