Commit Graph

7603 Commits

Author SHA1 Message Date
Daisuke Miyakawa
76bd6bec98 am fc363380: Merge "Introduce new "vibrate when ringing"" into jb-dev
* commit 'fc363380c2637d1737c4fb2ed8baf78e2a3ae59d':
  Introduce new "vibrate when ringing"
2012-05-09 10:17:53 -07:00
Andrew Flynn
c395e89ca4 am 38f360a6: am decaba2c: Merge "Allow WiFi picker to exit after a valid connection is made" into jb-dev
* commit '38f360a64092a32dd472830f51a259062eecdb87':
  Allow WiFi picker to exit after a valid connection is made
2012-05-09 10:17:25 -07:00
Daisuke Miyakawa
fc363380c2 Merge "Introduce new "vibrate when ringing"" into jb-dev 2012-05-09 10:16:14 -07:00
Vikram Aggarwal
5adb0e4104 am f466e141: am 3d5688c7: Merge "Delay audio notification on user interaction" into jb-dev
* commit 'f466e1410166b4f5cb33fed01984444c03c09ea6':
  Delay audio notification on user interaction
2012-05-09 10:13:00 -07:00
Andrew Flynn
38f360a640 am decaba2c: Merge "Allow WiFi picker to exit after a valid connection is made" into jb-dev
* commit 'decaba2c674ec9c31283d9137654da35cfd13238':
  Allow WiFi picker to exit after a valid connection is made
2012-05-09 10:12:59 -07:00
Jean Chalard
8b52ef7dc0 am 311899e7: am 657beac9: Rework the de-duplication scheme for shortcuts.
* commit '311899e77b5e4c6b7f2535165e80186cebcdcb59':
  Rework the de-duplication scheme for shortcuts.
2012-05-09 10:12:48 -07:00
Jean Chalard
9e3d4250c6 am 0d6c5c27: am 1571c0a3: Pass the shortcut to the user dictionary provider.
* commit '0d6c5c277c2d294b9e9f3ddee359c294326f8d4b':
  Pass the shortcut to the user dictionary provider.
2012-05-09 10:12:47 -07:00
Jean Chalard
83dd99cdd4 am 87b605a3: am 99e509cc: Rework the list interface
* commit '87b605a3698bf6640b5fc02c22add921877b3f35':
  Rework the list interface
2012-05-09 10:12:46 -07:00
Jean Chalard
2c8c9eefad am 4dc3e50a: am c4c4b916: Small cleanup
* commit '4dc3e50aa8e43cb94c6ce46291bb8f7039f530f5':
  Small cleanup
2012-05-09 10:12:44 -07:00
Jean Chalard
c485f033dc am 477b525c: am 5642fdbf: Improve encapsulation
* commit '477b525c0407bbacc89f614777036cf9ab13b67c':
  Improve encapsulation
2012-05-09 10:12:43 -07:00
Jean Chalard
deee65eff5 am 8dc98834: am ac499c34: Remove the useless parts in the \'add word\' dialog.
* commit '8dc98834da7f258dd478af1b7ea001e0164fb191':
  Remove the useless parts in the 'add word' dialog.
2012-05-09 10:12:43 -07:00
Jean Chalard
2bad5dc173 am 3f779992: am a0868ffd: Move the spinner code to the fragment.
* commit '3f779992f09dfaa1ade6748ef274cdc799ee1983':
  Move the spinner code to the fragment.
2012-05-09 10:12:42 -07:00
Jean Chalard
8e12b4d84b am bb347463: am f54622e4: Cut a helper method to increase encapsulation.
* commit 'bb34746329be2f4a7a5b4208c79697698f1d07e2':
  Cut a helper method to increase encapsulation.
2012-05-09 10:12:38 -07:00
Andrew Flynn
decaba2c67 Merge "Allow WiFi picker to exit after a valid connection is made" into jb-dev 2012-05-09 10:10:34 -07:00
Vikram Aggarwal
f466e14101 am 3d5688c7: Merge "Delay audio notification on user interaction" into jb-dev
* commit '3d5688c7c8bb3b0c6ff9768decc88302882a44dc':
  Delay audio notification on user interaction
2012-05-09 09:22:55 -07:00
Vikram Aggarwal
3d5688c7c8 Merge "Delay audio notification on user interaction" into jb-dev 2012-05-09 09:20:51 -07:00
The Android Automerger
712af706ca merge in jb-release history after reset to jb-dev 2012-05-09 07:47:28 -07:00
Jean Chalard
311899e77b am 657beac9: Rework the de-duplication scheme for shortcuts.
* commit '657beac9bb27d8c40b5193ecd49ec2c8d46f72bb':
  Rework the de-duplication scheme for shortcuts.
2012-05-09 04:38:21 -07:00
Jean Chalard
0d6c5c277c am 1571c0a3: Pass the shortcut to the user dictionary provider.
* commit '1571c0a377f4aa94ef424da326a52fad638b3e54':
  Pass the shortcut to the user dictionary provider.
2012-05-09 04:06:10 -07:00
Jean Chalard
657beac9bb Rework the de-duplication scheme for shortcuts.
Bug: 4646172
Change-Id: I88966f3e910f51711ce49336fb9134d0953930de
2012-05-09 19:57:14 +09:00
Jean Chalard
1571c0a377 Pass the shortcut to the user dictionary provider.
Bug: 6026080

Change-Id: I87b7c8b1ae89856f393871e6d3440b43efc22a29
2012-05-09 19:57:08 +09:00
Jean Chalard
87b605a369 am 99e509cc: Rework the list interface
* commit '99e509cc4c2057dcfba1745ae7584fc1f4047aca':
  Rework the list interface
2012-05-09 03:31:26 -07:00
Jean Chalard
99e509cc4c Rework the list interface
Display the shortcut in the list, and remove the cross button.

Bug: 6026080
Change-Id: I7f594f07a84e4df3ad5b8160129d92d1a4b0fc28
2012-05-09 18:35:12 +09:00
Jean Chalard
4dc3e50aa8 am c4c4b916: Small cleanup
* commit 'c4c4b916eb007dc08f971af45e989a9f0e6c6585':
  Small cleanup
2012-05-09 02:16:05 -07:00
Jean Chalard
477b525c04 am 5642fdbf: Improve encapsulation
* commit '5642fdbf43f06f3773076e3390a6bef120adfc80':
  Improve encapsulation
2012-05-09 02:14:17 -07:00
Jean Chalard
8dc98834da am ac499c34: Remove the useless parts in the \'add word\' dialog.
* commit 'ac499c34fe99740760f729ec24f487a99028fd08':
  Remove the useless parts in the 'add word' dialog.
2012-05-09 02:14:17 -07:00
Jean Chalard
3f779992f0 am a0868ffd: Move the spinner code to the fragment.
* commit 'a0868ffd5ddcb1fa23c5b6e4b1043e40611bbd34':
  Move the spinner code to the fragment.
2012-05-09 02:12:31 -07:00
Jean Chalard
bb34746329 am f54622e4: Cut a helper method to increase encapsulation.
* commit 'f54622e46c9164e4ab46c09c9c3ff173828d5940':
  Cut a helper method to increase encapsulation.
2012-05-09 02:01:49 -07:00
Dianne Hackborn
ea0565cc25 am 80859c27: am 821a4d8c: Merge "Settings to control traces." into jb-dev
* commit '80859c2792eb537cdcbf4be50d5cc11bb9166ccf':
  Settings to control traces.
2012-05-09 01:54:41 -07:00
Carlos Valdivia
70992ddacc am af4757ba: am a1f57c79: Merge "Occlude syncs without provider info." into jb-dev
* commit 'af4757ba5683e5a9b10982256460752a2b1411e1':
  Occlude syncs without provider info.
2012-05-09 01:54:40 -07:00
Kenny Root
46f0af2d87 am 14cd246a: am db558415: Merge "Allow movement of forward-locked apps to SD" into jb-dev
* commit '14cd246a313d1836ce031da920ca78c14c903896':
  Allow movement of forward-locked apps to SD
2012-05-09 01:54:40 -07:00
Kenny Root
406ada6f06 am b9b2655f: am 267d43e6: Merge "Revert "Make verifier device id information visible"" into jb-dev
* commit 'b9b2655f14db5acd7e28a378e948a9424a21f2f9':
  Revert "Make verifier device id information visible"
2012-05-09 01:54:39 -07:00
Amith Yamasani
134ac13535 am 6cd7af24: am e647fc62: Merge "Appease the monkey gods." into jb-dev
* commit '6cd7af24dfdeff8342fa4aed943a41d6aac32e42':
  Appease the monkey gods.
2012-05-09 01:54:38 -07:00
Eric Laurent
c216420a78 am 7f5a7218: am 98d262df: Merge "Changes for new vibration policy." into jb-dev
* commit '7f5a7218b179e31412b85b9a0312e4ac299865b6':
  Changes for new vibration policy.
2012-05-09 01:54:38 -07:00
Andrew Flynn
cb0b0916fd am f2c3939e: am a4139dc0: Merge "Hide Back button when requesting intent says to" into jb-dev
* commit 'f2c3939e894c462a4ae27949aca5848db02354a6':
  Hide Back button when requesting intent says to
2012-05-09 01:54:37 -07:00
Amith Yamasani
5b171edb6a am b5b56d71: am 95a893be: Merge "Avoid split action bar on phones." into jb-dev
* commit 'b5b56d714d13de65efaae09228834bbc16732262':
  Avoid split action bar on phones.
2012-05-09 01:54:37 -07:00
Jean Chalard
ddd335a013 am 87adf141: am fbffd0c9: Move the word commit code to UserDictionaryAddWordContent.
* commit '87adf141544c34580ff8b71944bcff83c166bde1':
  Move the word commit code to UserDictionaryAddWordContent.
2012-05-09 01:54:36 -07:00
Jean Chalard
723d2103c1 am 377d594f: am be3f0faf: Factor some code
* commit '377d594f672d50f777ca8d809591ed02246a1cc6':
  Factor some code
2012-05-09 01:54:35 -07:00
Jean Chalard
819a65968f am 1d9e8f88: am be07e49a: Implement the "add word" screen according to new spec
* commit '1d9e8f88b587770fd405a62268a4cfb8322927b6':
  Implement the "add word" screen according to new spec
2012-05-09 01:54:34 -07:00
Jean Chalard
7bd36b22f4 am 20d065a5: am b9f837dd: Fix a janky transition
* commit '20d065a520a24eba1fe6f43ece936397fb91b9ad':
  Fix a janky transition
2012-05-09 01:54:34 -07:00
Amith Yamasani
20309b4c97 am cb8711ec: am 184ae2c3: Merge "Reduce the amount of I/O done on the UI thread." into jb-dev
* commit 'cb8711ec13c4c0a03f8163b250ca4b7928e1db51':
  Reduce the amount of I/O done on the UI thread.
2012-05-09 01:54:33 -07:00
Irfan Sheriff
086ff1d706 am 341e518b: am 63f7f5cd: Merge "Remove poor connection UI with watchdog disabled" into jb-dev
* commit '341e518b51511a2166a2c5b5395be28e9afedd89':
  Remove poor connection UI with watchdog disabled
2012-05-09 01:54:32 -07:00
Irfan Sheriff
d89a4df611 am 1fa8454f: am 2bcca59f: Merge "Remove NSD checkbox" into jb-dev
* commit '1fa8454f54dd0bdea3f24630cd734408d71d0221':
  Remove NSD checkbox
2012-05-09 01:54:32 -07:00
Jean Chalard
c4c4b916eb Small cleanup
Change-Id: Id8e8352b725d2259c70690a1a7dfe29fab9b6eb0
2012-05-09 17:50:25 +09:00
Jean Chalard
5642fdbf43 Improve encapsulation
Change-Id: I30d28c3a62cc5de3432f04b6469eca077ee3eff6
2012-05-09 17:50:21 +09:00
Jean Chalard
ac499c34fe Remove the useless parts in the 'add word' dialog.
Bug: 6026080
Change-Id: Ic2bf6dcfc2abfe5fc07759530042299cc6a0b503
2012-05-09 17:50:18 +09:00
Jean Chalard
a0868ffd5d Move the spinner code to the fragment.
Bug: 6026080
Change-Id: I49e1aa1839266ca169982b6a4800ee9923451be5
2012-05-09 17:50:14 +09:00
Jean Chalard
f54622e46c Cut a helper method to increase encapsulation.
Change-Id: Ie47503a99d455f7266e281914e92ed680b993551
2012-05-09 17:49:59 +09:00
Dianne Hackborn
80859c2792 am 821a4d8c: Merge "Settings to control traces." into jb-dev
* commit '821a4d8c34e9a60f2f349ff63436c2ea0379ce9c':
  Settings to control traces.
2012-05-09 01:49:48 -07:00
Carlos Valdivia
af4757ba56 am a1f57c79: Merge "Occlude syncs without provider info." into jb-dev
* commit 'a1f57c7970f7ed2ee8fec7b4967a63ace17a0d61':
  Occlude syncs without provider info.
2012-05-09 01:49:25 -07:00