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

7406 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
Irfan Sheriff
2fad853bf7 Merge "Limit length of SSID input string to 32" 2012-07-03 11:35:44 -07:00
Irfan Sheriff
d80ff0a4d6 Merge "wifi: update text displayed during hotspot on/off" 2012-07-03 11:30:05 -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
f91428832d Merge "Import translations. DO NOT MERGE" 2012-07-02 14:57:34 -07:00
Eric Fischer
952bdfad63 am 23513ea5: (-s ours) am a1146f83: Import translations. DO NOT MERGE 
* commit '23513ea53e7d0813987471b56b434186e561b30a':
  Import translations. DO NOT MERGE
 2012-07-02 14:40:15 -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
76ecc313bb Import translations. DO NOT MERGE 
Change-Id: Ie0a0c287cdf412aebf43d610b9e309cd32f68b16
Auto-generated-cl: translation import
 2012-07-02 13:58:53 -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
4820298bf3 am d15183a9: (-s ours) am 9ca616e4: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit 'd15183a971590ca0e32bc78c8ed2a3470009fbae':
  Import translations. DO NOT MERGE
 2012-06-29 18:02:44 -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
2e943441c2 Merge "Import translations. DO NOT MERGE" 2012-06-29 17:55:02 -07:00
Ying Wang
9ca616e425 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-06-29 17:54:50 -07:00
Dianne Hackborn
3d3d4c891b am d601be8f: am 313ab172: Fix issue #6761130: Clearing app data in settings does not clear app\'s USB storage 
* commit 'd601be8f945833ea95e6aaae769efb8ed26d964a':
  Fix issue #6761130: Clearing app data in settings does not clear app's USB storage
 2012-06-29 15:47:09 -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
8d7cfd2140 Import translations. DO NOT MERGE 
Change-Id: I16afd7e6e7465bbd23cb0d2076bc13a9edffcd59
Auto-generated-cl: translation import
 2012-06-29 13:22:37 -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
f6f81b3e89 am 4aa42e2e: Reconcile with jb-release 
* commit '4aa42e2ea1789baea784e642e78db526b6ae24ab':
 2012-06-29 08:19:33 -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
0d03b7885e am 1f1b9abd: am beb3d8b1: Merge "Fix Settings NPE" into jb-dev 
* commit '1f1b9abd0059bf7873e9a54288dc61d43ec39284':
  Fix Settings NPE
 2012-06-28 16:59:01 -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
159263f86c am c70bec44: (-s ours) am 3cc385b8: Import translations. DO NOT MERGE 
* commit 'c70bec4454e612b3013c075a5eb6e77346fc298b':
  Import translations. DO NOT MERGE
 2012-06-28 14:30:26 -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
56071f286b Import translations. DO NOT MERGE 
Change-Id: Ib511e1cdf515c855ea235886b6c801a902136ba4
Auto-generated-cl: translation import
 2012-06-28 12:54:07 -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
1ad279c67f am ebf032df: (-s ours) am c812fe4c: Import translations. DO NOT MERGE 
* commit 'ebf032dff98ad50163f2553f23a333f497041df3':
  Import translations. DO NOT MERGE
 2012-06-27 17:24:33 -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
1b92e714bb Import translations. DO NOT MERGE 
Change-Id: I9a59e4f258f041a175e9fd05a60da9c21daabf40
 2012-06-27 16:22:44 -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
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