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

6964 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Open Source Project
df833bea37 Reconcile with jb-release 
Change-Id: I80999c1ca708772a1483e03093144b53b60e5c1e
 2012-07-03 12:12:16 -07:00
The Android Automerger
e413019654 merge in jb-release history after reset to jb-dev 2012-07-02 16:21:14 -07:00
Eric Fischer
23513ea53e am a1146f83: Import translations. DO NOT MERGE 
* commit 'a1146f83a985ce613145ae1e89b9e7311906a3b7':
  Import translations. DO NOT MERGE
 2012-07-02 14:37:15 -07:00
Eric Fischer
a1146f83a9 Import translations. DO NOT MERGE 
Change-Id: Ic3255b6b87db2a3b98fd3b41e4ab0ef24d67e292
Auto-generated-cl: translation import
 2012-07-02 13:55:16 -07:00
The Android Automerger
2150577ad4 merge in jb-release history after reset to jb-dev 2012-07-02 12:57:04 -07:00
Ying Wang
d15183a971 am 9ca616e4: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit '9ca616e42520ff12de921b8c301ef4cf7cb6c95a':
  Import translations. DO NOT MERGE
 2012-06-29 17:59:04 -07:00
Ying Wang
9ca616e425 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-06-29 17:54:50 -07:00
Dianne Hackborn
d601be8f94 am 313ab172: Fix issue #6761130: Clearing app data in settings does not clear app\'s USB storage 
* commit '313ab1727014d535790bc89afdcf725ff936e5b4':
  Fix issue #6761130: Clearing app data in settings does not clear app's USB storage
 2012-06-29 15:43:34 -07:00
Dianne Hackborn
313ab17270 Fix issue #6761130: Clearing app data in settings does not clear app's USB storage 
The installed app details was not correctly distinguishing between cache and
normal data on external storage.  The cache files on external storage are now
correctly shown in the cache section, since those are what get deleted when
you hit the clear cache button.

Change-Id: Id98bdb7fb5202d6a092fe5a772638eeb6aed2b47
 2012-06-29 15:01:23 -07:00
Ying Wang
92b47c3690 Import translations. DO NOT MERGE 
Change-Id: Ic81c64b7405a6de52473a90f61d58242779c8bf5
Auto-generated-cl: translation import
 2012-06-29 13:19:19 -07:00
The Android Open Source Project
4aa42e2ea1 Reconcile with jb-release 
Change-Id: Idef831103e3ee313ae771483241391f90f5feafb
 2012-06-29 08:14:15 -07:00
The Android Automerger
f2dbd0fa9d merge in jb-release history after reset to jb-dev 2012-06-28 17:11:24 -07:00
Brian Muramatsu
1f1b9abd00 am beb3d8b1: Merge "Fix Settings NPE" into jb-dev 
* commit 'beb3d8b1e06f26c20adc4d4db7a08ac507ad6ab0':
  Fix Settings NPE
 2012-06-28 16:56:29 -07:00
Brian Muramatsu
beb3d8b1e0 Merge "Fix Settings NPE" into jb-dev 2012-06-28 16:53:47 -07:00
Eric Fischer
c70bec4454 am 3cc385b8: Import translations. DO NOT MERGE 
* commit '3cc385b83ca0f2c5e7a6b8464604ec3eb613f235':
  Import translations. DO NOT MERGE
 2012-06-28 14:27:32 -07:00
Brian Muramatsu
c28af52e59 Fix Settings NPE 
Labels for account types can be null which causes a NPE to occur in
Settings. If the label is null, don't bother adding an account
header. If we don't do this, then it would blow up when trying to
sort the headers anyway, so this change will fix the crash.

Bug 6727947

Change-Id: I284d7204b6d21c8d1b0a36e18ecae2c2361eeb84
 2012-06-28 14:25:14 -07:00
Eric Fischer
3cc385b83c Import translations. DO NOT MERGE 
Change-Id: If4dd46dc84b974aabefe57aefb43de4329396c51
Auto-generated-cl: translation import
 2012-06-28 12:51:19 -07:00
The Android Automerger
aa6707ae41 merge in jb-release history after reset to jb-dev 2012-06-28 07:04:34 -07:00
Ying Wang
ebf032dff9 am c812fe4c: Import translations. DO NOT MERGE 
* commit 'c812fe4c0e989fcea906a6dda7c88a55076cd50d':
  Import translations. DO NOT MERGE
 2012-06-27 17:21:34 -07:00
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
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
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
40b78280eb Import translations. DO NOT MERGE 
Change-Id: Ic94e1bba24f847df6b65c46539bb2de12e8ab38b
 2012-06-25 13:00:04 -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
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