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

10466 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Elliott Hughes
c3a6cd6ee5 Merge "Move a line into try block" 2013-11-05 16:48:47 +00:00
Shuhrat Dehkanov
7e77699895 Move a line into try block 
Currently, NumberFormatException is never handled as
Integer.parseInt() is called outside try block.
This moves that line inside try block.

Change-Id: I54544f5a665ca0f821de5351001755cb965078dc
Signed-off-by: Shuhrat Dehkanov <k@efir.uz>
 2013-11-01 17:39:44 +09:00
Elliott Hughes
10fdcab424 Merge "Fix time zone formatting in RTL locales." 2013-09-20 20:44:32 +00:00
Elliott Hughes
04487594d7 Fix time zone formatting in RTL locales. 
This fixes ar, fa, and he/iw.

Bug: 10231161
Change-Id: I31acc044443c026ba8b8e1967810f7aa476bcae7
 2013-09-18 15:07:43 -07:00
Elliott Hughes
caeb7a6e62 Merge "Get time zone names from CLDR." 2013-09-13 23:08:12 +00:00
Amith Yamasani
ad0f0edb54 Merge "Call to equals() comparing different types" 2013-09-12 16:08:20 +00:00
Elliott Hughes
f1582bc3f5 Get time zone names from CLDR. 
Since the intent appears to have been "use the zone's local names if
they're in the same country, and use exemplar locations otherwise",
this patch gets the localized CLDR time zone name or the localized
CLDR exemplar location as appropriate.

Bug: 8145760
Bug: 10179879
Change-Id: Ib3968a493de9f0d3040f3afa6ca07d9f44566a32
 2013-09-10 16:46:59 -07:00
Robert Greenwalt
1faefa06a3 Merge "Fix one NPE in tethering setting" 2013-08-15 14:13:10 +00:00
Jianzheng Zhou
508c7c16ab Fix one NPE in tethering setting 
Once we not declare BT feature, go Setting->more->tethering
will trigger this NPE.

Change-Id: I4736e7bade261475acda74e26250a81452018ffa
Signed-off-by: Jianzheng Zhou <jianzheng.zhou@freescale.com>
 2013-08-15 14:34:52 +08:00
Dianne Hackborn
8f00b7711c Merge "Fix app ops details not displaying permissions under certain conditions." 2013-08-05 18:11:11 +00:00
Danny Baumann
67e72d9e8a Fix app ops details not displaying permissions under certain conditions. 
If there's a permission that is not granted, the loop is aborted instead
of just skipping said permission.

Change-Id: Icca567ebdd818f40ad6619f258c77590074d1deb
 2013-08-05 14:30:33 +02:00
Dianne Hackborn
ca1b745824 Completely remove app ops activity. 
Change-Id: Ibe2f15c9ff7589fd5527a0f249d7c1eeca868c8a
 2013-08-02 14:35:10 -07:00
Robert Greenwalt
35a2d796e3 Merge "Fix "Add Network" show last selected WiFi AP Dialog" 2013-07-29 23:43:33 +00:00
Birdson_Chen
2dcf6083f7 Fix "Add Network" show last selected WiFi AP Dialog 
When user taps Wi-Fi add network button, the pop-up dialog is not empty (it shows last selected WiFi AP Dialog).
The above is observed after the following steps:
- Launch Settings application
- Turn on Wi-Fi
- Select any Wi-Fi Access Point which is not connected previously and change to portrait mode
- Press Cancel from the pop-up and select Add Network icon in menu

Because the "Rotation" operation will cause WifiDialog re-creating and the current settings
of selected Wi-Fi Access Point is saved before WifiDialog destroyed.
Then, the saved Wi-Fi Access Point is displayed when user tap on "Add Network".

It need to clear the saved Wi-Fi Access Point when WifiDialog re-creating.

Change-Id: I3e93943e5bee405329e309c3ec88a35ee9cafc43
 2013-07-29 10:37:36 +08:00
Robert Greenwalt
ba32c249ad resolved conflicts for merge of 4d9f670b to stage-aosp-master 
Change-Id: Ia5bb368dbbd857c6e201b821ae7c03a9f6f5006b
 2013-07-18 20:52:47 -07:00
Robert Greenwalt
4d9f670bdb Merge "Fix issue 52986: Wifi settings abnormal when screen rotation" 2013-07-19 00:17:42 +00:00
Baligh Uddin
f6d197a759 am 613cab12: am f9d69170: Import translations. DO NOT MERGE 
* commit '613cab12188b59b907834d6e8e473219ba6306a8':
  Import translations. DO NOT MERGE
 2013-07-15 19:44:11 -07:00
Baligh Uddin
48fa42b58b am 3f573fae: Import translations. DO NOT MERGE 
* commit '3f573faef91c31198f95730614fad751b7cdc8f1':
  Import translations. DO NOT MERGE
 2013-07-15 19:40:53 -07:00
Baligh Uddin
613cab1218 am f9d69170: Import translations. DO NOT MERGE 
* commit 'f9d691707c2acfa5808d3f7b14ec520e24c9e8c6':
  Import translations. DO NOT MERGE
 2013-07-15 19:40:53 -07:00
Baligh Uddin
3f573faef9 Import translations. DO NOT MERGE 
Change-Id: I5ed3429648c82e9a2cf4ca62f308639371bcfdde
Auto-generated-cl: translation import
 2013-07-15 11:38:16 -07:00
Baligh Uddin
f9d691707c Import translations. DO NOT MERGE 
Change-Id: I0f107b738c6aa5f0aeb538ccf991f64fac47fd5c
Auto-generated-cl: translation import
 2013-07-15 11:36:58 -07:00
The Android Open Source Project
f2d9e68c23 Reconcile with jb-mr2-zeroday-release - do not merge 
Change-Id: Id0cd5164aa3d404463c520c3361cce521f3577fe
 2013-07-15 09:33:36 -07:00
The Android Automerger
d9575910e7 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-07-15 08:19:20 -07:00
Wink Saville
eeb90735dd am 95c2a4a4: am 80bfbd53: Merge "VZW wants the phoneNumber to be 10 zero\'s if there isn\'t one." into jb-mr2-dev 
* commit '95c2a4a43039705f573b346026908369aa5df2b6':
  VZW wants the phoneNumber to be 10 zero's if there isn't one.
 2013-07-12 12:03:54 -07:00
Wink Saville
95c2a4a430 am 80bfbd53: Merge "VZW wants the phoneNumber to be 10 zero\'s if there isn\'t one." into jb-mr2-dev 
* commit '80bfbd53151eccb8888aafc81d3dccea87cdca29':
  VZW wants the phoneNumber to be 10 zero's if there isn't one.
 2013-07-12 12:01:43 -07:00
Wink Saville
80bfbd5315 Merge "VZW wants the phoneNumber to be 10 zero's if there isn't one." into jb-mr2-dev 2013-07-12 18:58:56 +00:00
Baligh Uddin
9d41a551e5 am 5ecc395e: Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev 
* commit '5ecc395ef2c96f899b396e937be97cc597775d8a':
  Import translations. DO NOT MERGE
 2013-07-11 14:52:27 -07:00
Baligh Uddin
5ecc395ef2 Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev 2013-07-11 21:50:16 +00:00
Baligh Uddin
db4cfb0c85 am 9598002a: am 2a1ccab1: Import translations. DO NOT MERGE 
* commit '9598002ab582ca05a5ca1c3b15c8a9d5bbaee2a1':
  Import translations. DO NOT MERGE
 2013-07-11 12:25:42 -07:00
Baligh Uddin
9598002ab5 am 2a1ccab1: Import translations. DO NOT MERGE 
* commit '2a1ccab1cdd00af6989eadba1a766120d0b10243':
  Import translations. DO NOT MERGE
 2013-07-11 12:23:19 -07:00
Wink Saville
b464478664 VZW wants the phoneNumber to be 10 zero's if there isn't one. 
Bug: 9784059
Change-Id: I41bba908855648d2560440655d8a75a7cb2e0859
 2013-07-10 22:19:26 -07:00
Baligh Uddin
7c992b80cf Import translations. DO NOT MERGE 
Change-Id: I8112e19acd0d8d12b5435d467c40e9b93162fca8
Auto-generated-cl: translation import
 2013-07-10 20:30:12 -07:00
Baligh Uddin
2a1ccab1cd Import translations. DO NOT MERGE 
Change-Id: I6b02734b2ef1396af16da6e8102cdbb6ca79a50c
Auto-generated-cl: translation import
 2013-07-10 20:28:57 -07:00
Chen Hong
3f9e2aec2e Fix issue 52986: Wifi settings abnormal when screen rotation 
When checked "Show Advanced settings" in wifi setup wifi setup wizard, and rotate the phone to landscape, the advanced settings are gone, but the checkbox is still checked. It's because of checkbox is set click listener but not checked changed listener, it can't handle checkbox's status properly.

Change-Id: I2930cab4d0878c3d91db46560f837ca21d45da4d
 2013-07-11 11:19:00 +08:00
The Android Open Source Project
eddcf88e64 Reconcile with jb-mr2-zeroday-release - do not merge 
Change-Id: Ib1fa3361941e032e0ff6137b37ef14eee2e794b2
 2013-07-09 09:37:51 -07:00
The Android Automerger
ceea6ac47e merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-07-09 05:55:36 -07:00
The Android Open Source Project
ff2b0d7f79 Reconcile with jb-mr2-zeroday-release - do not merge 
Change-Id: I5b0a5ed28f84d9e080f30feeec05975512a8b8f7
 2013-07-08 15:37:19 -07:00
Baligh Uddin
181192235d am 55077df1: am f1d02056: Import translations. DO NOT MERGE 
* commit '55077df18a9bc29171eeb1587ec6c84101e6fa64':
  Import translations. DO NOT MERGE
 2013-07-08 14:38:21 -07:00
Baligh Uddin
369ca5a7b0 am 20a554fa: Import translations. DO NOT MERGE 
* commit '20a554fa50620fc51951a12f16a27f83168f4ce3':
  Import translations. DO NOT MERGE
 2013-07-08 14:38:18 -07:00
Baligh Uddin
55077df18a am f1d02056: Import translations. DO NOT MERGE 
* commit 'f1d02056d967b2660424f181ce547b846a92fdec':
  Import translations. DO NOT MERGE
 2013-07-08 14:35:21 -07:00
Baligh Uddin
20a554fa50 Import translations. DO NOT MERGE 
Change-Id: I5abf06c94c0aa4a90a11b0a14fe6f04ec6d003c9
Auto-generated-cl: translation import
 2013-07-08 09:18:57 -07:00
Baligh Uddin
f1d02056d9 Import translations. DO NOT MERGE 
Change-Id: I7d34201de76770bcb6a1998c6d898830ca290006
Auto-generated-cl: translation import
 2013-07-08 09:17:21 -07:00
The Android Automerger
f71e502149 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-07-08 05:55:42 -07:00
The Android Open Source Project
d8e00a0ba3 Reconcile with jb-mr2-zeroday-release - do not merge 
Change-Id: I1529161d81082d96363ffb02eab90da17a1ec71e
 2013-07-03 14:33:10 -07:00
Baligh Uddin
143d460027 am 8bd9f2f2: am 76185f72: Import translations. DO NOT MERGE 
* commit '8bd9f2f287dec8ff9abb4de1830a1a91fc7212c2':
  Import translations. DO NOT MERGE
 2013-07-03 14:27:40 -07:00
Baligh Uddin
7f49b198d0 am df0ad0dc: am aa03b2f6: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit 'df0ad0dc86b41b009943f97956b7a36b00c9eef8':
  Import translations. DO NOT MERGE
 2013-07-03 14:27:39 -07:00
Baligh Uddin
8bd9f2f287 am 76185f72: Import translations. DO NOT MERGE 
* commit '76185f7201b3e8a2d341a62c13f8ac259203a7e7':
  Import translations. DO NOT MERGE
 2013-07-03 14:24:47 -07:00
Baligh Uddin
df0ad0dc86 am aa03b2f6: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit 'aa03b2f6a61bc2ea4e7ad9b07a2841363a3a7a73':
  Import translations. DO NOT MERGE
 2013-07-03 14:24:47 -07:00
Baligh Uddin
8db7a8c58e am ad965c17: Import translations. DO NOT MERGE 
* commit 'ad965c173bd5a6f98d14a6e1ef83087cc55bd5ef':
  Import translations. DO NOT MERGE
 2013-07-03 14:21:03 -07:00
Baligh Uddin
ad965c173b Import translations. DO NOT MERGE 
Change-Id: I45c8315e3a471262b48485768ba402b35b559886
Auto-generated-cl: translation import
 2013-07-03 13:56:12 -07:00