Commit Graph

6485 Commits

Author SHA1 Message Date
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
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
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
Kenny Root
14cd246a31 am db558415: Merge "Allow movement of forward-locked apps to SD" into jb-dev
* commit 'db5584158180bbb5af9a07f0c5f505388807f13c':
  Allow movement of forward-locked apps to SD
2012-05-09 01:49:12 -07:00
Kenny Root
b9b2655f14 am 267d43e6: Merge "Revert "Make verifier device id information visible"" into jb-dev
* commit '267d43e6b75bcc1b60d4e72e54eec7619cac30dd':
  Revert "Make verifier device id information visible"
2012-05-09 01:49:11 -07:00
Amith Yamasani
6cd7af24df am e647fc62: Merge "Appease the monkey gods." into jb-dev
* commit 'e647fc62481e93aa6cb10e758dbb1acdbf950c8d':
  Appease the monkey gods.
2012-05-09 01:49:04 -07:00
Eric Laurent
7f5a7218b1 am 98d262df: Merge "Changes for new vibration policy." into jb-dev
* commit '98d262df0d0b6eb76b9ddbfb75cc5076a08301db':
  Changes for new vibration policy.
2012-05-09 01:48:35 -07:00
Andrew Flynn
f2c3939e89 am a4139dc0: Merge "Hide Back button when requesting intent says to" into jb-dev
* commit 'a4139dc0e5db8eead3bbb4f68167e86a2a6402a5':
  Hide Back button when requesting intent says to
2012-05-09 01:48:35 -07:00
Amith Yamasani
b5b56d714d am 95a893be: Merge "Avoid split action bar on phones." into jb-dev
* commit '95a893bebb37844c481c8ca08d10f9bdee1aafd6':
  Avoid split action bar on phones.
2012-05-09 01:47:46 -07:00
Jean Chalard
87adf14154 am fbffd0c9: Move the word commit code to UserDictionaryAddWordContent.
* commit 'fbffd0c98203c63af85a3fc6d85660b21c211bfe':
  Move the word commit code to UserDictionaryAddWordContent.
2012-05-09 01:46:21 -07:00
Jean Chalard
377d594f67 am be3f0faf: Factor some code
* commit 'be3f0faf526d628b578b1af6d975c19cfdf8637b':
  Factor some code
2012-05-09 01:46:21 -07:00
Jean Chalard
1d9e8f88b5 am be07e49a: Implement the "add word" screen according to new spec
* commit 'be07e49a9292b653b923cbfa64dc5c42972ded41':
  Implement the "add word" screen according to new spec
2012-05-09 01:46:19 -07:00
Jean Chalard
20d065a520 am b9f837dd: Fix a janky transition
* commit 'b9f837dd1da22f41c72e0cdc1454a486dbc6c448':
  Fix a janky transition
2012-05-09 01:46:06 -07:00
Amith Yamasani
cb8711ec13 am 184ae2c3: Merge "Reduce the amount of I/O done on the UI thread." into jb-dev
* commit '184ae2c3f2339fdbf7c5e538855c0e1afbf58e9e':
  Reduce the amount of I/O done on the UI thread.
2012-05-09 01:45:27 -07:00
Irfan Sheriff
341e518b51 am 63f7f5cd: Merge "Remove poor connection UI with watchdog disabled" into jb-dev
* commit '63f7f5cda5481f613cf4fc32bf3c3531d731fa59':
  Remove poor connection UI with watchdog disabled
2012-05-09 01:44:58 -07:00
Irfan Sheriff
1fa8454f54 am 2bcca59f: Merge "Remove NSD checkbox" into jb-dev
* commit '2bcca59f30a69b862808a5778fb1f07909b747d9':
  Remove NSD checkbox
2012-05-09 01:44:40 -07:00
Dianne Hackborn
821a4d8c34 Merge "Settings to control traces." into jb-dev 2012-05-08 18:55:30 -07:00
Carlos Valdivia
a1f57c7970 Merge "Occlude syncs without provider info." into jb-dev 2012-05-08 17:28:44 -07:00
Kenny Root
db55841581 Merge "Allow movement of forward-locked apps to SD" into jb-dev 2012-05-08 16:56:00 -07:00
Kenny Root
267d43e6b7 Merge "Revert "Make verifier device id information visible"" into jb-dev 2012-05-08 16:54:58 -07:00
Carlos Valdivia
13ade46b53 Occlude syncs without provider info.
Bug: 934147
Change-Id: Ib3413efda07432cfc52cb5b1a20350ed5c7655a8
2012-05-08 16:39:15 -07:00
Amith Yamasani
e647fc6248 Merge "Appease the monkey gods." into jb-dev 2012-05-08 16:37:31 -07:00
Kenny Root
2f926bbb00 Revert "Make verifier device id information visible"
This reverts commit 498fbe470e.

Conflicts:

	res/xml/development_prefs.xml
	src/com/android/settings/DevelopmentSettings.java

Bug: 6438155
Change-Id: I3ab866d0a269e355388bb3ef41737a7d097df8f6
2012-05-08 16:25:49 -07:00
Kenny Root
3c24cfed8d Allow movement of forward-locked apps to SD
Forward-locked apps are now in ASEC containers which can exist on both
SD card and internal storage. Merry Christmas.

Change-Id: If793cf76858395bfc67cd18ab18f488a83757d5f
2012-05-08 16:16:04 -07:00