PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,061 Commits 1 Branch 0 Tags
ae8d5bdc5bfabb457135dbe9c30084bffdc16a7c
Commit Graph

10061 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Sharkey
1d6bf8d46b Follow API changes. 
Bug: 7333397
Change-Id: I72a27dbe02be376ec1c781955e930e87ea59b5a0
 2012-12-11 09:51:02 -08:00
Baligh Uddin
08f1fac1ec am 5c806da4: (-s ours) am 777688c9: am 67e9e59b: Import translations. DO NOT MERGE 
* commit '5c806da40c1c3af53d5a777512b67bdb24bb690c':
  Import translations. DO NOT MERGE
 2012-12-10 21:16:16 -08:00
Baligh Uddin
5c806da40c am 777688c9: am 67e9e59b: Import translations. DO NOT MERGE 
* commit '777688c9638efab8681453889a3d7917b4a52634':
  Import translations. DO NOT MERGE
 2012-12-10 21:14:56 -08:00
Baligh Uddin
40a7b0380a am e17335e9: (-s ours) am 3b10f0ba: Import translations. DO NOT MERGE 
* commit 'e17335e98267b856822499315b9a66aacf1c2f69':
  Import translations. DO NOT MERGE
 2012-12-10 21:14:49 -08:00
Baligh Uddin
777688c963 am 67e9e59b: Import translations. DO NOT MERGE 
* commit '67e9e59bc943481b091998ba114ca6750f46b383':
  Import translations. DO NOT MERGE
 2012-12-10 21:12:41 -08:00
Baligh Uddin
e17335e982 am 3b10f0ba: Import translations. DO NOT MERGE 
* commit '3b10f0ba055fce7b8893897e88405bff0fb66fca':
  Import translations. DO NOT MERGE
 2012-12-10 21:12:02 -08:00
Baligh Uddin
87abc01ed9 Merge "Import translations. DO NOT MERGE" 2012-12-10 21:10:32 -08:00
The Android Open Source Project
136e104357 am c9b5f99c: (-s ours) Reconcile with jb-mr1.1-release - do not merge 
* commit 'c9b5f99c1d1404b02b123771357be32430363ba2':
 2012-12-10 15:23:15 -08:00
The Android Open Source Project
c9b5f99c1d Reconcile with jb-mr1.1-release - do not merge 
Change-Id: I9438d179ff8a407f87b5b501d4ea1d006f2fb77c
 2012-12-10 15:19:47 -08:00
Baligh Uddin
89c15bda8c Import translations. DO NOT MERGE 
Change-Id: I7a79e2be8d71ac1a06ec243207fa473ad960d2cb
Auto-generated-cl: translation import
 2012-12-10 10:59:51 -08:00
Baligh Uddin
67e9e59bc9 Import translations. DO NOT MERGE 
Change-Id: I5d16be7510affd0f6e453fe42ecf833c680313e5
Auto-generated-cl: translation import
 2012-12-10 10:57:09 -08:00
Baligh Uddin
3b10f0ba05 Import translations. DO NOT MERGE 
Change-Id: I1f403d01d8d3d7336d869555e69af22b460f7a37
Auto-generated-cl: translation import
 2012-12-10 10:55:55 -08:00
Elliott Hughes
ff8da7a11a am 68066a78: am e2d893e2: Merge "Makes the add button for new APNs appear in the action bar." 
* commit '68066a78352ea6b147767e84a5481764f0054f2b':
  Makes the add button for new APNs appear in the action bar.
 2012-12-08 10:59:12 -08:00
Elliott Hughes
68066a7835 am e2d893e2: Merge "Makes the add button for new APNs appear in the action bar." 
* commit 'e2d893e2af36e4ede8d1ec074912563ae6ecf7ef':
  Makes the add button for new APNs appear in the action bar.
 2012-12-08 10:57:51 -08:00
Elliott Hughes
e2d893e2af Merge "Makes the add button for new APNs appear in the action bar." 2012-12-08 09:55:09 -08:00
Amith Yamasani
daa01321b3 Merge "Don't do the developer options countdown for secondary users." 2012-12-07 14:20:16 -08:00
Amith Yamasani
b02b26e3cb Don't do the developer options countdown for secondary users. 
Bug: 7469031
Change-Id: I794cb8b67a9221cc4fcd2dd6208777648c818fe0
 2012-12-07 14:18:28 -08:00
The Android Automerger
5fb06075df merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-12-07 13:26:24 -08:00
Wink Saville
902f806aa3 am 4e0391a7: am 49c4de7f: Merge "Format change at "Mobile network type" value" 
* commit '4e0391a733a3c5ba0c23c00c165aeb580426cee1':
  Format change at "Mobile network type" value
 2012-12-07 12:21:45 -08:00
Wink Saville
4e0391a733 am 49c4de7f: Merge "Format change at "Mobile network type" value" 
* commit '49c4de7f139a1a3a60dc8f7e72acae710dba506f':
  Format change at "Mobile network type" value
 2012-12-07 12:18:53 -08:00
Baligh Uddin
3728d239b0 am f1eb2f44: (-s ours) am 957f7fc9: am 3674d869: Import translations. DO NOT MERGE 
* commit 'f1eb2f4498ce6e10c3b72c3a3cb47a80eba1959e':
  Import translations. DO NOT MERGE
 2012-12-07 11:48:10 -08:00
Baligh Uddin
8a84fa6ec9 Merge "Import translations. DO NOT MERGE" 2012-12-07 11:47:42 -08:00
Baligh Uddin
8d8f6b0860 am 4377b807: (-s ours) am 29ce5561: Import translations. DO NOT MERGE 
* commit '4377b80732d89ba10211ceff206517cf3c9ca875':
  Import translations. DO NOT MERGE
 2012-12-07 11:46:45 -08:00
Baligh Uddin
f1eb2f4498 am 957f7fc9: am 3674d869: Import translations. DO NOT MERGE 
* commit '957f7fc94eaab5d57d82c76a3a06acd0ab2dc018':
  Import translations. DO NOT MERGE
 2012-12-07 11:45:54 -08:00
Baligh Uddin
4377b80732 am 29ce5561: Import translations. DO NOT MERGE 
* commit '29ce5561d85c121c293acc13b60a291365679a46':
  Import translations. DO NOT MERGE
 2012-12-07 11:44:30 -08:00
Baligh Uddin
957f7fc94e am 3674d869: Import translations. DO NOT MERGE 
* commit '3674d8695166be6c0b7cc225f227f9e1604056e8':
  Import translations. DO NOT MERGE
 2012-12-07 11:44:18 -08:00
Baligh Uddin
b0d0cf8e49 Import translations. DO NOT MERGE 
Change-Id: I7b1104d9f823970bc78cbd8681c67b300057f61b
Auto-generated-cl: translation import
 2012-12-07 11:38:03 -08:00
Baligh Uddin
3674d86951 Import translations. DO NOT MERGE 
Change-Id: I0958247f9b14b944fb0bdc04517e65aabba166c1
Auto-generated-cl: translation import
 2012-12-07 11:35:18 -08:00
Baligh Uddin
29ce5561d8 Import translations. DO NOT MERGE 
Change-Id: Ic8bff7a52926a927353fa5933a68dfc17921e6d1
Auto-generated-cl: translation import
 2012-12-07 11:34:10 -08:00
Amith Yamasani
acf7a1873e am b722b80d: am b7d94e74: am aeb57eda: Pass the locale code in the help url for help pages. 
* commit 'b722b80da8481a1570dbe4be89b8ed70daec6b41':
  Pass the locale code in the help url for help pages.
 2012-12-07 10:47:45 -08:00
Amith Yamasani
b722b80da8 am b7d94e74: am aeb57eda: Pass the locale code in the help url for help pages. 
* commit 'b7d94e74e1342c5583883e596fd268745a5a25b6':
  Pass the locale code in the help url for help pages.
 2012-12-07 10:45:30 -08:00
Amith Yamasani
b7d94e74e1 am aeb57eda: Pass the locale code in the help url for help pages. 
* commit 'aeb57edaef1abdcdcd21eb443047386940ffb755':
  Pass the locale code in the help url for help pages.
 2012-12-07 10:43:37 -08:00
Amith Yamasani
aeb57edaef Pass the locale code in the help url for help pages. 
Otherwise the help will always be shown in English.

Bug: 7564049
Change-Id: I94da36aa1ae5aabd118178866b7e570bb77add34
 2012-12-06 14:40:51 -08:00
Wink Saville
49c4de7f13 Merge "Format change at "Mobile network type" value" 2012-12-06 08:51:22 -08:00
Akira Oshimi
1fd3544c55 Format change at "Mobile network type" value 
Remove "network type Number" from "mobile network type" value
at "About Phone > Status".

For example value "UNKNOWN:0" became "UNKNOWN"
(if value is "UNKNOWN", the word is localized)

The number ":0" did not add much value to the user.

Change-Id: Iee29fa2ab42f2d6eab5d9dbd6f647087ee382648
 2012-12-06 09:52:55 +01:00
The Android Open Source Project
96e08d1961 am 1aa371fc: (-s ours) Reconcile with jb-mr1.1-release - do not merge 
* commit '1aa371fcaf8ddec7fbd4368bd13420eaf3e5b1b6':
 2012-12-05 13:01:02 -08:00
Jake Hamby
a87df26fc2 am ac9bb0bd: am b39ab37a: am bc5d9271: Add latest area info broadcast to Settings status screen. 
* commit 'ac9bb0bdc0c2ef42d259e555187061a0ea95c8f2':
  Add latest area info broadcast to Settings status screen.
 2012-12-05 12:29:03 -08:00
Baligh Uddin
6d797213de am e912b763: (-s ours) am e30adf2f: am d2bd59f5: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 
* commit 'e912b763ee9e631129512162c3e934aaf4bc1e91':
  Import translations. DO NOT MERGE
 2012-12-05 12:23:11 -08:00
The Android Open Source Project
1aa371fcaf Reconcile with jb-mr1.1-release - do not merge 
Change-Id: I2333de9f3a171fef3c806003d0e662570d01af1e
 2012-12-05 11:10:16 -08:00
The Android Automerger
5ca8e96df4 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-12-05 10:27:58 -08:00
Baligh Uddin
67580f655a am 482dd21c: (-s ours) am 9a2cee1d: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit '482dd21ca2ccd350957dba3cf7d207a8533a9bdf':
  Import translations. DO NOT MERGE
 2012-12-05 08:25:27 -08:00
Jake Hamby
ac9bb0bdc0 am b39ab37a: am bc5d9271: Add latest area info broadcast to Settings status screen. 
* commit 'b39ab37aa0e8be02a61c4245c181e523419ba703':
  Add latest area info broadcast to Settings status screen.
 2012-12-04 20:09:34 -08:00
Jake Hamby
b39ab37aa0 am bc5d9271: Add latest area info broadcast to Settings status screen. 
* commit 'bc5d9271a9d36ecf07ac35e1635f36679074de6f':
  Add latest area info broadcast to Settings status screen.
 2012-12-04 20:08:21 -08:00
The Android Automerger
11efd544bf merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-12-04 19:59:27 -08:00
Jake Hamby
bc5d9271a9 Add latest area info broadcast to Settings status screen. 
When the SIM has a Brazilian country code, add an item to the
status screen to show the most recently received area info cell
broadcast, requested from CellBroadcastReceiver, which also
broadcasts any updates to the area info. To read the area info
broadcast or request it from CellBroadcastReceiver requires
READ_PHONE_STATE permission.

Bug: 7445881
Change-Id: I387e23ecd0802b212ecb3e44f900a3a7a4b27e76
 2012-12-04 18:18:55 -08:00
Baligh Uddin
e912b763ee am e30adf2f: am d2bd59f5: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 
* commit 'e30adf2f65241b6337dc4090631673a2fec904e1':
  Import translations. DO NOT MERGE
 2012-12-04 16:34:48 -08:00
Baligh Uddin
e30adf2f65 am d2bd59f5: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 
* commit 'd2bd59f5e8e2359e6697dd8975ccfd1aa36b4103':
  Import translations. DO NOT MERGE
 2012-12-04 16:31:30 -08:00
Baligh Uddin
482dd21ca2 am 9a2cee1d: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit '9a2cee1d1e391147b3e21d10549b190ba79c4199':
  Import translations. DO NOT MERGE
 2012-12-04 13:49:33 -08:00
Baligh Uddin
9a2cee1d1e Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-12-04 13:47:16 -08:00
Baligh Uddin
d2bd59f5e8 Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 2012-12-04 13:46:56 -08:00