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

7603 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Fischer
6f182f04d6 am 3a96b102: (-s ours) am 3c46b110: Import translations. DO NOT MERGE 
* commit '3a96b102117b6118f031ddf60beb50f3050be743':
  Import translations. DO NOT MERGE
 2012-06-21 16:47:42 -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
df01dcbe07 Merge "Import translations. DO NOT MERGE" 2012-06-21 15:43:46 -07:00
Eric Fischer
bb50970808 Import translations. DO NOT MERGE 
Change-Id: I324b2d81491c93cf6ff5b91bb3e5ebbc935fa65c
 2012-06-21 15:07:31 -07:00
Eric Fischer
3c46b11039 Import translations. DO NOT MERGE 
Change-Id: I77226bb57376204d2b55012c3be037a6f05be228
 2012-06-21 15:04:08 -07:00
Eric Fischer
c9973ea862 am 4bc59c70: (-s ours) am f776a738: Import translations. DO NOT MERGE 
* commit '4bc59c70060ecf10a6bfc79f348ae7255765a61c':
  Import translations. DO NOT MERGE
 2012-06-21 12:03:44 -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
2fdf6765be Import translations. DO NOT MERGE 
Change-Id: I205f13efebfa6afae7a9c38dec8b16a3c4971f93
 2012-06-20 21:15:02 -07:00
Eric Fischer
f776a738fa Import translations. DO NOT MERGE 
Change-Id: I8d15ef5cb523bdc7f68216a7d465dcb7b9152477
 2012-06-20 21:12:09 -07:00
Amith Yamasani
40db09f23f am 66b0ad57: am 9938ac8a: Merge "Fix incorrect updating of headers in Settings" into jb-dev 
* commit '66b0ad5793ec329f756eb87b233f420697801539':
  Fix incorrect updating of headers in Settings
 2012-06-20 15:51:14 -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
ef9f4854a6 am a104564d: (-s ours) am 679948df: Import translations. DO NOT MERGE 
* commit 'a104564d9d3b378caebe1f7a7ea26a5a1ee6ccdc':
  Import translations. DO NOT MERGE
 2012-06-20 14:51:49 -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
1d8c744f1f Import translations. DO NOT MERGE 
Change-Id: I3be9db85a08ed44c5559348bdc36468310077326
 2012-06-20 13:57:24 -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
19dfd417a0 am dc66c953: Reconcile with jb-release 
* commit 'dc66c953c3551f6df89389cb2f47b14edfd7d5b7':
 2012-06-20 08:31:45 -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
90b3a16911 am 1b4a9b41: am 5739d4fe: Merge "Use string resources instead of literals for backup password confirmations" into jb-dev 
* commit '1b4a9b4107c1d6ba5b2ecf5657865acc24a28686':
  Use string resources instead of literals for backup password confirmations
 2012-06-19 16:36:24 -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
4e93832a10 am e5d2b8b8: (-s ours) am f4a4119e: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit 'e5d2b8b8ab0d9968c976f584917481f46995f65c':
  Import translations. DO NOT MERGE
 2012-06-19 16:28:33 -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
ce9bba2adb Merge "Import translations. DO NOT MERGE" 2012-06-19 16:23:45 -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
Eric Fischer
76d6e2310d Import translations. DO NOT MERGE 
Change-Id: If94d32af0adb4eb24b5ff10f3555fd2b7cd0fdd2
 2012-06-19 16:04:37 -07:00
Amith Yamasani
b9d64539b2 am f62df931: am 8e1981cc: Merge "Show full summary for network location sercice even for wifi-only devices" into jb-dev 
* commit 'f62df931faefaece80059af39742f123e8d7f4e9':
  Show full summary for network location sercice even for wifi-only devices
 2012-06-19 16:03:33 -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
0f734f8ee2 am 21fbab8d: Reconcile with jb-release 
* commit '21fbab8d3195b3accc70bfbd68a38b94ce8dd497':
 2012-06-19 07:20:39 -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
e5f002f651 am ab1ae4c7: Reconcile with jb-release 
* commit 'ab1ae4c7c6a00acf922bbb9520b0cec881079163':
 2012-06-19 06:16:13 -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
e9f37316ab am 922eed65: (-s ours) am fae5978e: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit '922eed658a954c35cb3bef6f8986f7ac4f9451c5':
  Import translations. DO NOT MERGE
 2012-06-18 14:55:09 -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
ac9c4c24f8 Merge "Import translations. DO NOT MERGE" 2012-06-18 14:51:13 -07:00
Ying Wang
ce670cbe91 Import translations. DO NOT MERGE 
Change-Id: I899bf73fbcdeb84593fafd2b29953577034458e5
 2012-06-18 14:44:02 -07:00
Ying Wang
be4ac92791 Import translations. DO NOT MERGE 
Change-Id: I8ba16c5a7895850d429ae355bf2c27e384bb248e
 2012-06-18 14:40:20 -07:00
Jim Miller
c14422ce96 am 4a3435f8: am 284c9872: Merge "Fix 6663465: remove flagNoEnterAction in favor of actionNext" into jb-dev 
* commit '4a3435f86ee0dda6b824810ce439509cb61a8721':
  Fix 6663465: remove flagNoEnterAction in favor of actionNext
 2012-06-18 13:23:25 -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
29c749b653 am 2027328c: am 4d8dac07: Merge "Implement issue #6633077: Improve permissions display for..." into jb-dev 
* commit '2027328c7bca44ff6a0dc8c2ff64a8af052f4ea2':
  Implement issue #6633077: Improve permissions display for...
 2012-06-18 10:52:33 -07:00