PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
51,412 Commits 1 Branch 0 Tags
ea28576e7aba65170723958495d6cabecff2da7c
Commit Graph

51412 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maurice Lam
ea28576e7a Merge "Set the theme in BiometricEnrollIntroduction" into qt-dev am: 76ffb2df02 
am: e1e52f7940

Change-Id: Ic428560fa9ddd4d748d1269987bd076c67b37077
 2019-04-12 15:01:29 -07:00
Lei Yu
0bc39338c1 Merge "Disable icon for NetworkOperatorPreference" into qt-dev am: a55af7ea34 
am: bb94324293

Change-Id: Ia79f4a84ea5acb527339c4fdb182290a452ffbba
 2019-04-12 14:30:25 -07:00
Maurice Lam
e1e52f7940 Merge "Set the theme in BiometricEnrollIntroduction" into qt-dev 
am: 76ffb2df02

Change-Id: I5a6c0aa2689ac171f832dce3464603640b44bf80
 2019-04-12 12:48:32 -07:00
Lei Yu
bb94324293 Merge "Disable icon for NetworkOperatorPreference" into qt-dev 
am: a55af7ea34

Change-Id: Iff4fb149a8b9a18d79524c76056fc3ec1eb37a8d
 2019-04-12 12:40:38 -07:00
Maurice Lam
76ffb2df02 Merge "Set the theme in BiometricEnrollIntroduction" into qt-dev 2019-04-12 17:59:42 +00:00
Lei Yu
a55af7ea34 Merge "Disable icon for NetworkOperatorPreference" into qt-dev 2019-04-12 17:44:59 +00:00
TreeHugger Robot
106874fc2f Merge "Import translations. DO NOT MERGE" 2019-04-12 06:45:57 +00:00
Bill Yi
f043fdf12e [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: db7f321526 -s ours 
am: e8a33f25ff -s ours
am skip reason: subject contains skip directive

Change-Id: If0551c9c09ba9a746e9cac4b18e12c956a45455a
 2019-04-11 23:30:56 -07:00
Bill Yi
e8a33f25ff [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev 
am: db7f321526 -s ours
am skip reason: subject contains skip directive

Change-Id: I96647d998ac8bc8d05cbd851003b0a593509112e
 2019-04-11 23:26:52 -07:00
TreeHugger Robot
db7f321526 Merge "Import translations. DO NOT MERGE" into qt-dev 2019-04-12 06:11:17 +00:00
Bill Yi
010a39219b Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I3f2592d8b31abc79f4bf4edc54f05ff24edede32
 2019-04-11 20:47:23 -07:00
Jordan Liu
7d1f5e5d8e [automerger skipped] Merge "fix merge [DO NOT MERGE]" into qt-dev-plus-aosp 
am: 26b7c81411 -s ours
am skip reason: subject contains skip directive

Change-Id: Ifb9e3a8894f7b8d03d797f5013e8c41ae3157dbe
 2019-04-11 20:28:27 -07:00
Arc Wang
3ef032d2a4 Merge "Fix Wi-Fi QR code scanning icon disappears problem" into qt-dev am: ff0db2f26b 
am: 1785625089

Change-Id: I0fb1ad5aa152d239412b054430a8d593d391d346
 2019-04-11 20:28:04 -07:00
Arc Wang
5ec396c14c Merge "Fix can't share WEP Wi-Fi network via Wi-Fi QR code generator" into qt-dev am: 982e46fe6c 
am: 54d5b05d69

Change-Id: I290732e2c88aacdf64d44721cc6133602b492b24
 2019-04-11 20:26:06 -07:00
Jordan Liu
26b7c81411 Merge "fix merge [DO NOT MERGE]" into qt-dev-plus-aosp 2019-04-12 03:12:04 +00:00
Jordan Liu
9291bfad0f fix merge [DO NOT MERGE] 
ag/7020248 defined mSelectPhoneIndexHandler twice,
this fix removes the double definition

Change-Id: I749ab26dc71f269fd322d51b94a4809cecfd0df1
 2019-04-12 03:07:33 +00:00
Pasty Chang
8b6dc2057d Merge "Increasing char limited of skip dialog title to 48" into qt-dev am: 326da4b510 
am: 986bede1f1

Change-Id: Ifaa4632043753f8e95860f4b579f8227e0675e89
 2019-04-11 20:04:51 -07:00
Bill Yi
1aede69cc2 Import translations. DO NOT MERGE 
Change-Id: Ib2ff27bf05090080800f355d58e967775f4157db
Auto-generated-cl: translation import
 2019-04-11 20:04:44 -07:00
Arc Wang
1785625089 Merge "Fix Wi-Fi QR code scanning icon disappears problem" into qt-dev 
am: ff0db2f26b

Change-Id: I6a6160f28ef0474f965701b88c186800a962a8ea
 2019-04-11 19:56:32 -07:00
Arc Wang
ff0db2f26b Merge "Fix Wi-Fi QR code scanning icon disappears problem" into qt-dev 2019-04-12 02:44:33 +00:00
Arc Wang
54d5b05d69 Merge "Fix can't share WEP Wi-Fi network via Wi-Fi QR code generator" into qt-dev 
am: 982e46fe6c

Change-Id: I6b4b4e594bd1e62fb1bd927dd2e399838aca4a49
 2019-04-11 19:41:13 -07:00
Arc Wang
982e46fe6c Merge "Fix can't share WEP Wi-Fi network via Wi-Fi QR code generator" into qt-dev 2019-04-12 02:36:21 +00:00
Pasty Chang
986bede1f1 Merge "Increasing char limited of skip dialog title to 48" into qt-dev 
am: 326da4b510

Change-Id: I61cbefa73255d0dd65ea253005d4dee866c66a88
 2019-04-11 18:27:48 -07:00
Pasty Chang
326da4b510 Merge "Increasing char limited of skip dialog title to 48" into qt-dev 2019-04-12 01:13:24 +00:00
Jordan Liu
e677810e7d Merge "Do not reuse phonestatelistener" into qt-dev-plus-aosp 
am: 79a2693dfe

Change-Id: Ida5c874937a87521a79638e97e733fff10df513f
 2019-04-11 17:50:35 -07:00
Nate Jiang
47b9292fde Merge "[CLEANUP] Clean up unused permissions from Settings" 2019-04-12 00:35:57 +00:00
Mill Chen
99b9dcddef Merge "Fix conditionals not show up in homepage" into qt-dev am: 72f0aa2a68 
am: b5cdcffd6b

Change-Id: Ia0e715edd9ced175f1fc1be6adbcf1c7ea6ec282
 2019-04-11 17:24:58 -07:00
Brad Ebinger
ea03a85026 [automerger skipped] Merge "Merge "Fix issue that user can't edit WFC mode for SIM2" am: d2727d5d9f am: c91d33798b" into qt-dev am: ba05893e37 -s ours 
am: 68937ee0ac -s ours
am skip reason: change_id Icb3bd924f9e8e3e2e82845ab85ef25c2e38e13dc with SHA1 ac4a495fc2 is in history

Change-Id: I8c5015c2543cf4700b82a571ae7b450f3a4591a9
 2019-04-11 17:16:17 -07:00
Jordan Liu
79a2693dfe Merge "Do not reuse phonestatelistener" into qt-dev-plus-aosp 2019-04-11 23:57:05 +00:00
Jordan Liu
84deb0ac4f Do not reuse phonestatelistener 
Due to b/117555407, the same PhoneStateListener object can not be used
to register on different subIds, so we workaround this by recreating
the PhoneStateListener when reregistering.

Fixes: 129989656
Test: manual
Change-Id: I7630e74a9361093d8cbe72fa72c14aaaab9fcc17
 2019-04-11 23:55:53 +00:00
Mill Chen
b5cdcffd6b Merge "Fix conditionals not show up in homepage" into qt-dev 
am: 72f0aa2a68

Change-Id: I109ed36ffdcdc1b432cfdaf2ffa1c058213980c8
 2019-04-11 16:50:56 -07:00
Brad Ebinger
68937ee0ac [automerger skipped] Merge "Merge "Fix issue that user can't edit WFC mode for SIM2" am: d2727d5d9f am: c91d33798b" into qt-dev 
am: ba05893e37 -s ours
am skip reason: change_id Icb3bd924f9e8e3e2e82845ab85ef25c2e38e13dc with SHA1 ac4a495fc2 is in history

Change-Id: I6e9aabab4263185ec4e604a4b092e1298350b746
 2019-04-11 16:42:25 -07:00
Lei Yu
e9226c4bba Disable icon for NetworkOperatorPreference 
When using old api, disable icon because data in CellInfo is wrong.

Fixes: 128393160
Test: RunSettingsRoboTests
Change-Id: Ide5b424e86d2f0a19cf1e0e6bf22edb270822690
 2019-04-11 16:18:50 -07:00
TreeHugger Robot
72f0aa2a68 Merge "Fix conditionals not show up in homepage" into qt-dev 2019-04-11 23:14:30 +00:00
Fabian Kozynski
aa64f4faa8 Merge "Added activity with correct filter for DataSaver" into qt-dev am: 8f2f09f5d6 
am: 3f5718a002

Change-Id: I75c16a10288753167699fe07239e0beee4f9a29c
 2019-04-11 16:11:37 -07:00
Brad Ebinger
ba05893e37 Merge "Merge "Fix issue that user can't edit WFC mode for SIM2" am: d2727d5d9f am: c91d33798b" into qt-dev 2019-04-11 22:54:28 +00:00
Robin Lee
787706806b Merge "Change the owners of vpn2 settings again" into qt-dev am: de827cb353 
am: 5e20a543f8

Change-Id: I491970204a6ad38051884a2ca429f3c2eab788f3
 2019-04-11 15:53:01 -07:00
Jordan Liu
710c5bcc27 Merge "Revert "Do not reuse phonestatelistener"" into qt-dev-plus-aosp 
am: d02e198fde

Change-Id: I4a20ff324aadcc3270f93c743b616b9d59365bde
 2019-04-11 15:48:47 -07:00
Fabian Kozynski
3f5718a002 Merge "Added activity with correct filter for DataSaver" into qt-dev 
am: 8f2f09f5d6

Change-Id: I1bf364ac8db4a5ffc3148bec1b7a16f4c019f84d
 2019-04-11 15:43:54 -07:00
TreeHugger Robot
8f2f09f5d6 Merge "Added activity with correct filter for DataSaver" into qt-dev 2019-04-11 22:20:13 +00:00
Robin Lee
5e20a543f8 Merge "Change the owners of vpn2 settings again" into qt-dev 
am: de827cb353

Change-Id: I1d52a9100570718b14decb68a742d3933b3e85b7
 2019-04-11 15:20:00 -07:00
Mill Chen
4d6c86ceb9 Merge "Update magnification icon in Accessibility" into qt-dev am: 4303e28377 
am: a07b1638cc

Change-Id: I3c785a55a0db9894d701d9caa6f92123e5e50a30
 2019-04-11 15:10:50 -07:00
Jordan Liu
c6b820de43 [automerger skipped] Merge "Do not reuse phonestatelistener" into qt-dev-plus-aosp 
am: 898462bb57 -s ours
am skip reason: change_id I9d6631da628351511e285afeb5b6d4331aaab7e5 with SHA1 9bc2a584f6 is in history

Change-Id: I0a694c44fffba88e4728b53a09ba469445a1a5f2
 2019-04-11 15:09:01 -07:00
Evan Laird
3d89792f08 Merge "Turn off LAYER_TYPE_SOFTWARE on BatteryMeterView" into qt-dev am: 4f988c8b29 
am: fec0ebdde8

Change-Id: I51fdb7d95082d1b90692b24a20f320abfe4bdf8d
 2019-04-11 15:01:59 -07:00
Jordan Liu
d02e198fde Merge "Revert "Do not reuse phonestatelistener"" into qt-dev-plus-aosp 2019-04-11 21:56:31 +00:00
Jordan Liu
4cb626c12e Revert "Do not reuse phonestatelistener" 
This reverts commit 728e186441.

Reason for revert: bad merge (unremoved === right at top of file)

Change-Id: I9c22804fa6f971cbb9685aac5ae3f6527e198ea7
 2019-04-11 21:53:38 +00:00
TreeHugger Robot
de827cb353 Merge "Change the owners of vpn2 settings again" into qt-dev 2019-04-11 21:48:53 +00:00
Mill Chen
f23b3b84d3 Fix conditionals not show up in homepage 
Settings will not refresh conditionals status if there is no condition
card in homepage when Settings homepage gets in/out of window focus.
Whether or not there are conditional cards in the homepage, Settings
should always refresh conditional cards.

Fixes: 129725565
Test: robotests, visual
Change-Id: I1ed309d3fd4f7a2ba911097ea6b049c2aff48c8a
 2019-04-11 14:43:58 -07:00
Mill Chen
a07b1638cc Merge "Update magnification icon in Accessibility" into qt-dev 
am: 4303e28377

Change-Id: I8176258986936763f0b98f03b313ab0423e67a78
 2019-04-11 14:15:54 -07:00
Jordan Liu
898462bb57 Merge "Do not reuse phonestatelistener" into qt-dev-plus-aosp 2019-04-11 20:48:23 +00:00