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

7322 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ying Wang
c812fe4c0e Import translations. DO NOT MERGE 
Change-Id: I5c769ea97c25696684c6818bfb84c95d30689b22
 2012-06-27 16:19:29 -07:00
The Android Automerger
fa7c79892a merge in jb-release history after reset to jb-dev 2012-06-26 11:11:58 -07:00
Jake Hamby
9cc7ca2996 resolved conflicts for merge of 8f12b128 to master 
Change-Id: I35552dafc1fc7f128726504ea97b5c3e446ac0df
 2012-06-25 18:14:06 -07:00
Jake Hamby
8f12b1287f am f59dd9d6: Merge "Add menu item to Settings to go to Cell Broadcast settings." into jb-dev 
* commit 'f59dd9d67e269a81c684ecd641e514aba8d2330a':
  Add menu item to Settings to go to Cell Broadcast settings.
 2012-06-25 16:21:18 -07:00
Jake Hamby
f59dd9d67e Merge "Add menu item to Settings to go to Cell Broadcast settings." into jb-dev 2012-06-25 16:19:23 -07:00
Eric Fischer
d6fd8d5e5b am b12cc810: (-s ours) am 40b78280: Import translations. DO NOT MERGE 
* commit 'b12cc8107dcbd84dd935768307b61ff5b3c4705e':
  Import translations. DO NOT MERGE
 2012-06-25 13:36:50 -07:00
Eric Fischer
b12cc8107d am 40b78280: Import translations. DO NOT MERGE 
* commit '40b78280eb0c93d9ee3918813cfabf93a2919f35':
  Import translations. DO NOT MERGE
 2012-06-25 13:34:20 -07:00
Jake Hamby
ef57ed71bf Add menu item to Settings to go to Cell Broadcast settings. 
Add menu item to Settings when "config_cellBroadcastAppLinks"
config option is set to true to jump to the Cell Broadcast app
settings activity. This enables the Cell Broadcast launcher
icon to be removed, while still allowing access to the app
(by adding a similar menu item to the MMS app) and its settings
activity (this settings link).

The menu item will not be added if the CellBroadcastReceiver
package is disabled or not installed.

Bug: 6709985
Change-Id: If3a3016ceea70704790964c0b712c31cb38f7b62
 2012-06-25 13:20:45 -07:00
Eric Fischer
5196b5bf1e Import translations. DO NOT MERGE 
Change-Id: I2f51f7f30deeb640e4303810c1ad5ef277f5fdb4
 2012-06-25 13:03:28 -07:00
Eric Fischer
40b78280eb Import translations. DO NOT MERGE 
Change-Id: Ic94e1bba24f847df6b65c46539bb2de12e8ab38b
 2012-06-25 13:00:04 -07:00
The Android Open Source Project
0ed6f63c2d am a5581a1b: Reconcile with jb-release 
* commit 'a5581a1b6a313af1672b647e39729feb04830d53':
 2012-06-25 08:00:20 -07:00
The Android Open Source Project
a5581a1b6a Reconcile with jb-release 
Change-Id: Ib43ec64c9827ceb6956e4f86dcc9439e8a433e16
 2012-06-25 07:57:38 -07:00
Ying Wang
f6a3aed1f5 am 7a1a575b: (-s ours) am d7e8025f: Import translations. DO NOT MERGE 
* commit '7a1a575b74b829db940a3f26a1a1bb3040d50654':
  Import translations. DO NOT MERGE
 2012-06-23 05:39:14 -07:00
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
1c19b382bc Import translations. DO NOT MERGE 
Change-Id: Ib1d5a9d10d1aef1e6631d216bb180c86734ebbe8
 2012-06-22 15:11:10 -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
75826a3c7b am d88734ab: Reconcile with jb-release 
* commit 'd88734ab4dab58db74c83182ddd2b2077e4d77a5':
 2012-06-22 08:20:20 -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
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