PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,203 Commits 1 Branch 0 Tags
75826a3c7bed1a282e34954e7e450080c2c6d76c
Commit Graph

7203 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Daisuke Miyakawa
8b878db49d Introduce new "vibrate when ringing" 
We once removed "vibrate and ring" option with
I7168ed140266a7c754fb3d7209cf12e73041c306, while we still need
vibration setting which only affects Phone app.

This depends on I850d27629a75615647883fdaa2933f337c4824d1
See also I3a4ed2bd5e4bde05dfb97c7bb20b9284d1c6f13f for Phone app
side change.

Bug: 6036529
Change-Id: Idb0453e187f8025565d6744cd774613531e7cb8b
 2012-05-08 18:40:07 -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
Eric Fischer
3c1f1b7c82 am f38e48d6: (-s ours) am 0f5c2655: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit 'f38e48d659cb40a0f231d7d3c7659eb81e7dcc59':
  Import translations. DO NOT MERGE
 2012-05-08 15:01:56 -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
Jeff Sharkey
a339cba51a Avoid split action bar on phones. 
Change-Id: I6cf8400a09562eb905568cd6681773e94df556d8
 2012-05-08 11:42:49 -07:00
Gilles Debunne
7dabe6117d am ee2a761f: am 36891ee6: Merge "Removed the no longer needed font size span flag fix" into jb-dev 
* commit 'ee2a761f88a8a5d5603d63a0303fef2c54e2fc01':
  Removed the no longer needed font size span flag fix
 2012-05-08 11:29:46 -07:00
The Android Automerger
25f55481df merge in jb-release history after reset to jb-dev 2012-05-08 08:24:19 -07:00
Jean Chalard
fbffd0c982 Move the word commit code to UserDictionaryAddWordContent. 
...and call it from the fragment too.

Bug: 6026080
Change-Id: Icb83fd60ed33dfa593124ed0af6b9fff4b63f1f5
 2012-05-08 20:47:51 +09:00
Jean Chalard
be3f0faf52 Factor some code 
Bug: 6026080
Change-Id: I38475a95b1d421162099390244dbda09658346f5
 2012-05-08 20:26:59 +09:00
Jean Chalard
be07e49a92 Implement the "add word" screen according to new spec 
This is only the interface. It doesn't do anything yet, so as to
avoid a too large change.

Bug: 6026080
Change-Id: I0c7f0c09f71e01b18fcb3566a3c6c4b0f0b2a0fc
 2012-05-08 20:10:51 +09:00
Jean Chalard
b9f837dd1d Fix a janky transition 
Bug: 6026080
Change-Id: I75bd244b2b09c371805a67057d2a9c45dc12f3db
 2012-05-08 13:09:39 +09:00
Amith Yamasani
184ae2c3f2 Merge "Reduce the amount of I/O done on the UI thread." into jb-dev 2012-05-07 18:11:28 -07:00
Amith Yamasani
f6d8961843 Reduce the amount of I/O done on the UI thread. 
There was unnecessary saving of IME settings when changing the state
of the checkboxes, causing ANRs when monkeys are switching between
Settings fragments quickly while other background activity is using
I/O as well. In fact, all I/O should be removed, but this change at least
reduces some of it.

Potential fix for:
Bug: 6414289

Change-Id: Ice96f0f9d921128b27ddbe26519a6791d9f01c75
 2012-05-07 17:56:14 -07:00
Eric Laurent
17fe90a440 Changes for new vibration policy. 
Select silent icon based on mAudioManager.getRingerMode() since AudioManager.shouldVibrate()
is deprecated.

Change-Id: Iaa474dbb8c1b5fb8fc3b6eeb3426fde3e7b879c3
 2012-05-07 17:34:55 -07:00
Irfan Sheriff
63f7f5cda5 Merge "Remove poor connection UI with watchdog disabled" into jb-dev 2012-05-07 17:15:21 -07:00
Irfan Sheriff
8f5463dd17 Remove poor connection UI with watchdog disabled 
Bug: 6449324
Change-Id: I8ddd486ce433b30dd76d385680fdb79d2b90e8eb
 2012-05-07 16:53:20 -07:00
Isaac Levy
e7c0d66e26 Fixed 'upto' spelling in WPS messages 
Change-Id: Ib8c627235de0455c6f239bff77e70080e3080d3d
 2012-05-07 16:41:47 -07:00
Irfan Sheriff
2bcca59f30 Merge "Remove NSD checkbox" into jb-dev 2012-05-07 16:37:16 -07:00
Eric Fischer
f38e48d659 am 0f5c2655: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit '0f5c2655f56c628a06552acdc82bef5f3007caee':
  Import translations. DO NOT MERGE
 2012-05-07 16:02:15 -07:00
Eric Fischer
0f5c2655f5 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-05-07 16:00:06 -07:00
Irfan Sheriff
936e3faae1 Remove NSD checkbox 
Bug: 6449478
Change-Id: Ic4aa44cb08843819c3290b16d906c989ee306727
 2012-05-07 15:51:37 -07:00
Eric Fischer
f2fa44e8cb Import translations. DO NOT MERGE 
Change-Id: I9859029eba761f90de6250f97f582d8c6b0954d5
 2012-05-07 14:02:44 -07:00
Eric Fischer
7e08807713 Import translations. DO NOT MERGE 
Change-Id: I5755d0e1a36dab74c96e27361421b0be4dc4d8b9
 2012-05-07 14:00:55 -07:00