PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
61,963 Commits 1 Branch 0 Tags
eb3ae0d91f04a89facbf45d2ad96ae3a4347e6b5
Commit Graph

61963 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
George Chang
eb3ae0d91f Merge "[NFC] Disable contactless payments when no payment application installed" into rvc-dev am: 0181643bb7 am: f4d5666aea 
Change-Id: Ice57316045b378a3798205fb9eba48137a169866
 2020-04-13 03:20:16 +00:00
TreeHugger Robot
b4b63b60b9 Merge "Fix NFC UI is not available when switching to 2nd user" into rvc-dev am: c56bcb5e7f am: a287641adf 
Change-Id: I93601a9885636fd81759d629203e26fd43dcbf73
 2020-04-13 03:18:42 +00:00
George Chang
270ea3400b Merge "[NFC] Disable contactless payments when no payment application installed" into rvc-dev am: 0181643bb7 am: 5a6d05885a 
Change-Id: Iae7ec5f9d2cb9a59ea2dbaf65dcb3bcc8bbbb7aa
 2020-04-13 03:18:31 +00:00
George Chang
f4d5666aea Merge "[NFC] Disable contactless payments when no payment application installed" into rvc-dev am: 0181643bb7 
Change-Id: I8208b97e26b28fffd435703e0aacea051d95aed2
 2020-04-13 03:00:40 +00:00
TreeHugger Robot
a287641adf Merge "Fix NFC UI is not available when switching to 2nd user" into rvc-dev am: c56bcb5e7f 
Change-Id: Id19154bf9ae37556f4d2284cb4168a76405aeb83
 2020-04-13 02:59:19 +00:00
George Chang
5a6d05885a Merge "[NFC] Disable contactless payments when no payment application installed" into rvc-dev am: 0181643bb7 
Change-Id: I96469f4d0938d9f5f913ee531d4e5e72a11a7ed4
 2020-04-13 02:59:05 +00:00
TreeHugger Robot
c56bcb5e7f Merge "Fix NFC UI is not available when switching to 2nd user" into rvc-dev 2020-04-13 02:45:04 +00:00
George Chang
0181643bb7 Merge "[NFC] Disable contactless payments when no payment application installed" into rvc-dev 2020-04-13 02:43:35 +00:00
George Chang
28895f2822 [NFC] Disable contactless payments when no payment application installed 
Bug: 153821082
Bug: 149270345
Test: Check settings
Change-Id: I5162ecb07c26a33427305b6cf65829b2c61ad317
 2020-04-13 01:53:23 +00:00
TreeHugger Robot
c3428c24ff Merge "Hide Bluetooth, Reset, Accessibility Settings in ARC" into rvc-dev am: 545f08e872 am: 0b653fe083 
Change-Id: I1bcf8ac297f930345af852c7a2b49a4049a8760f
 2020-04-13 01:13:00 +00:00
TreeHugger Robot
d2b330f5ef Merge "Hide Bluetooth, Reset, Accessibility Settings in ARC" into rvc-dev am: 545f08e872 am: 35d8c0bdb3 
Change-Id: Ie00b07ebe6e474e5371bf12ed851e91be116a4a6
 2020-04-13 01:11:27 +00:00
TreeHugger Robot
0b653fe083 Merge "Hide Bluetooth, Reset, Accessibility Settings in ARC" into rvc-dev am: 545f08e872 
Change-Id: Ibd5efd60fdd6c4678d95b3e41e9bd0c4e45330ac
 2020-04-13 00:49:42 +00:00
TreeHugger Robot
35d8c0bdb3 Merge "Hide Bluetooth, Reset, Accessibility Settings in ARC" into rvc-dev am: 545f08e872 
Change-Id: Ifbd95c73fd5e862163157fd7cab49ff4c0a12ddd
 2020-04-13 00:48:10 +00:00
TreeHugger Robot
545f08e872 Merge "Hide Bluetooth, Reset, Accessibility Settings in ARC" into rvc-dev 2020-04-13 00:28:11 +00:00
Bonian Chen
3390caf31d [automerger skipped] Merge "[Settings] Avoid from crash when pull out SIM" am: d43db12f96 am: 74e3771df3 -s ours am: 9e0dea0c05 -s ours 
am skip reason: Change-Id I3869326bdfb65368827f25469ae83539a68e171f with SHA-1 0304e5f90c is in history

Change-Id: Ib2d4f7e0c285430e1616217cf745c557e09240bc
 2020-04-12 18:40:25 +00:00
Bonian Chen
9e0dea0c05 [automerger skipped] Merge "[Settings] Avoid from crash when pull out SIM" am: d43db12f96 am: 74e3771df3 -s ours 
am skip reason: Change-Id I3869326bdfb65368827f25469ae83539a68e171f with SHA-1 0304e5f90c is in history

Change-Id: I7d0f1d8d93b4dfee1ef8e7a6b42b967d55192f0e
 2020-04-12 18:24:46 +00:00
Bonian Chen
74e3771df3 Merge "[Settings] Avoid from crash when pull out SIM" am: d43db12f96 
Change-Id: I898b16508649f6f0f11002a810089b4d9c133a4e
 2020-04-12 18:02:49 +00:00
Bonian Chen
d43db12f96 Merge "[Settings] Avoid from crash when pull out SIM" 2020-04-12 17:42:45 +00:00
Robert Luo
afb01f12cd Fix NFC UI is not available when switching to 2nd user 
Bug: 152581438
Test: (1) make -j42 RunSettingsRoboTests (2) check NFC UI and function work as 2nd user
Change-Id: Ibf0346b992406c1d6329580083c1cd49180376cf
 2020-04-12 15:27:18 +08:00
TreeHugger Robot
458ffc97a0 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 29b22263c5 -s ours 
am skip reason: subject contains skip directive

Change-Id: Iad746f8a6a22da774183acdf8ba1da062902a6fd
 2020-04-11 22:58:58 +00:00
TreeHugger Robot
29b22263c5 Merge "Import translations. DO NOT MERGE" into rvc-d1-dev 2020-04-11 22:43:33 +00:00
Bill Yi
48acb04b48 [automerger skipped] Import translations. DO NOT MERGE am: f4fdb7aa6f -s ours 
am skip reason: subject contains skip directive

Change-Id: I3e631a536a9e62e58375ef2d91bb940f5b018ed0
 2020-04-11 21:42:13 +00:00
Bill Yi
e5a75d999f Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: I4b655b05c1ffe6c5ecd9878216dfbf50b173692c
 2020-04-11 12:38:18 -07:00
Bill Yi
f4fdb7aa6f Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: Ib326e867526a7b49d3134265abf3edc8293bb5f5
 2020-04-11 12:06:30 -07:00
TreeHugger Robot
31888713b5 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: f95f9c9392 -s ours 
am skip reason: subject contains skip directive

Change-Id: I7c45466a049b54586b1d5f9336b51c74c257f862
 2020-04-11 00:17:57 +00:00
TreeHugger Robot
f95f9c9392 Merge "Import translations. DO NOT MERGE" into rvc-d1-dev 2020-04-10 23:57:05 +00:00
TreeHugger Robot
c613c6cd58 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: a4225ef524 -s ours 
am skip reason: subject contains skip directive

Change-Id: I003a3ec11f7ff566d7cc9ed057e2875b3b5f94c4
 2020-04-10 22:47:11 +00:00
TreeHugger Robot
a4225ef524 Merge "Import translations. DO NOT MERGE" into rvc-d1-dev 2020-04-10 22:40:51 +00:00
Joshua Duong
49cfa5db8e Merge "[adbwifi] Add qstile for wireless debugging." into rvc-dev am: 99eeb00360 am: 7a0fbe20c2 
Change-Id: I971480f5131231d0be34b2ed9d095712ac8bdabf
 2020-04-10 22:31:40 +00:00
Joshua Duong
5cd4b55df6 Merge "[adbwifi] Add qstile for wireless debugging." into rvc-dev am: 99eeb00360 am: 2ae802aa4a 
Change-Id: I3ab38093b30fa3cea522de86efba548cd83c70f5
 2020-04-10 22:31:17 +00:00
Joshua Duong
2ae802aa4a Merge "[adbwifi] Add qstile for wireless debugging." into rvc-dev am: 99eeb00360 
Change-Id: I65671fb805807b23762954038061d7baedf8aac2
 2020-04-10 22:12:20 +00:00
Joshua Duong
7a0fbe20c2 Merge "[adbwifi] Add qstile for wireless debugging." into rvc-dev am: 99eeb00360 
Change-Id: Ifef0847142df532101d1abfb51903ddd2f126fcc
 2020-04-10 22:10:39 +00:00
Joshua Duong
99eeb00360 Merge "[adbwifi] Add qstile for wireless debugging." into rvc-dev 2020-04-10 21:59:02 +00:00
Bill Yi
249b249162 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: I8edf2232bd374be619ac31a6c2b71342c4023b62
 2020-04-10 14:09:45 -07:00
Bill Yi
2ee020144e Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: Ie37a263449cc464c87062240472b94c9eda01ca2
 2020-04-10 13:36:56 -07:00
Automerger Merge Worker
20bfa5707a Merge "Fix padding on DND settings header am: 32f2839703 am: 1e640f4608" into rvc-d1-dev-plus-aosp 2020-04-10 20:06:19 +00:00
Beverly
3d6ffab023 Fix padding on DND settings header am: 32f2839703 am: 1e640f4608 
Change-Id: I15551b3f9de6615af450d914f4873cdde134849c
 2020-04-10 20:06:14 +00:00
Beverly
5704a262b4 Fix padding on DND settings header am: 32f2839703 am: 504f43c8fb 
Change-Id: Ib333fab1a5183db2ed7d2059d149863f3a0064ea
 2020-04-10 20:06:04 +00:00
Beverly
1e640f4608 Fix padding on DND settings header am: 32f2839703 
Change-Id: I9aa8f7541b5ee23deec088b13a492ee6ead83461
 2020-04-10 19:44:57 +00:00
Beverly
504f43c8fb Fix padding on DND settings header am: 32f2839703 
Change-Id: Id37351280a62f1f42727f5707883ad02f80e68cc
 2020-04-10 19:43:36 +00:00
Xin Li
b19f478794 [automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6382244 into stag-aosp-master am: ee75f54619 -s ours am: c6d43dd241 
Change-Id: I63b961879721198c93248b856c2c5ea8f31e14d8
 2020-04-10 19:27:41 +00:00
Joshua Duong
0f3eba36f2 [adbwifi] Add qstile for wireless debugging. 
Bug: 153275926

Test: make RunSettingsRoboTests ROBOTEST_FILTER=WirelessDebuggingTest
Change-Id: I6b381a7e29beec5c9c345b374e127caabdb674db
(cherry picked from commit 0c23d39f94)
Exempt-From-Owner-Approval: cherry-pick
 2020-04-10 19:12:40 +00:00
Xin Li
c6d43dd241 [automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6382244 into stag-aosp-master am: ee75f54619 -s ours 
am skip reason: subject contains skip directive

Change-Id: I8b7e19ae4736d426d962e53a512774cee54a9be0
 2020-04-10 19:07:15 +00:00
Beverly
32f2839703 Fix padding on DND settings header 
Test: manual
Fixes: 152974082
Change-Id: Id34db63550ddc2ad89c15830e03bf9782df0a765
 2020-04-10 12:30:57 -04:00
TreeHugger Robot
18709df8b1 Merge "Support click metrics logs in several pages" into rvc-dev am: afaf654a77 am: dde9ab5b62 
Change-Id: If22d76d1d74e09127448298305ffea22c5ca3f00
 2020-04-10 13:20:32 +00:00
Bonian Chen
385dd90371 Merge "[Settings] Avoid rename inactive subscription from NullPointerException" into rvc-dev am: e18904daab am: 8a5272b307 
Change-Id: Ia9815d0de9d01c3a362b9d1af75d620887cc240a
 2020-04-10 13:20:15 +00:00
TreeHugger Robot
70f0c6a53f Merge "Support click metrics logs in several pages" into rvc-dev am: afaf654a77 am: 976b3690fe 
Change-Id: If078432fd8e8ab16653aedf000f6da85b9a7a327
 2020-04-10 13:19:21 +00:00
Bonian Chen
5a45c3ff77 Merge "[Settings] Avoid rename inactive subscription from NullPointerException" into rvc-dev am: e18904daab am: b72aa1c03a 
Change-Id: I0193370f5b63f92abe6490839a571f0c6c6df422
 2020-04-10 13:19:03 +00:00
TreeHugger Robot
976b3690fe Merge "Support click metrics logs in several pages" into rvc-dev am: afaf654a77 
Change-Id: I0cb34fead8cbcabf7eb01bd058f9604b5c7d19d0
 2020-04-10 13:06:21 +00:00
TreeHugger Robot
dde9ab5b62 Merge "Support click metrics logs in several pages" into rvc-dev am: afaf654a77 
Change-Id: I2cc663ea9aec69848bc96d6dc25e1895984b9731
 2020-04-10 12:57:10 +00:00