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

61155 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
648fe31181 Merge "Fix tests" into rvc-dev am: 6d8e0fed61 am: f08d965b53 
Change-Id: If3e8ac385517d0fcad9160f24b8d6aaa1b3cdacd
 2020-03-13 09:51:27 +00:00
Automerger Merge Worker
13e5aa329d Merge "[Settings] Refactor MmsMessagePreferenceController" am: 1f1843f11c am: 57e2e2424a 
Change-Id: If39467fa58090b1594c5153fc2c7eb3600a36dfc
 2020-03-13 09:39:10 +00:00
Automerger Merge Worker
95ada20d2e Merge "Fix tests" into rvc-dev am: 6d8e0fed61 
Change-Id: I2ebe208fd9795e122b650b93b8a2dc81fe0ae3e8
 2020-03-13 09:38:46 +00:00
Automerger Merge Worker
f08d965b53 Merge "Fix tests" into rvc-dev am: 6d8e0fed61 
Change-Id: I76a1639f3530aee4c47fcc3cac1e01bfbe02aea5
 2020-03-13 09:38:45 +00:00
Automerger Merge Worker
57e2e2424a Merge "[Settings] Refactor MmsMessagePreferenceController" am: 1f1843f11c 
Change-Id: I02a5ee42cd8e1f429b4f3031ac10c620eb5e3a16
 2020-03-13 09:29:09 +00:00
TreeHugger Robot
6d8e0fed61 Merge "Fix tests" into rvc-dev 2020-03-13 09:27:16 +00:00
Bonian Chen
1f1843f11c Merge "[Settings] Refactor MmsMessagePreferenceController" 2020-03-13 09:08:18 +00:00
Bonian Chen
0971feaeda [Settings] Code Refactor of MobileNetworkPreferenceController 
Code Refactor of MobileNetworkPreferenceController

Bug: 150567855
Test: make
Change-Id: If5de2d0841e2f8705d2e202b6e6a7e53dc1a4897
 2020-03-13 15:58:09 +08:00
Automerger Merge Worker
ddc90f776a Merge "Remove ignore test case" into rvc-dev am: ad30345078 am: e94cbd98ff am: d86df5d487 am: 1d2fee6c5a 
Change-Id: Iacf81df3640c54cdd774309b0d1c3d6f25bc3c06
 2020-03-13 05:57:04 +00:00
Automerger Merge Worker
3ad4eb1014 Merge "Remove ignore test case" into rvc-dev am: ad30345078 am: c0035cfc86 am: 7415aa1ffe 
Change-Id: I29c6cea9576dd03ff5b7f87b1ac9e282f09d617b
 2020-03-13 05:39:37 +00:00
Automerger Merge Worker
526f23e533 Merge "Remove ignore test case" into rvc-dev am: ad30345078 am: e94cbd98ff am: 9d37d5df00 
Change-Id: Iea562ed63fd657a55640cf3085935988d8ad7e04
 2020-03-13 05:39:24 +00:00
Automerger Merge Worker
1d2fee6c5a Merge "Remove ignore test case" into rvc-dev am: ad30345078 am: e94cbd98ff am: d86df5d487 
Change-Id: Ie0d756b795c9f7721f7ca20b03fd7eee5a748d48
 2020-03-13 05:39:17 +00:00
Automerger Merge Worker
7415aa1ffe Merge "Remove ignore test case" into rvc-dev am: ad30345078 am: c0035cfc86 
Change-Id: I9eb7176fce6069dd48caa92fb43b61af1faa40fb
 2020-03-13 05:15:14 +00:00
Automerger Merge Worker
d86df5d487 Merge "Remove ignore test case" into rvc-dev am: ad30345078 am: e94cbd98ff 
Change-Id: I53566a529f76c804004941076c4549ab873b470c
 2020-03-13 05:15:10 +00:00
Automerger Merge Worker
9d37d5df00 Merge "Remove ignore test case" into rvc-dev am: ad30345078 am: e94cbd98ff 
Change-Id: I772373e7815dceac04431d16cb1de055a6d1634e
 2020-03-13 05:14:59 +00:00
Automerger Merge Worker
c0035cfc86 Merge "Remove ignore test case" into rvc-dev am: ad30345078 
Change-Id: I06bae8e189cfb47a95beedbe732822d21975ddc3
 2020-03-13 05:01:47 +00:00
Automerger Merge Worker
e94cbd98ff Merge "Remove ignore test case" into rvc-dev am: ad30345078 
Change-Id: I6f1e2d5f3429c6fccee5d80403e27b445cd40012
 2020-03-13 05:01:38 +00:00
Edgar Wang
3b47408016 Refine remove locale warning dialog string 
- If the first language is not selected, just remove the body copy
  else warning user the locale will change to another language.

Fixes: 140723349
Test: manual & robotest
Change-Id: I9fec17ae85889f2864c3f3cae744f7181e6f9b2c
 2020-03-13 12:49:21 +08:00
Edgar Wang
ad30345078 Merge "Remove ignore test case" into rvc-dev 2020-03-13 04:45:59 +00:00
Automerger Merge Worker
9ffb6e386f Merge "Use values-night to control the dark mode background color" into rvc-dev am: 89a6fafa33 am: 3f6c723044 am: 897eea3bc4 am: e6502b753a 
Change-Id: I2692585d9a4c78c6522d470ada18b8b36533a376
 2020-03-13 04:15:25 +00:00
Automerger Merge Worker
b4169939a1 Merge "Merge "Use values-night to control the dark mode background color" into rvc-dev am: 89a6fafa33 am: 0bfda151bf" into rvc-d1-dev-plus-aosp am: 857f09a45d 
Change-Id: I6581c7ac9073fdd31e9cfcda14fa1992be2e0e9f
 2020-03-13 04:01:32 +00:00
Automerger Merge Worker
f2755520a1 Merge "Use values-night to control the dark mode background color" into rvc-dev am: 89a6fafa33 am: 3f6c723044 am: 2c3ee203bf 
Change-Id: I494bd6614828d3fa8cba87f1bc77ced05d06c89b
 2020-03-13 04:00:33 +00:00
Automerger Merge Worker
e6502b753a Merge "Use values-night to control the dark mode background color" into rvc-dev am: 89a6fafa33 am: 3f6c723044 am: 897eea3bc4 
Change-Id: Ic01687809ab05464a514ffeb4bbfac0c78429829
 2020-03-13 04:00:23 +00:00
Automerger Merge Worker
857f09a45d Merge "Merge "Use values-night to control the dark mode background color" into rvc-dev am: 89a6fafa33 am: 0bfda151bf" into rvc-d1-dev-plus-aosp 2020-03-13 03:40:12 +00:00
Automerger Merge Worker
897eea3bc4 Merge "Use values-night to control the dark mode background color" into rvc-dev am: 89a6fafa33 am: 3f6c723044 
Change-Id: Ic1db6caf15ef6aed31e27bf1aedf19c0dc9a93cc
 2020-03-13 03:40:08 +00:00
Automerger Merge Worker
cceef6428c Merge "Use values-night to control the dark mode background color" into rvc-dev am: 89a6fafa33 am: 0bfda151bf 
Change-Id: I54b0bf1335d21c3b2b45ddb69b175ee4734205f0
 2020-03-13 03:40:03 +00:00
Automerger Merge Worker
2c3ee203bf Merge "Use values-night to control the dark mode background color" into rvc-dev am: 89a6fafa33 am: 3f6c723044 
Change-Id: I5a80461f141c2c96234e05f65b7feb09d20101f3
 2020-03-13 03:39:54 +00:00
Automerger Merge Worker
3f6c723044 Merge "Use values-night to control the dark mode background color" into rvc-dev am: 89a6fafa33 
Change-Id: Iee7a93a3c65d7bdb432937bcc5b81d2f3dd7fa45
 2020-03-13 03:27:02 +00:00
Automerger Merge Worker
0bfda151bf Merge "Use values-night to control the dark mode background color" into rvc-dev am: 89a6fafa33 
Change-Id: I6ecd56f6855cfd160e491472e1c5276deccde92d
 2020-03-13 03:27:00 +00:00
TreeHugger Robot
89a6fafa33 Merge "Use values-night to control the dark mode background color" into rvc-dev 2020-03-13 03:13:27 +00:00
Brad Ebinger
95aeac6790 Set the CHAR_LIMIT to 110 in order to support more translations. 
Increase the CHAR_LIMIT for contact_discovery_opt_in_summary.

Fixes: 150941009
Test: manual
Change-Id: Ia71c87b47ed8b5b738f6d5a9b2693e7943f6797c
 2020-03-12 18:15:54 -07:00
Automerger Merge Worker
45406e4045 Merge "Remove nested scrolling" into rvc-dev am: 4a1f517585 am: ed92f8425d am: 424982b66a am: 00ef0309cf 
Change-Id: Idad7f08ff83965a5425cc579f6668023cdb0b647
 2020-03-12 23:20:41 +00:00
Automerger Merge Worker
77ca303911 Merge "Remove nested scrolling" into rvc-dev am: 4a1f517585 am: 370fd8650d am: 9418cfeb11 
Change-Id: Ie2362eb7aff02d6dcebe889b77e738c9a5ccc9cd
 2020-03-12 23:09:17 +00:00
Automerger Merge Worker
6c090cbd38 Merge "Remove nested scrolling" into rvc-dev am: 4a1f517585 am: ed92f8425d am: 411f8fc4f9 
Change-Id: Idd8f37349077d7b4ea3f7e45f8e54bfc5342c796
 2020-03-12 23:08:59 +00:00
Automerger Merge Worker
00ef0309cf Merge "Remove nested scrolling" into rvc-dev am: 4a1f517585 am: ed92f8425d am: 424982b66a 
Change-Id: Ideabb4637cd2ad3e51f3680418f59b0279daa117
 2020-03-12 23:08:56 +00:00
Automerger Merge Worker
460299b90d Merge "Log some actions for changing wifi hotspot config" into rvc-dev am: 0ad0a50538 am: ec6828f05e am: af05a79dd1 am: 920f07228f 
Change-Id: I0f572dbda8348430f08b46dc62f74c64b9caf28a
 2020-03-12 23:01:06 +00:00
Automerger Merge Worker
af7cd6f85b Mark CHANGE_RESTRICT_SAW_INTENT as logging only am: a84c219c30 am: 9469b91a22 am: f63c3aca11 am: 496773632f 
Change-Id: I3259e2a3968a3706268c5695bea44cef42faa86b
 2020-03-12 22:30:20 +00:00
Automerger Merge Worker
158de66300 Merge "Add policy transparency dialog to 'Remove work profile'" into rvc-dev am: 01d61e49af am: f980963514 am: c477088b78 am: a379802366 
Change-Id: Ic6a370374bf6e21c74dc12019316c9fb248f1b1c
 2020-03-12 22:28:56 +00:00
Automerger Merge Worker
b24e351a84 [automerger skipped] Merge "DO NOT MERGE" into qt-qpr1-dev am: 8697de6be3 -s ours am: 56274ffaa3 am: 1e2416d458 am: 5f99e79af4 am: 2febd6e59f 
Change-Id: Id0997a6e4a479dd8905cbe34c082c019a3b4bc15
 2020-03-12 22:28:46 +00:00
Automerger Merge Worker
bc062e6ead Update ManageExternalStorageDetailsTest setUidMode am: 143ec3ec2b am: 5fe624a009 am: 8fdc20fd87 am: aa1a8dc3a5 
Change-Id: If1ac9026a90b7ae0ece820cfd620a29226ee6a9d
 2020-03-12 22:27:51 +00:00
Automerger Merge Worker
49a1aebd2e [automerger skipped] Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into pi-dev am: f2754332a0 -s ours am: 10caf51f27 -s ours am: 5f2520f685 -s ours am: b2a718f62f -s ours am: 999977ff27 -s ours am: 135d77ae70 -s ours am: 56a95edb34 -s ours 
am skip reason: Change-Id I8070de79a83350d1658efcb19e983669dad0e673 with SHA-1 8d47205577 is in history

Change-Id: I9520022aba9add2ad511ee72fdfce8565218d634
 2020-03-12 22:27:28 +00:00
Automerger Merge Worker
0595d63ad1 [automerger skipped] RESTRICT AUTOMERGE am: 101c9be6c1 -s ours am: a3ddb0c4fb -s ours am: 31933bea45 -s ours am: 18d9d24ee3 -s ours am: 0922e7fdcb -s ours am: 1b2cdfc1e0 -s ours am: 5d170c119a -s ours am: 443230b2bf -s ours 
am skip reason: Change-Id I8070de79a83350d1658efcb19e983669dad0e673 with SHA-1 8d47205577 is in history

Change-Id: Ia6bde83305f2d9e2cb42c1c56daf09b3a5a700c2
 2020-03-12 22:26:55 +00:00
Automerger Merge Worker
2bf6e60e2c [automerger skipped] Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into qt-dev am: 5e788604c2 am: fe302e4867 -s ours am: 6708ebae6d am: bde8ce85e0 am: 74ae03d4a8 am: ca4f008287 
Change-Id: I57ac51cf6511a3f81d19eeb31d323982f42713d6
 2020-03-12 22:26:14 +00:00
Automerger Merge Worker
da81d54de3 [automerger skipped] RESTRICT AUTOMERGE am: 077dd9b07f am: 19ff9101ee -s ours am: 7dc37f978c am: 4cc152835c am: d37f5b5a7a am: 193d8cf727 
Change-Id: Ic6139eaf6bd1ac7cbfd83cdccd620f6a6a0c3601
 2020-03-12 22:26:12 +00:00
Automerger Merge Worker
ee1accc141 [automerger skipped] DO NOT MERGE - Track framework changes to crashApplication am: 36f182159f -s ours am: f816e89f7a -s ours am: c90737a257 -s ours am: 4302d438b0 -s ours am: b167885376 -s ours 
am skip reason: Change-Id Ia613372360f8b32f6ad3b7d2092e7cb27f067fbc with SHA-1 4a89abe279 is in history

Change-Id: I2119c83ff213b8c0d5bc952a5d407b986938f769
 2020-03-12 22:25:00 +00:00
Automerger Merge Worker
9418cfeb11 Merge "Remove nested scrolling" into rvc-dev am: 4a1f517585 am: 370fd8650d 
Change-Id: I02e0044ec62cf7845c453c54c58404fed68281d9
 2020-03-12 22:06:33 +00:00
Automerger Merge Worker
424982b66a Merge "Remove nested scrolling" into rvc-dev am: 4a1f517585 am: ed92f8425d 
Change-Id: Iea8a2da198c79c5a0924d392a7dec6b7da825f89
 2020-03-12 22:06:26 +00:00
Automerger Merge Worker
411f8fc4f9 Merge "Remove nested scrolling" into rvc-dev am: 4a1f517585 am: ed92f8425d 
Change-Id: I3e75a69cae90797ce8b30264fdbde4412b0ff6ee
 2020-03-12 22:06:05 +00:00
Automerger Merge Worker
ed92f8425d Merge "Remove nested scrolling" into rvc-dev am: 4a1f517585 
Change-Id: I391dd964c025de214e6f59bee1a26a6e426de0ac
 2020-03-12 21:53:58 +00:00
Automerger Merge Worker
370fd8650d Merge "Remove nested scrolling" into rvc-dev am: 4a1f517585 
Change-Id: I41ab594af6e0c8e3d66e9440f58ef10283217c31
 2020-03-12 21:53:58 +00:00