PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,425 Commits 1 Branch 0 Tags
38f360a64092a32dd472830f51a259062eecdb87
Commit Graph

6425 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Vikram Aggarwal
d1147250dd Delay audio notification on user interaction 
Fix the eng pieces of bug 6445429.

Change-Id: I1963d2e701e4b4639cdc75cc3161668d0601747d
 2012-05-08 16:03:18 -07:00
Andrew Flynn
0575736cdc Allow WiFi picker to exit after a valid connection is made 
Choice is passed in via boolean extra and has two effects:
* A valid network connection exits the picker.
* The next button (if there is one) is hidden.

This functionality will be used for SetupWizard initially.

Bug: 6428046
Change-Id: Ieeed3a9f1013cccd76bd4762131747a57a38ce9c
 2012-05-08 15:50:45 -07:00
Dianne Hackborn
34481b9cd4 Settings to control traces. 
Also some re-organization of the debug options, and check for
the case where the global debug setting is turned off but there
are some debug options turned on (in which case we just switch
to the global option being on).

Change-Id: I710e3a009e2be9c7c1a1879a853ac736abf1d8d8
 2012-05-08 15:42:53 -07:00
Eric Laurent
98d262df0d Merge "Changes for new vibration policy." into jb-dev 2012-05-08 15:27:05 -07:00
Andrew Flynn
a4139dc0e5 Merge "Hide Back button when requesting intent says to" into jb-dev 2012-05-08 15:24:21 -07:00
Andrew Flynn
bfff317559 Hide Back button when requesting intent says to 
Change-Id: I79ed35843500f20367568510ea8df3afe543ede8
 2012-05-08 13:50:53 -07:00
Amith Yamasani
95a893bebb Merge "Avoid split action bar on phones." into jb-dev 2012-05-08 12:22:22 -07:00