OSDN Git Service
Irfan Sheriff [Tue, 5 Mar 2013 19:08:15 +0000 (19:08 +0000)]
Merge "Fix not updating error message when authentication fails"
Jaewan Kim [Thu, 28 Feb 2013 11:50:21 +0000 (20:50 +0900)]
Fix not updating error message when authentication fails
If attempt to configure the first network fails, AccessPoints fails to
update error message because it only checks the error code if it is not
active.
With this change, user may see saved network message for a second
because SupplicantStateTracker retries on authentication failure so
intermediate status is displayed between each trial.
Bug:
8284024
Change-Id: I8b976b03878e27e46726ee8a176f131115b7a409
Wink Saville [Wed, 20 Feb 2013 23:07:59 +0000 (23:07 +0000)]
Merge "avoid stopping app in case of accessing empty db"
Amith Yamasani [Wed, 20 Feb 2013 16:57:49 +0000 (16:57 +0000)]
Merge "Prevent cursor from causing global reference leaks."
Irfan Sheriff [Fri, 15 Feb 2013 23:42:50 +0000 (23:42 +0000)]
Merge changes If41fad5f,I9c860569,I2e3e8d4d,If65c4029
* changes:
Use updated enterprise API
Fix EAP field display for a new network
Allow only valid EAP configs
Update enterprise API usage
Irfan Sheriff [Mon, 11 Feb 2013 23:55:31 +0000 (15:55 -0800)]
Use updated enterprise API
Change-Id: If41fad5fae5864555bb1de3fc99130682b1cdff1
Irfan Sheriff [Wed, 6 Feb 2013 18:51:13 +0000 (10:51 -0800)]
Fix EAP field display for a new network
We now hide certain EAP fields based on the type chosen. For a
new network, we should set a default and handle this the same
way
Change-Id: I9c8605694ba51bc588a49f711dcf31517ea3f6e4
Irfan Sheriff [Thu, 17 Jan 2013 17:47:45 +0000 (09:47 -0800)]
Allow only valid EAP configs
We allow configuring all possible EAP fields today even though
some of the configs make no sense and will not result in a
successful connection.
Allow only support configs for various EAP methods
Change-Id: I2e3e8d4d6203acb2eac8cd645df39e1a9ca579ab
Irfan Sheriff [Fri, 11 Jan 2013 22:12:54 +0000 (14:12 -0800)]
Update enterprise API usage
Also, remove the unnecessary keystore lock/unlock checks since these
are now controlled at lockscreen
Change-Id: If65c4029d4cf2b8377fbc3512c9f691572125995
Amith Yamasani [Fri, 15 Feb 2013 17:15:41 +0000 (17:15 +0000)]
Merge "Fix Settings app crash after enabled multi-user"
Hyejin Kim [Thu, 14 Feb 2013 06:49:19 +0000 (15:49 +0900)]
avoid stopping app in case of accessing empty db
When accessing empty database, Setting App is stopped, sometimes.
To avoid stopping app, check null for cursor
Change-Id: I71ec067f502d12a9215a9abdbe9e23fc07af17bb
Kenny Root [Thu, 14 Feb 2013 20:18:11 +0000 (20:18 +0000)]
Merge "KeyStore: stop using state()"
Kenny Root [Thu, 14 Feb 2013 18:27:22 +0000 (10:27 -0800)]
KeyStore: stop using state()
Change-Id: Ia8fc945666c59c0b9a9bd6f890cc2a6b8859e1d4
Irfan Sheriff [Wed, 6 Feb 2013 19:16:24 +0000 (11:16 -0800)]
am
414d9e9c: Merge "P2PSetting:Avoid p2p_find on group removal event"
# By sunil duttu
# Via Gerrit Code Review (1) and sunil duttu (1)
* commit '
414d9e9c6928581d4f91b008c109a6a4630bfaae':
P2PSetting:Avoid p2p_find on group removal event
Irfan Sheriff [Wed, 6 Feb 2013 18:13:59 +0000 (18:13 +0000)]
Merge "P2PSetting:Avoid p2p_find on group removal event"
sunil duttu [Wed, 6 Feb 2013 07:13:54 +0000 (12:43 +0530)]
P2PSetting:Avoid p2p_find on group removal event
Immediately after group termination p2p_find is being issued
from settings and this causing issue whenever user sends
connection request immediately after group_removal_event.
Change-Id: I41e5f520f7d9475d0ec890d40eea172d9d66d06e
Irfan Sheriff [Wed, 6 Feb 2013 16:58:31 +0000 (08:58 -0800)]
am
203631b2: Merge "wifiSettings: Updating the networkinfo on supplicant event"
# By sunil duttu
# Via Gerrit Code Review (1) and sunil duttu (1)
* commit '
203631b24cd3947bcba2ab24789e4cfec487eff7':
wifiSettings: Updating the networkinfo on supplicant event
Irfan Sheriff [Wed, 6 Feb 2013 16:42:45 +0000 (16:42 +0000)]
Merge "wifiSettings: Updating the networkinfo on supplicant event"
sunil duttu [Wed, 6 Feb 2013 05:42:03 +0000 (11:12 +0530)]
wifiSettings: Updating the networkinfo on supplicant event
In framework we update the networkId on supplicant state change
these changes in the network info should be reflected in settings.
there by updating the networkinfo.
The problem we are facing without this fix is when we have single
saved AP profile Switching off the AP when we are in connecting
tate resulting in a behavior Where UI keep showing connecting
to that AP instead of showing it as out of range.
Change-Id: I04073b9a4068f4b75216ebfd431adc126583f15c
Jaewan Kim [Mon, 4 Feb 2013 06:36:17 +0000 (15:36 +0900)]
Fix Settings app crash after enabled multi-user
Bug:
8128225
Change-Id: I2918a5ec36e861a1ce4b2e67cf7607929732a7bf
Per Allard [Tue, 9 Oct 2012 12:18:55 +0000 (14:18 +0200)]
Prevent cursor from causing global reference leaks.
To fix this the ContentQueryMap needs to be closed
when onStop is called so any global references can
be reclaimed.
Change-Id: I0c679c10b0d75ab0aac2fe499563c57d934e318a
Dianne Hackborn [Fri, 25 Jan 2013 01:09:13 +0000 (17:09 -0800)]
am
505232be: Merge "Fix of Settings application sort crash"
# By Jia Arlan
# Via Gerrit Code Review (1) and Henrik Baard (1)
* commit '
505232be07e388c602529e14254df013637b16f2':
Fix of Settings application sort crash
Dianne Hackborn [Fri, 25 Jan 2013 01:02:58 +0000 (01:02 +0000)]
Merge "Fix of Settings application sort crash"
Irfan Sheriff [Thu, 24 Jan 2013 19:30:12 +0000 (11:30 -0800)]
am
b1ea6805: Merge "Option "None" replaced "Open" in Wi-Fi AP Settings of Wi-Fi Hotspot"
# By Venkataraman Nerellapalli
# Via Gerrit Code Review (1) and Henrik Baard (1)
* commit '
b1ea6805d98bf953448db350ae33e53c3c3b797d':
Option "None" replaced "Open" in Wi-Fi AP Settings of Wi-Fi Hotspot
Irfan Sheriff [Thu, 24 Jan 2013 18:50:05 +0000 (18:50 +0000)]
Merge "Option "None" replaced "Open" in Wi-Fi AP Settings of Wi-Fi Hotspot"
Venkataraman Nerellapalli [Wed, 22 Feb 2012 09:12:46 +0000 (14:42 +0530)]
Option "None" replaced "Open" in Wi-Fi AP Settings of Wi-Fi Hotspot
First option in Wi-Fi AP settings of Wi-Fi Hotspot, "Open", is
changed to "None" since "Open" is not localized.
"None" (@string/wifi_security_none) already in use in other
Wi-Fi related screens and it is already localized in
the existing source code.
Change-Id: Ic79b20e3b0f094e064dd4758d8a03d67a208389a
Amith Yamasani [Wed, 23 Jan 2013 00:20:28 +0000 (16:20 -0800)]
am
7b8b6618: Merge "Fix for battery temperature display"
* commit '
7b8b6618219a2a9e1402858b513cf19628033204':
Fix for battery temperature display
Amith Yamasani [Wed, 23 Jan 2013 00:09:51 +0000 (00:09 +0000)]
Merge "Fix for battery temperature display"
Irfan Sheriff [Tue, 22 Jan 2013 23:12:22 +0000 (15:12 -0800)]
am
67995f97: Merge "Fix for F/C in WifiConfigInfo"
* commit '
67995f973dd524ba20983b9246a17a10746c4590':
Fix for F/C in WifiConfigInfo
Irfan Sheriff [Tue, 22 Jan 2013 22:58:19 +0000 (22:58 +0000)]
Merge "Fix for F/C in WifiConfigInfo"
Elliott Hughes [Tue, 22 Jan 2013 15:58:42 +0000 (07:58 -0800)]
am
375b6d98: Merge "Force closed at settings application when delete Misc files"
* commit '
375b6d985be9203fb221eb42810e586e196c34f8':
Force closed at settings application when delete Misc files
Elliott Hughes [Tue, 22 Jan 2013 15:43:05 +0000 (15:43 +0000)]
Merge "Force closed at settings application when delete Misc files"
Jia Arlan [Fri, 11 May 2012 08:27:07 +0000 (16:27 +0800)]
Fix of Settings application sort crash
The original implementation of compareTo function
will sometimes cause crash when the power usage list
above 32 items.
When comparing double values a proper comparison method
needs to be used. Using just subtraction does not take
into account NaN:S, infinities and +/-0 numbers. In certain
cirtumstances it seems that using subtraction causes
compareTo to return values that is not expected by the
sorting code and causes an illegal argument exception with
"Comparison method violates its general contract!".
This problem only happens if the sort code is called arrays
containing more than 32 (currently) due to how
ComparableTimSort works (call chain is Collections.sort ->
Arrays.sort(Object[]) -> ComparableTimSort.
Change-Id: If732f04797a3c8b2a43568c90bb73a1ec69a4c98
Shuhrat Dehkanov [Sat, 19 Jan 2013 12:50:06 +0000 (21:50 +0900)]
Fix for F/C in WifiConfigInfo
1. Turn off Wi-Fi
2. Open the dialer and input *#*#4636#*#*
3. Navigate to Wi-Fi information -> Wi-Fi config and observe "Unfortunately,
Settings has stopped" dialog.
Change-Id: I6ed59fc157e9bd8a46e00184b91a1a9f0412d198
Signed-off-by: Shuhrat Dehkanov <uzbmaster@gmail.com>
ikbae.kim [Fri, 18 Jan 2013 00:29:55 +0000 (16:29 -0800)]
Fix for battery temperature display
Centi temperature under zero degree is displayed with '-' sign.
Fix this using absolute value in centi degree display.
Change-Id: If4958d9c75c03d1f3ecfd14436fc80dc2fd57860
Predrag Stanojevic [Tue, 15 May 2012 13:01:02 +0000 (15:01 +0200)]
Force closed at settings application when delete Misc files
NullPointerException in MiscFilesHandler.java, missing check to
ensure that dir.list() does not return null.
Change-Id: I13aac19949826b385610fd1fee2befb411684023
Elliott Hughes [Thu, 20 Dec 2012 19:03:50 +0000 (11:03 -0800)]
am
f141594c: Merge "Correct check box visibility in Display / Brightness"
* commit '
f141594c0507dccd26e876bf2cd40ba15a34d68b':
Correct check box visibility in Display / Brightness
Elliott Hughes [Thu, 20 Dec 2012 00:11:15 +0000 (16:11 -0800)]
Merge "Correct check box visibility in Display / Brightness"
The Android Open Source Project [Tue, 18 Dec 2012 17:44:44 +0000 (09:44 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: I3ce5c84d693ade39f0ffa17313acf7b0df85b934
Benn Porscke [Wed, 17 Oct 2012 17:01:11 +0000 (19:01 +0200)]
Correct check box visibility in Display / Brightness
The check box for "Automatic brightness" should not be visible in
Brightness screen if the product configuration
config_automatic_brightness_available in config.xml is set to false.
Change-Id: I0d81137723d0eacd97aa88bf08b69e12dd4d73fa
Signed-off-by: Benn Porscke <benn.porscke@stericsson.com>
The Android Automerger [Tue, 18 Dec 2012 04:49:51 +0000 (20:49 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Jean Chalard [Mon, 17 Dec 2012 18:46:29 +0000 (10:46 -0800)]
am
d0a9d5b6: am
a374d816: Distinguish adding an already present word / cancelling
* commit '
d0a9d5b6e0b557c3796616791fd3ac93d12bcad9':
Distinguish adding an already present word / cancelling
Jean Chalard [Mon, 17 Dec 2012 18:44:36 +0000 (10:44 -0800)]
am
a374d816: Distinguish adding an already present word / cancelling
* commit '
a374d81605f4ba760db9613dd8aa8d8a0370dab8':
Distinguish adding an already present word / cancelling
Jean Chalard [Mon, 17 Dec 2012 05:58:04 +0000 (14:58 +0900)]
Distinguish adding an already present word / cancelling
Bug:
7725834
Change-Id: Iab3d1818f008a553868fb30e8460ea3f77c2de50
The Android Open Source Project [Fri, 14 Dec 2012 22:03:38 +0000 (14:03 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: Ida52d4ffe46a6805df540f684465dcd46db71945
The Android Automerger [Fri, 14 Dec 2012 21:56:20 +0000 (13:56 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Mike Cleron [Fri, 14 Dec 2012 19:00:28 +0000 (11:00 -0800)]
am
49ce96a1: am
1f597c87: Merge "Call back to whom requested to add a word to the user dict" into jb-mr1.1-dev
* commit '
49ce96a14be5d414128b9e8ca12de281b610a57f':
Call back to whom requested to add a word to the user dict
Mike Cleron [Fri, 14 Dec 2012 18:59:17 +0000 (10:59 -0800)]
am
1f597c87: Merge "Call back to whom requested to add a word to the user dict" into jb-mr1.1-dev
* commit '
1f597c8764b375bf87d411d11a29b2808e1d2ef9':
Call back to whom requested to add a word to the user dict
Mike Cleron [Fri, 14 Dec 2012 18:57:17 +0000 (10:57 -0800)]
Merge "Call back to whom requested to add a word to the user dict" into jb-mr1.1-dev
Jean Chalard [Thu, 13 Dec 2012 06:34:11 +0000 (15:34 +0900)]
Call back to whom requested to add a word to the user dict
Bug:
7725834
Change-Id: I2537754789f25fa978efd457979ed130806b9fbf
The Android Automerger [Thu, 13 Dec 2012 23:30:57 +0000 (15:30 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Irfan Sheriff [Thu, 13 Dec 2012 19:34:46 +0000 (11:34 -0800)]
am
878072a1: am
2a9cbb61: am
f197105e: Merge "Fix wifi compareTo" into jb-mr1-dev
* commit '
878072a11a4f481e99cdc499752b72d14a03090d':
Fix wifi compareTo
Irfan Sheriff [Thu, 13 Dec 2012 19:32:51 +0000 (11:32 -0800)]
am
2a9cbb61: am
f197105e: Merge "Fix wifi compareTo" into jb-mr1-dev
* commit '
2a9cbb61b3d8bae75b3a6e769dbe1c69c563f210':
Fix wifi compareTo
Irfan Sheriff [Thu, 13 Dec 2012 19:30:41 +0000 (11:30 -0800)]
am
f197105e: Merge "Fix wifi compareTo" into jb-mr1-dev
* commit '
f197105e3bd83a1f244cb690a1aa615624629961':
Fix wifi compareTo
Irfan Sheriff [Thu, 13 Dec 2012 19:28:47 +0000 (11:28 -0800)]
Merge "Fix wifi compareTo" into jb-mr1-dev
Irfan Sheriff [Thu, 29 Nov 2012 20:31:06 +0000 (12:31 -0800)]
Fix wifi compareTo
Bug:
7521354
Change-Id: I8d77594dacb56f17126f0e33ff6e47379f615d40
The Android Automerger [Wed, 12 Dec 2012 23:06:22 +0000 (15:06 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Baligh Uddin [Wed, 12 Dec 2012 21:42:57 +0000 (13:42 -0800)]
am
efacd47f: am
5b4509b5: Import translations. DO NOT MERGE
* commit '
efacd47f4f2f9b5103cd3bf876b819904d881da6':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 12 Dec 2012 21:40:49 +0000 (13:40 -0800)]
am
5b4509b5: Import translations. DO NOT MERGE
* commit '
5b4509b5adf2f3e12ffb7df4065fcdfd7e5e3f93':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 12 Dec 2012 21:39:37 +0000 (13:39 -0800)]
am
92ff5ebe: Import translations. DO NOT MERGE
* commit '
92ff5ebe1e0bbb58b444c06d3e4b6887a3dbe120':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 12 Dec 2012 21:19:14 +0000 (13:19 -0800)]
Import translations. DO NOT MERGE
Change-Id: Iea0171a572174bec2168592681ee0f44d1a74083
Auto-generated-cl: translation import
Baligh Uddin [Wed, 12 Dec 2012 21:17:55 +0000 (13:17 -0800)]
Import translations. DO NOT MERGE
Change-Id: I4067263fdbd86c2b1037443ad7360fb17cabe56c
Auto-generated-cl: translation import
Amith Yamasani [Wed, 12 Dec 2012 17:55:56 +0000 (09:55 -0800)]
am
0df6a277: Merge "Grey out settings icon when it is in disabled state"
* commit '
0df6a2771d92e355e122195d3dceaf9a2b264ee5':
Grey out settings icon when it is in disabled state
Amith Yamasani [Wed, 12 Dec 2012 17:12:46 +0000 (09:12 -0800)]
Merge "Grey out settings icon when it is in disabled state"
The Android Open Source Project [Wed, 12 Dec 2012 15:34:17 +0000 (07:34 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: Ia5cf13610d470a518ce526f8a46cb6241a28d124
The Android Automerger [Tue, 11 Dec 2012 23:56:34 +0000 (15:56 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Baligh Uddin [Tue, 11 Dec 2012 05:14:56 +0000 (21:14 -0800)]
am
777688c9: am
67e9e59b: Import translations. DO NOT MERGE
* commit '
777688c9638efab8681453889a3d7917b4a52634':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 11 Dec 2012 05:12:41 +0000 (21:12 -0800)]
am
67e9e59b: Import translations. DO NOT MERGE
* commit '
67e9e59bc943481b091998ba114ca6750f46b383':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 11 Dec 2012 05:12:02 +0000 (21:12 -0800)]
am
3b10f0ba: Import translations. DO NOT MERGE
* commit '
3b10f0ba055fce7b8893897e88405bff0fb66fca':
Import translations. DO NOT MERGE
The Android Open Source Project [Mon, 10 Dec 2012 23:19:47 +0000 (15:19 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: I9438d179ff8a407f87b5b501d4ea1d006f2fb77c
Baligh Uddin [Mon, 10 Dec 2012 18:57:09 +0000 (10:57 -0800)]
Import translations. DO NOT MERGE
Change-Id: I5d16be7510affd0f6e453fe42ecf833c680313e5
Auto-generated-cl: translation import
Baligh Uddin [Mon, 10 Dec 2012 18:55:55 +0000 (10:55 -0800)]
Import translations. DO NOT MERGE
Change-Id: I1f403d01d8d3d7336d869555e69af22b460f7a37
Auto-generated-cl: translation import
Elliott Hughes [Sat, 8 Dec 2012 18:57:51 +0000 (10:57 -0800)]
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.
Elliott Hughes [Sat, 8 Dec 2012 17:55:08 +0000 (09:55 -0800)]
Merge "Makes the add button for new APNs appear in the action bar."
The Android Automerger [Fri, 7 Dec 2012 21:26:24 +0000 (13:26 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Wink Saville [Fri, 7 Dec 2012 20:18:53 +0000 (12:18 -0800)]
am
49c4de7f: Merge "Format change at "Mobile network type" value"
* commit '
49c4de7f139a1a3a60dc8f7e72acae710dba506f':
Format change at "Mobile network type" value
Baligh Uddin [Fri, 7 Dec 2012 19:45:54 +0000 (11:45 -0800)]
am
957f7fc9: am
3674d869: Import translations. DO NOT MERGE
* commit '
957f7fc94eaab5d57d82c76a3a06acd0ab2dc018':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 7 Dec 2012 19:44:30 +0000 (11:44 -0800)]
am
29ce5561: Import translations. DO NOT MERGE
* commit '
29ce5561d85c121c293acc13b60a291365679a46':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 7 Dec 2012 19:44:18 +0000 (11:44 -0800)]
am
3674d869: Import translations. DO NOT MERGE
* commit '
3674d8695166be6c0b7cc225f227f9e1604056e8':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 7 Dec 2012 19:35:18 +0000 (11:35 -0800)]
Import translations. DO NOT MERGE
Change-Id: I0958247f9b14b944fb0bdc04517e65aabba166c1
Auto-generated-cl: translation import
Baligh Uddin [Fri, 7 Dec 2012 19:34:10 +0000 (11:34 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ic8bff7a52926a927353fa5933a68dfc17921e6d1
Auto-generated-cl: translation import
Amith Yamasani [Fri, 7 Dec 2012 18:45:30 +0000 (10:45 -0800)]
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.
Amith Yamasani [Fri, 7 Dec 2012 18:43:37 +0000 (10:43 -0800)]
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.
Amith Yamasani [Thu, 6 Dec 2012 22:40:51 +0000 (14:40 -0800)]
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
Wink Saville [Thu, 6 Dec 2012 16:51:22 +0000 (08:51 -0800)]
Merge "Format change at "Mobile network type" value"
Akira Oshimi [Thu, 18 Oct 2012 09:14:00 +0000 (18:14 +0900)]
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
The Android Open Source Project [Wed, 5 Dec 2012 19:10:16 +0000 (11:10 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: I2333de9f3a171fef3c806003d0e662570d01af1e
The Android Automerger [Wed, 5 Dec 2012 18:27:58 +0000 (10:27 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Jake Hamby [Wed, 5 Dec 2012 04:09:34 +0000 (20:09 -0800)]
am
b39ab37a: am
bc5d9271: Add latest area info broadcast to Settings status screen.
* commit '
b39ab37aa0e8be02a61c4245c181e523419ba703':
Add latest area info broadcast to Settings status screen.
Jake Hamby [Wed, 5 Dec 2012 04:08:21 +0000 (20:08 -0800)]
am
bc5d9271: Add latest area info broadcast to Settings status screen.
* commit '
bc5d9271a9d36ecf07ac35e1635f36679074de6f':
Add latest area info broadcast to Settings status screen.
The Android Automerger [Wed, 5 Dec 2012 03:59:27 +0000 (19:59 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Jake Hamby [Tue, 4 Dec 2012 01:24:30 +0000 (17:24 -0800)]
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
Baligh Uddin [Wed, 5 Dec 2012 00:34:48 +0000 (16:34 -0800)]
am
e30adf2f: am
d2bd59f5: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
* commit '
e30adf2f65241b6337dc4090631673a2fec904e1':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 5 Dec 2012 00:31:30 +0000 (16:31 -0800)]
am
d2bd59f5: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
* commit '
d2bd59f5e8e2359e6697dd8975ccfd1aa36b4103':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 4 Dec 2012 21:49:33 +0000 (13:49 -0800)]
am
9a2cee1d: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit '
9a2cee1d1e391147b3e21d10549b190ba79c4199':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 4 Dec 2012 21:47:16 +0000 (13:47 -0800)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Baligh Uddin [Tue, 4 Dec 2012 21:46:55 +0000 (13:46 -0800)]
Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
Baligh Uddin [Tue, 4 Dec 2012 19:16:12 +0000 (11:16 -0800)]
Import translations. DO NOT MERGE
Change-Id: I2ef0dc90375c2d1b8d341b2e747352d4a3313925
Auto-generated-cl: translation import
Baligh Uddin [Tue, 4 Dec 2012 19:14:54 +0000 (11:14 -0800)]
Import translations. DO NOT MERGE
Change-Id: I950a025ffdb3ac8cb21a9e80175eef115ddac9d4
Auto-generated-cl: translation import
Daniel Sandler [Tue, 4 Dec 2012 19:04:57 +0000 (11:04 -0800)]
am
5428ce65: am
300f8299: Merge "Revised language for notification ringtone picker." into jb-mr1.1-dev
* commit '
5428ce650b161f5a4dfdccb2b4a54f18544e4068':
Revised language for notification ringtone picker.
OSDN Git Service
