Commit Graph

3200 Commits

Author SHA1 Message Date
Eric Fischer
3d30b374f6 am 058f62ba: (-s ours) am bd044818: Import revised translations. DO NOT MERGE
* commit '058f62baffb28df42cf0419fd06b776170289c71':
  Import revised translations.  DO NOT MERGE
2011-02-22 14:48:35 -08:00
Eric Fischer
058f62baff am bd044818: Import revised translations. DO NOT MERGE
* commit 'bd0448185f32d52e3561e1b10e00e16ec5b4a7cd':
  Import revised translations.  DO NOT MERGE
2011-02-18 15:22:41 -08:00
Eric Fischer
afdbc0d9cc am 2279d3e1: Import revised translations. DO NOT MERGE
* commit '2279d3e18fce7170fc48710617e2e814db5095fd':
  Import revised translations.  DO NOT MERGE
2011-02-16 10:37:32 -08:00
Eric Fischer
2279d3e18f Import revised translations. DO NOT MERGE
Change-Id: I04b8a6b8c000e9c02fc2d8f352a82abcbd873835
2011-02-16 10:22:47 -08:00
Eric Fischer
bd0448185f Import revised translations. DO NOT MERGE
Change-Id: I8e7d2652c85f2bd516881e11283af62ee760adb1
2011-02-14 17:25:07 -08:00
Amith Yamasani
5dd5aff80a am 255fa0e9: (-s ours) am aae04e43: Prevent monkeys from USB tethering. It disconnects the test host. DO NOT MERGE.
* commit '255fa0e96298da0f2ad1788fb79dfc353c8fc60a':
  Prevent monkeys from USB tethering. It disconnects the test host. DO NOT MERGE.
2011-02-11 11:06:23 -08:00
Amith Yamasani
255fa0e962 am aae04e43: Prevent monkeys from USB tethering. It disconnects the test host. DO NOT MERGE.
* commit 'aae04e43ec277c095e181933976dfa7bfd044288':
  Prevent monkeys from USB tethering. It disconnects the test host. DO NOT MERGE.
2011-02-11 11:03:56 -08:00
Amith Yamasani
aae04e43ec Prevent monkeys from USB tethering. It disconnects the test host. DO NOT MERGE.
Bug: 3443747
Change-Id: Ied9c842e306e299fec7cd201415e0cfad0d29630
2011-02-10 17:19:11 -08:00
Eric Fischer
551a9876af am d422079a: (-s ours) am 47d2ecd0: Import revised translations. DO NOT MERGE
* commit 'd422079aebadd598fe2b3f603b982978a615e11e':
  Import revised translations.  DO NOT MERGE
2011-02-10 13:51:31 -08:00
Eric Fischer
2cf42dfb2a am c5d5334e: Import revised translations. DO NOT MERGE
* commit 'c5d5334e9c55e17c4df98af444c814569b3a77c5':
  Import revised translations.  DO NOT MERGE
2011-02-09 10:47:27 -08:00
Eric Fischer
c5d5334e9c Import revised translations. DO NOT MERGE
Change-Id: Iadab60dd0e8902911647870d730709279ae8b197
2011-02-08 18:03:05 -08:00
Eric Fischer
d422079aeb am 47d2ecd0: Import revised translations. DO NOT MERGE
* commit '47d2ecd0c4faf758f59f4eb59f515a41091c39e0':
  Import revised translations.  DO NOT MERGE
2011-02-08 17:33:14 -08:00
Eric Fischer
f0c435c6c8 am 805b5add: Import revised translations. DO NOT MERGE
* commit '805b5add435d2c639363d239cf9abf32cd5a1fdd':
  Import revised translations.  DO NOT MERGE
2011-02-08 10:45:36 -08:00
Eric Fischer
805b5add43 Import revised translations. DO NOT MERGE
Change-Id: I82cf88e26e86820b0dc44d07f62a9bd8ac670ca9
2011-02-07 17:30:01 -08:00
Eric Fischer
47d2ecd0c4 Import revised translations. DO NOT MERGE
Change-Id: If53b83d77929ba02915eeafd3c614599316cca1e
2011-02-07 13:38:01 -08:00
Jake Hamby
93d419a290 am 47cb1753: (-s ours) am 1798fc04: Merge "Fixed a memory leak in the bluetooth settings"
* commit '47cb175396c8b020eded62d6c2293b777f20932b':
  Fixed a memory leak in the bluetooth settings
2011-02-04 17:49:01 -08:00
Jake Hamby
47cb175396 am 1798fc04: Merge "Fixed a memory leak in the bluetooth settings"
* commit '1798fc049eda5f6fd14be3a369eebe81c851abd2':
  Fixed a memory leak in the bluetooth settings
2011-02-04 16:20:15 -08:00
Jake Hamby
1798fc049e Merge "Fixed a memory leak in the bluetooth settings" 2011-02-04 16:12:54 -08:00
Jim Miller
1d8c91faa7 am 78713aed: Fix 3419077: implement new volume control in Settings.
* commit '78713aed9e23fbf2f89edae87b2ba9e1387104ff':
  Fix 3419077: implement new volume control in Settings.
2011-02-03 18:42:11 -08:00
Jim Miller
78713aed9e Fix 3419077: implement new volume control in Settings.
Change-Id: Ia4b803315382d59ae231c26187afaceb69397952
2011-02-03 18:20:23 -08:00
Justin Ho
683d8a2137 am a9d8046c: Updated icons in settings
* commit 'a9d8046c490a2295d6bda1e5eb4bd49838a5c064':
  Updated icons in settings
2011-02-03 15:33:45 -08:00
Justin Ho
a9d8046c49 Updated icons in settings
Change-Id: If5eca6cf91e1c71d53694a0ce2d78485b8729737
2011-02-03 14:49:24 -08:00
Wink Saville
ec4045faba am 327147eb: Have SecuritySettings and SoundSettings use getCurrentPhoneType
* commit '327147eb062a25ecab40d66ea14559070e0ecef3':
  Have SecuritySettings and SoundSettings use getCurrentPhoneType
2011-02-02 13:20:06 -08:00
Wink Saville
327147eb06 Have SecuritySettings and SoundSettings use getCurrentPhoneType
To preserve proper behavior now that getPhoneType can return
PHONE_TYPE_NONE use getCurrentPhoneType.

bug: 3198435
Change-Id: I39d385b17d746f3c7cdbc3e1869efa5d4e89230c
2011-02-02 11:30:25 -08:00
Andy Stadler
37033e1a88 am 9597406a: Restart encryption display after screen power cycle
* commit '9597406aa1b83867b03a47d1a5162969b924f2fc':
  Restart encryption display after screen power cycle
2011-02-01 18:17:19 -08:00
Andy Stadler
9597406aa1 Restart encryption display after screen power cycle
Bug: 3414241
Change-Id: I881fc14c3e0850089b98fcbdbd86c39dde22771c
2011-02-01 17:35:20 -08:00
Andy Stadler
5152fb05d1 am 95ef5575: Prevent NPE in onActivityResult
* commit '95ef5575a2b70d8c018f99b218353c925a70d418':
  Prevent NPE in onActivityResult
2011-02-01 17:27:26 -08:00
Andy Stadler
95ef5575a2 Prevent NPE in onActivityResult
We're returning here in an unexpected condition;  Treat all inputs
as suspect and verify before proceeding.

Bug: 3399579
Change-Id: I389bd0528f8bc721afb5a9c4646a2e23fde77f77
2011-02-01 16:22:41 -08:00
Andy Stadler
9d06aac2c0 am 1499740c: Preserve wakelock through rotation
* commit '1499740c13af5fbd5766a87825c3e789b37bab24':
  Preserve wakelock through rotation
2011-02-01 16:17:51 -08:00
Andy Stadler
1499740c13 Preserve wakelock through rotation
Bug: 3381450

Change-Id: Iea09d050231dfe31848666bdb186a5531d90e7bc
2011-02-01 15:34:59 -08:00
Amith Yamasani
7247e1a10f am 71863f3b: Merge "Use a custom media file for media volume sample." into honeycomb
* commit '71863f3b48588cbbcae93bc784ebefbeec47c25f':
  Use a custom media file for media volume sample.
2011-02-01 05:31:04 -08:00
Amith Yamasani
71863f3b48 Merge "Use a custom media file for media volume sample." into honeycomb 2011-02-01 05:28:41 -08:00
Daisuke Miyakawa
d4eb7c6be3 am 649b9f19: Disable left pane of "Input languages" conditionally.
* commit '649b9f19e1193547f339239afa32d569f43358fc':
  Disable left pane of "Input languages" conditionally.
2011-01-31 22:49:16 -08:00
Daisuke Miyakawa
649b9f19e1 Disable left pane of "Input languages" conditionally.
The screen is available from LatinIME's setting button, in which
we don't want the left pane, while we want the left pane when
launched as part of Settings app.

Bug: 3383738
Change-Id: I62e901e7cc14053742ae35829d82c20e432a358f
2011-01-31 22:12:01 -08:00
Amith Yamasani
424953d55b Use a custom media file for media volume sample.
Bug: 3409194

Intercept volume hard keys and ignore them if not voice capable.

Change-Id: Ieb620f1cfff675ab5a6a8ee69a7dd42355d2932e
2011-01-31 21:20:22 -08:00
Andy Stadler
b3d50cac64 am 13d62049: More CryptKeeper UI work.
* commit '13d62049f7c96c47356f23eaee7f0997612fdf9f':
  More CryptKeeper UI work.
2011-01-31 20:01:16 -08:00
Andy Stadler
13d62049f7 More CryptKeeper UI work.
* Implemented failure case.
* More pixel perfect
* Remove the animation
* Display the encroid on the blank screen
* Remove the back button.
* Fix portrait mode screens

Bug: 3384231
Bug: 3394103
Bug: 3388721
Bug: 3381450
Bug: 3406278
Bug: 3351832
Change-Id: Ib763c8b577198deb45255acc767bc6d5409efc0c
2011-01-31 19:21:37 -08:00
Eric Fischer
ba275d29ea am ba681faf: Merge "Import revised translations. DO NOT MERGE. Bug 3394542" into honeycomb
* commit 'ba681faf73906dcc9c372008855667437b034cc4':
  Import revised translations.  DO NOT MERGE.  Bug 3394542
2011-01-31 18:33:54 -08:00
Eric Fischer
4975590f32 am 2b78f433: (-s ours) am 93580e22: Import revised translations. DO NOT MERGE
* commit '2b78f43322970a9a8bfc215be1ee3656940f1fcd':
  Import revised translations. DO NOT MERGE
2011-01-31 17:48:48 -08:00
Eric Fischer
ba681faf73 Merge "Import revised translations. DO NOT MERGE. Bug 3394542" into honeycomb 2011-01-31 17:28:26 -08:00
Eric Fischer
2b78f43322 am 93580e22: Import revised translations. DO NOT MERGE
* commit '93580e222c156e06b348d228bec24d83836af1f2':
  Import revised translations. DO NOT MERGE
2011-01-31 16:15:26 -08:00
Amith Yamasani
015bf7ae34 am a27868d9: Merge "Fix crash after adding a word to the user dictionary." into honeycomb
* commit 'a27868d9bd2953a9c82deb09edddf8192ddc07f9':
  Fix crash after adding a word to the user dictionary.
2011-01-31 15:22:59 -08:00
Amith Yamasani
a27868d9bd Merge "Fix crash after adding a word to the user dictionary." into honeycomb 2011-01-31 15:20:30 -08:00
Eric Fischer
c16a1641f9 Import revised translations. DO NOT MERGE. Bug 3394542
Change-Id: Id6c2e64725cb9177263d9b9249125378fe04b29a
2011-01-31 12:48:02 -08:00
Amith Yamasani
8875edede1 Fix crash after adding a word to the user dictionary.
Bug: 3407951

Make sure that the parent fragment is a SettingsPreferenceFragment. Otherwise it's not
necessary to manage the mDialogFragment.

Change-Id: I331a3507fe11a7331ff24ecf64fe8c8c3f613636
2011-01-31 12:46:57 -08:00
Eric Fischer
93580e222c Import revised translations. DO NOT MERGE
Change-Id: I7189d018da1a65d6e37b16353b1133b6a51d0df1
2011-01-31 12:25:49 -08:00
Daisuke Miyakawa
6a452ce148 am 8ad1fb63: Merge "Disable back button on SetupWizard flow." into honeycomb
* commit '8ad1fb63403e624f730684db4a3b0ea8aec80b78':
  Disable back button on SetupWizard flow.
2011-01-31 11:59:36 -08:00
Daisuke Miyakawa
8ad1fb6340 Merge "Disable back button on SetupWizard flow." into honeycomb 2011-01-31 11:55:43 -08:00
Daisuke Miyakawa
62fb701ea9 Disable back button on SetupWizard flow.
Bug: 3383738
Change-Id: Ie06d85ee22482f865a8173a45d0645699427729e
2011-01-31 11:05:05 -08:00
Andy Stadler
865ca2a2ef am 17141200: Final cleanup of "password required" dialog
* commit '171412000a95ce35fd3461afe7bcc5b7f2f210f4':
  Final cleanup of "password required" dialog
2011-01-31 11:03:45 -08:00