Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,299 Commits 1 Branch 0 Tags
ccefcbebe0dd67b124ed7132dc40fa02b62dec06
Commit Graph

2669 Commits

Author SHA1 Message Date
Ying Wang
739b81abfa Import translations. DO NOT MERGE 
Change-Id: I91f57e5dbf11a05e21b5c9f90cc8b3fb000ceaab
Auto-generated-cl: translation import
 2012-07-16 13:01:22 -07:00
Dianne Hackborn
98f5024f2f am b2a16b92: am ea819b07: Merge "Implement issue #6819955: Add button to take bug report." into jb-dev 
* commit 'b2a16b9202f6daa609d152ffc2fd273088fbb1ac':
  Implement issue #6819955: Add button to take bug report.
 2012-07-13 17:54:45 -07:00
Dianne Hackborn
b2a16b9202 am ea819b07: Merge "Implement issue #6819955: Add button to take bug report." into jb-dev 
* commit 'ea819b07fa9e17fcd17e0384626ee6a47bc0ecd6':
  Implement issue #6819955: Add button to take bug report.
 2012-07-13 17:06:00 -07:00
Dianne Hackborn
ea819b07fa Merge "Implement issue #6819955: Add button to take bug report." into jb-dev 2012-07-13 17:03:43 -07:00
Dianne Hackborn
fd8c315573 Implement issue #6819955: Add button to take bug report. 
Change-Id: Ic615180121d4db52f92aa8264d95d790de5fff9d
 2012-07-13 16:10:16 -07:00
Ying Wang
fc567c2665 am 4b25c5ad: Import translations. DO NOT MERGE 
* commit '4b25c5ad8236feab94956d4626fe5c1409e5b989':
  Import translations. DO NOT MERGE
 2012-07-13 13:51:57 -07:00
Ying Wang
b47e427f72 Import translations. DO NOT MERGE 
Change-Id: I25f8e8923c50377df9a517538e6b76bafac4af9a
Auto-generated-cl: translation import
 2012-07-13 13:12:21 -07:00
Ying Wang
4b25c5ad82 Import translations. DO NOT MERGE 
Change-Id: I8959d6559f2a47b296216d6fb9817765e87588e5
Auto-generated-cl: translation import
 2012-07-13 13:09:18 -07:00
John Wang
022fa6c51a am e8b25302: am b0b45c02: Display FCC id for LTE in Settings. 
* commit 'e8b2530260abc74e570ae266b49bade240f14913':
  Display FCC id for LTE in Settings.
 2012-07-12 15:07:45 -07:00
Ying Wang
a0a480ad04 am 62acae4f: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit '62acae4f85c937e2f0a883a47b2819f122b84675':
  Import translations. DO NOT MERGE
 2012-07-12 14:29:15 -07:00
John Wang
e8b2530260 am b0b45c02: Display FCC id for LTE in Settings. 
* commit 'b0b45c02ec73c87f78a8358a7e98747bd96ec103':
  Display FCC id for LTE in Settings.
 2012-07-12 14:29:13 -07:00
Ying Wang
62acae4f85 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-07-12 14:25:51 -07:00
Ying Wang
f10b383702 Import translations. DO NOT MERGE 
Change-Id: I7e9254f65e3c315c5f60414d1ac209622634ec36
Auto-generated-cl: translation import
 2012-07-12 13:18:58 -07:00
Ying Wang
51f13809a9 Import translations. DO NOT MERGE 
Change-Id: Id2c66f1ef1fbb1333fd1b6cea90839d2d0371006
Auto-generated-cl: translation import
 2012-07-12 13:15:15 -07:00
John Wang
b0b45c02ec Display FCC id for LTE in Settings. 
If ro.ril.fccid is set by RIL, display it at Settings -> About Tablet -> FCC Equipment ID.

bug:4965501
Change-Id: I920ab071bf1997c4fbf3ce81f88e24f512d004c3
 2012-07-11 16:50:32 -07:00
Ying Wang
2723ea66a9 Import translations. DO NOT MERGE 
Change-Id: Iba8d713f8a137400874a02e1741499fb7248937c
Auto-generated-cl: translation import
 2012-07-11 14:49:56 -07:00
Ying Wang
e9a717fb77 am efc229b3: Import translations. DO NOT MERGE 
* commit 'efc229b3c3c969eef1d32d62435741228b96aeb9':
  Import translations. DO NOT MERGE
 2012-07-10 14:23:12 -07:00
Ying Wang
dfc97385fe Import translations. DO NOT MERGE 
Change-Id: If2979386d0d62cd5077ab1b4225b600d49a88fb2
Auto-generated-cl: translation import
 2012-07-10 13:45:13 -07:00
Ying Wang
efc229b3c3 Import translations. DO NOT MERGE 
Change-Id: Ifb1aa8aba94ef321761769d8253dab6b5326b59e
Auto-generated-cl: translation import
 2012-07-10 13:42:00 -07:00
Ying Wang
5d950a8277 am 051619c0: Import translations. DO NOT MERGE 
* commit '051619c06338f776fd361c313b515c676fb74331':
  Import translations. DO NOT MERGE
 2012-07-09 14:01:43 -07:00
Ying Wang
af0aaa1239 Import translations. DO NOT MERGE 
Change-Id: Idf87c5d0c99bf4c9214b1d6a41ee19a9224b6f05
Auto-generated-cl: translation import
 2012-07-09 13:23:39 -07:00
Ying Wang
051619c063 Import translations. DO NOT MERGE 
Change-Id: I33c2d51c27d2942ddb00f11ad163406180fb1e17
Auto-generated-cl: translation import
 2012-07-09 13:20:45 -07:00
Ying Wang
51b2fef235 am 39aade5b: Import translations. DO NOT MERGE 
* commit '39aade5b4e6b134bbd3962dc14efc4a9571bb8ab':
  Import translations. DO NOT MERGE
 2012-07-03 14:56:07 -07:00
Ying Wang
1c9ce0dacd Merge "Import translations. DO NOT MERGE" 2012-07-03 14:51:45 -07:00
Ying Wang
574ebec978 Import translations. DO NOT MERGE 
Change-Id: I47f714a1547115d65d08bda8a681f052ebc16d77
Auto-generated-cl: translation import
 2012-07-03 13:44:53 -07:00
Ying Wang
39aade5b4e Import translations. DO NOT MERGE 
Change-Id: I1634d69f5cdd74a0c33cc4796a1a17e89376a1e3
Auto-generated-cl: translation import
 2012-07-03 13:41:30 -07:00
Irfan Sheriff
13cfaecc12 am 51cc655c: am 2fad853b: Merge "Limit length of SSID input string to 32" 
* commit '51cc655ccdb8c78759095c709967a2185f2f61d8':
  Limit length of SSID input string to 32
 2012-07-03 12:23:23 -07:00
Irfan Sheriff
5cf05f1081 am 7c8363eb: am d80ff0a4: Merge "wifi: update text displayed during hotspot on/off" 
* commit '7c8363eb11b61f712e982b161a2267c2731df6fa':
  wifi: update text displayed during hotspot on/off
 2012-07-03 12:23:21 -07:00
Irfan Sheriff
51cc655ccd am 2fad853b: Merge "Limit length of SSID input string to 32" 
* commit '2fad853bf7282676ee3f2ec87630de5fdbcb236b':
  Limit length of SSID input string to 32
 2012-07-03 12:18:35 -07:00
Irfan Sheriff
7c8363eb11 am d80ff0a4: Merge "wifi: update text displayed during hotspot on/off" 
* commit 'd80ff0a4d615bd6f037483bf9dc2b10887d9507f':
  wifi: update text displayed during hotspot on/off
 2012-07-03 12:18:33 -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
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
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
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
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
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
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
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
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