PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
55,766 Commits 1 Branch 0 Tags
cd8fc3550b174794c8cb9748ddb5bdabed3de946
Commit Graph

55766 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
cd8fc3550b Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE" am: 7d35be74cb am: 3dfc9bc59f 
Change-Id: Iff7a718249f46373b0ff46b2731bf6b9ac405029
 2020-03-06 00:27:25 +00:00
Automerger Merge Worker
4b0b20986c Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 09be9fbb17 am: 567f83adbe 
Change-Id: Id3d1ed3b88c3d74f02d75bfa04a8dcb18892ced1
 2020-03-06 00:26:49 +00:00
Automerger Merge Worker
3dfc9bc59f Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE" am: 7d35be74cb 
Change-Id: I841a54be0ccf815e08eed0b4d769ef01e7151317
 2020-03-06 00:12:48 +00:00
Automerger Merge Worker
567f83adbe Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 09be9fbb17 
Change-Id: I02042e7d32a1daa74e624c18633ef69dace67838
 2020-03-06 00:12:13 +00:00
Bill Yi
7d35be74cb Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE" 2020-03-05 18:27:29 +00:00
Bill Yi
09be9fbb17 Merge stage-aosp-master to aosp-master - DO NOT MERGE 
Change-Id: Ic40bc7d2b6b306b5cfb0b061e5a3a6f8fe3737c9
 2020-03-05 09:51:19 -08:00
Automerger Merge Worker
b9cbd0368e [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 3779025590 -s ours 
am skip reason: subject contains skip directive

Change-Id: I9107eb36235d9f4204d61869019e626149d2bf9e
 2020-03-04 19:40:22 +00:00
TreeHugger Robot
3779025590 Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev 2020-03-04 19:24:28 +00:00
Bill Yi
8e8a5a1a2c Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: I3e95725552e5510a27025a8315fe4ec69dd2bfd8
 2020-03-03 19:10:03 -08:00
Automerger Merge Worker
3af57b3c28 [Wi-Fi] Ignore incorrect user certificates am: 9e46a0bc93 
Change-Id: If45cb2b3e0c37b16047ff0c393da1cbfb379b091
 2020-03-04 02:32:45 +00:00
Automerger Merge Worker
db71edac5c Merge changes I193805ef,I2e1b9ac5 am: 1ea70d24d5 am: 42b698cdc5 
Change-Id: Ia4e41acdae5a840cf18a4d24493fb8a8a1e30c60
 2020-03-03 10:49:48 +00:00
Automerger Merge Worker
86774c7151 Remove reference to PhoneConstant. am: 28c11a8c01 am: c405329ce7 
Change-Id: Ie10acbfdf8512666458dba1fad4cf34c13e1b798
 2020-03-03 10:49:45 +00:00
Automerger Merge Worker
42b698cdc5 Merge changes I193805ef,I2e1b9ac5 am: 1ea70d24d5 
Change-Id: I237ff4ef41d3dfb3fd74f74e0c252898d19962e5
 2020-03-03 10:27:48 +00:00
Automerger Merge Worker
c405329ce7 Remove reference to PhoneConstant. am: 28c11a8c01 
Change-Id: I635f49570f67f88cca0f937bb3aac3361f9a926a
 2020-03-03 10:27:47 +00:00
Treehugger Robot
1ea70d24d5 Merge changes I193805ef,I2e1b9ac5 
* changes:
  [Settings] Replace isImsRegistered
  Remove reference to PhoneConstant.
 2020-03-03 10:15:27 +00:00
Bonian Chen
a0b4ca3684 [Settings] Replace isImsRegistered 
Replace isImsReigstered() by callback from ImsMmTelManager.

Bug: 140542283
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=SimStatusDialogControllerTest
Merged-In: I904da749df7074918d205ebd004a173ed109c561
Change-Id: I193805ef947636e50bb21d273be15361378d8f8a
 2020-03-03 15:11:27 +08:00
tom hsu
28c11a8c01 Remove reference to PhoneConstant. 
Create static constant in SimStatusDialogController.

Test: make
Test: m RunSettingsRoboTests
Change-Id: I2e1b9ac5b9ab051876f1bb26866d055f822bac90
Merged-In: I2e1b9ac5b9ab051876f1bb26866d055f822bac90
 2020-03-03 15:08:36 +08:00
Arc Wang
9e46a0bc93 [Wi-Fi] Ignore incorrect user certificates 
These incorrect user certificates displayed when users
editing a Wi-Fi network of WPA3-Enterprise in 192bit.

Bug: 149763958
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiConfigControllerTest
Change-Id: Idcbc80aa3e945f83ba6b77ebf9ef443398ef8e3c
Merged-In: Iab35ac975933abc54fda83b99a2109d53d6722d4
 2020-03-02 22:28:46 +08:00
Automerger Merge Worker
711b69b788 Merge "Fix NPE in PanelFragment" am: 06cafcd733 am: 98e3ed4e5d 
Change-Id: I61005104a53c8e79a045be4186ec9f46df4d15f5
 2020-03-02 11:52:51 +00:00
Automerger Merge Worker
98e3ed4e5d Merge "Fix NPE in PanelFragment" am: 06cafcd733 
Change-Id: Ia08ab086c610de141b4cadd2ae097b596351e46e
 2020-03-02 11:37:36 +00:00
Treehugger Robot
06cafcd733 Merge "Fix NPE in PanelFragment" 2020-03-02 11:21:05 +00:00
Automerger Merge Worker
7444c5f649 Merge "Fix for User edit info dialog during rotation" am: c6603dfda8 am: 7cda6b423a 
Change-Id: I2a515c65bfb4d57b832422f60507050c7a64c2aa
 2020-03-02 10:27:49 +00:00
Automerger Merge Worker
7cda6b423a Merge "Fix for User edit info dialog during rotation" am: c6603dfda8 
Change-Id: I4f5a29975aed084e1080387d6eb4500121c23ee0
 2020-03-02 10:11:44 +00:00
Treehugger Robot
c6603dfda8 Merge "Fix for User edit info dialog during rotation" 2020-03-02 07:45:36 +00:00
Automerger Merge Worker
9b3024ab89 DO NOT MERGE - Skip QQ2A.200305.003 in stage-aosp-master am: 9fe7d6c59b 
Change-Id: I5fd10dd781a874c4094ce61434e2ea2675f16bd1
 2020-02-29 04:21:19 +00:00
Automerger Merge Worker
9e2de70584 Merge "[Wi-Fi] Force users to select a phase2 authentication for PEAP & TTLS" into qt-qpr1-dev am: 594a5c71f5 
Change-Id: Ifeeb244d4dddebb4b05b4a7489d0fb28a195c4ad
 2020-02-28 06:16:40 +00:00
Automerger Merge Worker
46e57b10cc Skip QQ2A.200113.001 in stage-aosp-master am: 28f9734a4a 
Change-Id: I9728ea85ac963bc6da1d5bf3a965c6a93c3b3dfd
 2020-02-28 06:10:38 +00:00
TreeHugger Robot
594a5c71f5 Merge "[Wi-Fi] Force users to select a phase2 authentication for PEAP & TTLS" into qt-qpr1-dev 2020-02-28 06:04:46 +00:00
Xin Li
9fe7d6c59b DO NOT MERGE - Skip QQ2A.200305.003 in stage-aosp-master 
Bug: 150410372
Change-Id: I5a62dae10a3c5d0b6fd38c364cf38a39de021e2d
 2020-02-27 15:45:16 -08:00
Xin Li
28f9734a4a Skip QQ2A.200113.001 in stage-aosp-master 
Bug: 146167222
Change-Id: I28eeb421d0e76d44f825436d0e4a61badd7e866d
 2020-02-27 15:36:13 -08:00
Daniel Hunt
26aaf07e9d Fix NPE in PanelFragment 
When updating the panel after getting a second intent to the
activity, there is a small window of opportunity for the user
to close the activity before the animation ends, causing an
NPE when onFinish is called as the activity already closed down.
This change will check that there is an activity before trying
to finish it.

Bug: 150322041
Test:
For an easy way to reproduce this, turn the screen on and run the
following in a terminal:
 while true; do adb shell am start -a \
 android.settings.panel.action.INTERNET_CONNECTIVITY; \
 sleep 0.1; done
Then press the back button while the screen is attempting to
display the fragment. There should be no Settings crash.
Change-Id: I4ca831d71a7221a7a4a62bb29e802f507ce5213c
 2020-02-27 15:47:38 +01:00
Automerger Merge Worker
1a3755c443 Merge "Fixes ApnEditor not restoring previous UI" am: cd4ca97828 am: 9ac493094e 
Change-Id: Ic9fbef9eb26c6ae7830e94f6b81e543ff853afec
 2020-02-27 09:12:37 +00:00
Automerger Merge Worker
9ac493094e Merge "Fixes ApnEditor not restoring previous UI" am: cd4ca97828 
Change-Id: I20438b787bb2424cc4455c476e5f6bd95d559d87
 2020-02-27 09:02:56 +00:00
Treehugger Robot
cd4ca97828 Merge "Fixes ApnEditor not restoring previous UI" 2020-02-27 08:50:37 +00:00
Automerger Merge Worker
48b2b18c89 Merge "[Telephony Setting] Add supplementary conditions for CDMA display IMEI info when subscriptionInfo is null" into qt-qpr1-dev am: efe4cc3db4 
Change-Id: I53a9add4cf2cd2b5dcac408d8d1953e2166eacfc
 2020-02-27 06:25:24 +00:00
Betty Chang
efe4cc3db4 Merge "[Telephony Setting] Add supplementary conditions for CDMA display IMEI info when subscriptionInfo is null" into qt-qpr1-dev 2020-02-27 06:10:25 +00:00
Lee Chou
80d8c3bc83 Fixes ApnEditor not restoring previous UI 
ApnEditor tries read and set the UI in onCreate, before the previous
bundle is restored. This caused problems when the configuration has
changed (such as switching to Dark Theme).

This moves the UI changes to onViewRestored

Fixes: 146399432
Test: make SettingsGoogle and manual test UI
Change-Id: I8147ec96569fa28867c088d6c36584aa344f40ed
Merged-In: I8147ec96569fa28867c088d6c36584aa344f40ed
 2020-02-27 12:33:16 +08:00
changbetty
288fa30c2d [Telephony Setting] Add supplementary conditions for CDMA display IMEI info when subscriptionInfo is null 
Bug: 149307162
Test: make RunSettingsRoboTests ROBOTEST_FILTER=ImeiInfoDialogControllerTest
Change-Id: I1dd83ba55b34433b2b600b8a998000347b6ae5e8
Merged-In: I011b52fd25ca9ad48be3afcdabd9bdd443cd121d
 2020-02-26 18:23:31 +08:00
Automerger Merge Worker
f2748437b8 Merge "Catch crash in mobile network ProgressDialog" am: aaee4539c7 am: 840506e88a 
Change-Id: I7ee6383097ed4a3e8b33769da09ca0a8334d08a1
 2020-02-24 21:36:33 +00:00
Automerger Merge Worker
840506e88a Merge "Catch crash in mobile network ProgressDialog" am: aaee4539c7 
Change-Id: Ifa566bf809360db17a6932ee5ebaede2eb63e1b3
 2020-02-24 21:15:28 +00:00
Xiangyu/Malcolm Chen
aaee4539c7 Merge "Catch crash in mobile network ProgressDialog" 2020-02-24 21:07:17 +00:00
Automerger Merge Worker
b9964d4545 Fix volume panel crashing am: ef009cc832 
Change-Id: I4b1ffaaea0f3fccc1acfebb3061bb4679b18f165
 2020-02-24 15:06:04 +00:00
Raff Tsai
ef009cc832 Fix volume panel crashing 
slider position is smaller than min value causes the exception.
Fixed by limit the position within min and max value.

Fixes: 148270968
Fixes: 149973990
Test: manual
Change-Id: I3d162f6d2f1035b81b1b2eb915b488084e7ea36e
(cherry picked from commit fcd9f1a870)
Merged-In: I3d162f6d2f1035b81b1b2eb915b488084e7ea36e
 2020-02-24 07:04:03 +00:00
Automerger Merge Worker
9a49dd2bc4 Merge "Rename references to getLteOnCdmaMode" am: 7c849787ee am: 63da73532d 
Change-Id: I7b32dea30b97fc1389054eb93b9dc160a1c88d3c
 2020-02-21 22:41:37 +00:00
Automerger Merge Worker
63da73532d Merge "Rename references to getLteOnCdmaMode" am: 7c849787ee 
Change-Id: I16b31595e00e501c6c097ef3e4ad78f3fb0f9b75
 2020-02-21 22:23:21 +00:00
Sarah Chin
7c849787ee Merge "Rename references to getLteOnCdmaMode" 2020-02-21 22:09:16 +00:00
Automerger Merge Worker
44f654fe43 Merge "[adb-wireless] Add Wireless Debugging Switch in Developer options." am: 317c9dc2ca am: fd2e26d4aa 
Change-Id: I741968b993698cf459c670678957276fef68ebbc
 2020-02-21 17:02:44 +00:00
Automerger Merge Worker
fd2e26d4aa Merge "[adb-wireless] Add Wireless Debugging Switch in Developer options." am: 317c9dc2ca 
Change-Id: I8a1f4c22237436e5e2e262a3723c39ae346a87fa
 2020-02-21 16:44:30 +00:00
Joshua Duong
317c9dc2ca Merge "[adb-wireless] Add Wireless Debugging Switch in Developer options." 2020-02-21 16:27:10 +00:00
Daniel Hunt
9f74807e89 Catch crash in mobile network ProgressDialog 
When enabling "Automatically select network" in "Settings -> Network &
internet -> Mobile network -> Advanced" and rotating the device while
the dialog is showing there will be an IllegalArgumentException since
the decorView isn't attached to the window when dismissing the dialog.
Fixed by simply catching the exception since the dialog will be gone
anyway.

Bug: 146057372
Test: manual (see comment above)
Change-Id: I15f1d6f505fdf33964ce973ece31d6aa0d8f3909
 2020-02-21 10:47:12 +00:00