PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,989 Commits 1 Branch 0 Tags
65b1230ea9829246d2bc8073974440a3a49af55c
Commit Graph

6989 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ying Wang
7a1a575b74 am d7e8025f: Import translations. DO NOT MERGE 
* commit 'd7e8025fdf91fd0a6dad9df6bc92e7cb9d7566c2':
  Import translations. DO NOT MERGE
 2012-06-23 05:36:47 -07:00
The Android Automerger
bfbcf0904d merge in jb-release history after reset to jb-dev 2012-06-22 20:38:33 -07:00
Ying Wang
d7e8025fdf Import translations. DO NOT MERGE 
Change-Id: I417b1bbfd809569e110d5534fb2db1dd2c82075e
 2012-06-22 15:07:41 -07:00
The Android Open Source Project
d88734ab4d Reconcile with jb-release 
Change-Id: I7cd948231f3aa78f5d0a53889ed833af50738452
 2012-06-22 08:17:21 -07:00
The Android Automerger
a99fd92072 merge in jb-release history after reset to jb-dev 2012-06-21 17:52:47 -07:00
Eric Fischer
3a96b10211 am 3c46b110: Import translations. DO NOT MERGE 
* commit '3c46b1103995434045b946a14d9909e866a8c8ab':
  Import translations. DO NOT MERGE
 2012-06-21 15:52:25 -07:00
Eric Fischer
3c46b11039 Import translations. DO NOT MERGE 
Change-Id: I77226bb57376204d2b55012c3be037a6f05be228
 2012-06-21 15:04:08 -07:00
Eric Fischer
4bc59c7006 am f776a738: Import translations. DO NOT MERGE 
* commit 'f776a738fae4bcf0f81d59579a30efd400fbb295':
  Import translations. DO NOT MERGE
 2012-06-21 11:52:14 -07:00
The Android Automerger
e1e0cd32d9 merge in jb-release history after reset to jb-dev 2012-06-21 07:04:22 -07:00
Eric Fischer
f776a738fa Import translations. DO NOT MERGE 
Change-Id: I8d15ef5cb523bdc7f68216a7d465dcb7b9152477
 2012-06-20 21:12:09 -07:00
Amith Yamasani
66b0ad5793 am 9938ac8a: Merge "Fix incorrect updating of headers in Settings" into jb-dev 
* commit '9938ac8a6e1885b2cd7f35fd6c63e2b04a84d36c':
  Fix incorrect updating of headers in Settings
 2012-06-20 15:48:24 -07:00
Amith Yamasani
9938ac8a6e Merge "Fix incorrect updating of headers in Settings" into jb-dev 2012-06-20 15:45:05 -07:00
Ying Wang
a104564d9d am 679948df: Import translations. DO NOT MERGE 
* commit '679948df3cf5c71bfe24ad4d6cd1bd78cb0fb28d':
  Import translations. DO NOT MERGE
 2012-06-20 14:49:14 -07:00
Ying Wang
679948df3c Import translations. DO NOT MERGE 
Change-Id: I7d2055b0cf38cf4b676a599fd0c952b2fdac99b1
 2012-06-20 13:54:32 -07:00
Amith Yamasani
ea7b28c2a1 Fix incorrect updating of headers in Settings 
Settings was overriding the header list in PreferenceActivity and
maintaining its own. In the case where Settings activity is restored
from saved state, the header lists went out of sync and couldn't
be updated anymore.

This makes use of a new private method in PreferenceActivity to
retrieve the header list object so that they stay in sync and can
be updated.

Also make sure to invalidate headers on resume, so that the latest
account types are loaded.

Bug: 6685701
Change-Id: I76ed1e1579a70fb5abfcea417d7e981907bdc02c
 2012-06-20 13:51:40 -07:00
The Android Open Source Project
dc66c953c3 Reconcile with jb-release 
Change-Id: I84c9b6e4663448275a78cab4ea14f4952b440c8f
 2012-06-20 08:26:04 -07:00
The Android Automerger
ce37588080 merge in jb-release history after reset to jb-dev 2012-06-20 07:04:02 -07:00
Christopher Tate
1b4a9b4107 am 5739d4fe: Merge "Use string resources instead of literals for backup password confirmations" into jb-dev 
* commit '5739d4fe02c7ca4d3d939ec4f21bc9de42b8676f':
  Use string resources instead of literals for backup password confirmations
 2012-06-19 16:34:01 -07:00
Christopher Tate
5739d4fe02 Merge "Use string resources instead of literals for backup password confirmations" into jb-dev 2012-06-19 16:31:11 -07:00
Eric Fischer
e5d2b8b8ab am f4a4119e: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit 'f4a4119eeaed1a99c082f253174b8acbca07c4c2':
  Import translations. DO NOT MERGE
 2012-06-19 16:26:22 -07:00
Eric Fischer
f4a4119eea Merge "Import translations. DO NOT MERGE" into jb-dev 2012-06-19 16:23:23 -07:00
Christopher Tate
2d6497d2d1 Use string resources instead of literals for backup password confirmations 
Localizability is good.  Bug 6683158

Change-Id: I205e4a09f5137e18d4085fcc041fae86f26ab188
 2012-06-19 16:22:55 -07:00
Amith Yamasani
f62df931fa am 8e1981cc: Merge "Show full summary for network location sercice even for wifi-only devices" into jb-dev 
* commit '8e1981ccd314bf3e41601314e78cc9626a4299af':
  Show full summary for network location sercice even for wifi-only devices
 2012-06-19 16:01:50 -07:00
Eric Fischer
5ad50ac860 Import translations. DO NOT MERGE 
Change-Id: I097248fa64ec4f5d75ca4ddda3a17d49c29647a7
 2012-06-19 16:01:49 -07:00
Amith Yamasani
8e1981ccd3 Merge "Show full summary for network location sercice even for wifi-only devices" into jb-dev 2012-06-19 15:59:48 -07:00
Amith Yamasani
1270eb5e43 Show full summary for network location sercice even for wifi-only devices 
Bug: 6694051
Change-Id: Ic2446aa640bc2688fd74885eeb55f179c51e7691
 2012-06-19 10:53:49 -07:00
The Android Open Source Project
21fbab8d31 Reconcile with jb-release 
Change-Id: I2b3e50f3304a3e5bd0e23e70b30db6e10d546f1c
 2012-06-19 07:16:04 -07:00
The Android Automerger
7116f061f6 merge in jb-release history after reset to jb-dev 2012-06-19 07:05:23 -07:00
The Android Open Source Project
ab1ae4c7c6 Reconcile with jb-release 
Change-Id: Ia9498cdf747581bb837e57129b89c4f1e6e15a6f
 2012-06-19 06:13:55 -07:00
Ying Wang
922eed658a am fae5978e: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit 'fae5978e4a89aa2b8e6a9e1cf95c910a0609923a':
  Import translations. DO NOT MERGE
 2012-06-18 14:53:11 -07:00
Ying Wang
fae5978e4a Merge "Import translations. DO NOT MERGE" into jb-dev 2012-06-18 14:51:26 -07:00
Ying Wang
be4ac92791 Import translations. DO NOT MERGE 
Change-Id: I8ba16c5a7895850d429ae355bf2c27e384bb248e
 2012-06-18 14:40:20 -07:00
Jim Miller
4a3435f86e am 284c9872: Merge "Fix 6663465: remove flagNoEnterAction in favor of actionNext" into jb-dev 
* commit '284c9872cea3a5d97e1b1dd0016ac376da695175':
  Fix 6663465: remove flagNoEnterAction in favor of actionNext
 2012-06-18 13:22:05 -07:00
Jim Miller
284c9872ce Merge "Fix 6663465: remove flagNoEnterAction in favor of actionNext" into jb-dev 2012-06-18 13:19:42 -07:00
Dianne Hackborn
2027328c7b am 4d8dac07: Merge "Implement issue #6633077: Improve permissions display for..." into jb-dev 
* commit '4d8dac0792ec7994f9f4cbf2648cf8f3185876ca':
  Implement issue #6633077: Improve permissions display for...
 2012-06-18 10:33:07 -07:00
Dianne Hackborn
fe5a72dae2 am ed99a81e: Merge "Fix issue #6664140: Time to lock should work even Stay awake..." into jb-dev 
* commit 'ed99a81e1595c25d7070866ee0c2aa1d94103955':
  Fix issue #6664140: Time to lock should work even Stay awake...
 2012-06-18 10:33:00 -07:00
Ying Wang
7622ce2955 am 9d6d89ef: Import translations. DO NOT MERGE 
* commit '9d6d89ef82f07ef54238699619d4875c4f2ae833':
  Import translations. DO NOT MERGE
 2012-06-18 10:32:07 -07:00
The Android Automerger
135eb8bb2b merge in jb-release history after reset to jb-dev 2012-06-16 07:04:45 -07:00
Jim Miller
feeafe2e79 Fix 6663465: remove flagNoEnterAction in favor of actionNext 
This fixes a bug where the return key was showing in some layouts
for choose/confirm password screens in Settings.  Now we just use
"actionNext" which ensures we see consistent behavior across
devices.

Change-Id: I4bf3033654b85f14c55de6f418caaf1ce563c33a
 2012-06-15 17:56:49 -07:00
Dianne Hackborn
4d8dac0792 Merge "Implement issue #6633077: Improve permissions display for..." into jb-dev 2012-06-15 17:53:40 -07:00
Dianne Hackborn
ed99a81e15 Merge "Fix issue #6664140: Time to lock should work even Stay awake..." into jb-dev 2012-06-15 17:23:55 -07:00
Dianne Hackborn
f34a8d7517 Fix issue #6664140: Time to lock should work even Stay awake... 
...in Developer options is on

Disable the stay awake while on option in settings if a lock limit
is being enforced.

Bug: 6664140
Change-Id: I8da1b8c734ceef10662d33392609c35e645315c3
 2012-06-15 17:07:14 -07:00
Ying Wang
9d6d89ef82 Import translations. DO NOT MERGE 
Change-Id: I861590828a57951c72001e0c6c6ab2222be320c8
 2012-06-15 14:33:14 -07:00
Dianne Hackborn
e458832c76 Implement issue #6633077: Improve permissions display for... 
...inherited permissions from shared UIDs

Bug: 6633077
Change-Id: I91917339e83b79a3dfcfcb70a68d571c9a7f7e14
 2012-06-15 11:00:17 -07:00
Eric Fischer
aac5d9f60e am 5ea994c5: Import translations. DO NOT MERGE 
* commit '5ea994c552ea72385022c0c81b8b69acbe30a113':
  Import translations. DO NOT MERGE
 2012-06-14 14:46:18 -07:00
Eric Fischer
5ea994c552 Import translations. DO NOT MERGE 
Change-Id: Ife956408e146ad876b860968dacd8f3095ed84e1
 2012-06-14 13:44:39 -07:00
The Android Automerger
2c33bde431 merge in jb-release history after reset to jb-dev 2012-06-14 07:04:26 -07:00
Jean-Baptiste Queru
5cca2411fd am 60ec22d1: (-s ours) Merge "Settings: Fixed German translation for turning WLAN/Bluetooth on" 
* commit '60ec22d1bdaa6124311a720717e3c522f839441e':
  Settings: Fixed German translation for turning WLAN/Bluetooth on
 2012-06-13 17:39:33 -07:00
Jean-Baptiste Queru
60ec22d1bd Merge "Settings: Fixed German translation for turning WLAN/Bluetooth on" 2012-06-13 17:05:38 -07:00
Amith Yamasani
e5147e4933 am 5b7a8204: Merge "Show only the language if there\'s only one locale for the language." into jb-dev 
* commit '5b7a8204d875c901782ff482b68fde8da7a0081f':
  Show only the language if there's only one locale for the language.
 2012-06-13 15:24:12 -07:00