Commit Graph

64570 Commits

Author SHA1 Message Date
TreeHugger Robot
012fa8528f Merge "Adjust tap targets in history" into rvc-dev am: 7c4557bec8 am: ceac4f44b9 am: 0e33c051c0 am: 801743a362
Change-Id: I30ce8bf6b0a411e8ec6118591665b4d7c3454320
2020-04-07 15:00:12 +00:00
TreeHugger Robot
801743a362 Merge "Adjust tap targets in history" into rvc-dev am: 7c4557bec8 am: ceac4f44b9 am: 0e33c051c0
Change-Id: I3ab64ed6051e3e069adf1a9cdb863f5ffb208193
2020-04-07 14:52:22 +00:00
TreeHugger Robot
0e33c051c0 Merge "Adjust tap targets in history" into rvc-dev am: 7c4557bec8 am: ceac4f44b9
Change-Id: Ib835a71df1f54be8544e4d85f872dd9e43defcba
2020-04-07 14:40:27 +00:00
TreeHugger Robot
ceac4f44b9 Merge "Adjust tap targets in history" into rvc-dev am: 7c4557bec8
Change-Id: I650b9faf069cb50999d1a3d99665ff5d4411b956
2020-04-07 14:24:34 +00:00
TreeHugger Robot
7c4557bec8 Merge "Adjust tap targets in history" into rvc-dev 2020-04-07 14:12:35 +00:00
TreeHugger Robot
7d7e9405c7 Merge "The text on toast should be changed when remains 1 time for SIM lock input" into rvc-dev am: 9a84a2d544 am: 6882062638 am: 9f4acebb5f am: 5b81702572 am: 3fd62755a1
Change-Id: Idd755c48c099975cfbb46739b54ff699bce956fe
2020-04-07 12:17:02 +00:00
TreeHugger Robot
593811a393 Merge "The text on toast should be changed when remains 1 time for SIM lock input" into rvc-dev am: 9a84a2d544 am: 2bf987e586 am: 40a0e05fd4 am: 18e20a058f
Change-Id: I786bff4a23611d7f06052211306650f74fbaecb5
2020-04-07 12:16:51 +00:00
TreeHugger Robot
57ed321169 Merge "The text on toast should be changed when remains 1 time for SIM lock input" into rvc-dev am: 9a84a2d544 am: 6882062638 am: cb0d8ba575 am: c596957b07
Change-Id: Ia752cd84ed9f641e9115c66191619924cde31c32
2020-04-07 12:16:23 +00:00
TreeHugger Robot
3fd62755a1 Merge "The text on toast should be changed when remains 1 time for SIM lock input" into rvc-dev am: 9a84a2d544 am: 6882062638 am: 9f4acebb5f am: 5b81702572
Change-Id: Id2c4b04565609ee64f8a68ee5efa5ebd412bbaff
2020-04-07 12:16:18 +00:00
TreeHugger Robot
18e20a058f Merge "The text on toast should be changed when remains 1 time for SIM lock input" into rvc-dev am: 9a84a2d544 am: 2bf987e586 am: 40a0e05fd4
Change-Id: I3e4499fb0863d56d2f0966f1dd03cc7b2de20b99
2020-04-07 12:01:50 +00:00
TreeHugger Robot
c596957b07 Merge "The text on toast should be changed when remains 1 time for SIM lock input" into rvc-dev am: 9a84a2d544 am: 6882062638 am: cb0d8ba575
Change-Id: I5e74deeb8c8431b896cdc0c194e662ed92ab0c85
2020-04-07 12:01:44 +00:00
TreeHugger Robot
5b81702572 Merge "The text on toast should be changed when remains 1 time for SIM lock input" into rvc-dev am: 9a84a2d544 am: 6882062638 am: 9f4acebb5f
Change-Id: I20bd31116c7d40698c2546bb00d4c3e6564710a8
2020-04-07 12:01:15 +00:00
TreeHugger Robot
40a0e05fd4 Merge "The text on toast should be changed when remains 1 time for SIM lock input" into rvc-dev am: 9a84a2d544 am: 2bf987e586
Change-Id: Ia3b6c4b3b7f0a4abdfca77a2d1ef3ccc0b70f4ef
2020-04-07 11:53:17 +00:00
TreeHugger Robot
9f4acebb5f Merge "The text on toast should be changed when remains 1 time for SIM lock input" into rvc-dev am: 9a84a2d544 am: 6882062638
Change-Id: If7383eeace3677f175e86939ea080db0c8da273c
2020-04-07 11:47:25 +00:00
TreeHugger Robot
cb0d8ba575 Merge "The text on toast should be changed when remains 1 time for SIM lock input" into rvc-dev am: 9a84a2d544 am: 6882062638
Change-Id: I03e4f69f5802783792c27fc79f759d0476288e56
2020-04-07 11:46:54 +00:00
TreeHugger Robot
2bf987e586 Merge "The text on toast should be changed when remains 1 time for SIM lock input" into rvc-dev am: 9a84a2d544
Change-Id: I84afaeb5920c87dce64be375657d769f4770d876
2020-04-07 11:39:56 +00:00
TreeHugger Robot
6882062638 Merge "The text on toast should be changed when remains 1 time for SIM lock input" into rvc-dev am: 9a84a2d544
Change-Id: I275316f28e7cd9027a5e121b76f6af52283c8ad9
2020-04-07 11:39:41 +00:00
TreeHugger Robot
9a84a2d544 Merge "The text on toast should be changed when remains 1 time for SIM lock input" into rvc-dev 2020-04-07 11:23:32 +00:00
TreeHugger Robot
5b086462e9 Merge "Add keywords for system naviagtion setting" into rvc-dev am: e55fe59844 am: a08e2e4976 am: 8c698be978 am: f33b730c53 am: 705610b21a
Change-Id: I59b656c4c1c45cb2be1eb0f4be16f36f14fba028
2020-04-07 11:20:08 +00:00
TreeHugger Robot
35c56b08a6 Merge "Add keywords for system naviagtion setting" into rvc-dev am: e55fe59844 am: 5230f73c24 am: 2b1b3a3235 am: cbfa4ac95e
Change-Id: I0409c200eaa69ea2182e1ef2bc8a057cf3337b5a
2020-04-07 11:19:58 +00:00
TreeHugger Robot
705610b21a Merge "Add keywords for system naviagtion setting" into rvc-dev am: e55fe59844 am: a08e2e4976 am: 8c698be978 am: f33b730c53
Change-Id: I5500fb20d7c41a24c7d957532edf4a8fc0662adc
2020-04-07 11:19:51 +00:00
TreeHugger Robot
826e02af15 Merge "Add keywords for system naviagtion setting" into rvc-dev am: e55fe59844 am: a08e2e4976 am: 818a285564 am: eda0fb7123
Change-Id: Iaa632dca7a1685e733c0c034aec97dac2d78a1f9
2020-04-07 11:19:12 +00:00
TreeHugger Robot
f33b730c53 Merge "Add keywords for system naviagtion setting" into rvc-dev am: e55fe59844 am: a08e2e4976 am: 8c698be978
Change-Id: Id55fbfb85c65e8069b3c37d7f55204ea98f62732
2020-04-07 11:04:17 +00:00
TreeHugger Robot
cbfa4ac95e Merge "Add keywords for system naviagtion setting" into rvc-dev am: e55fe59844 am: 5230f73c24 am: 2b1b3a3235
Change-Id: I4d66ce545dded7857e626cf8107065bbc949e928
2020-04-07 11:04:07 +00:00
TreeHugger Robot
eda0fb7123 Merge "Add keywords for system naviagtion setting" into rvc-dev am: e55fe59844 am: a08e2e4976 am: 818a285564
Change-Id: I5bfd565e46af65a1387d34589f95b87ff336c1cd
2020-04-07 11:03:50 +00:00
TreeHugger Robot
8c698be978 Merge "Add keywords for system naviagtion setting" into rvc-dev am: e55fe59844 am: a08e2e4976
Change-Id: I4b12c37a4e438edae5a3b954cc7e51c73f65a9cc
2020-04-07 10:51:41 +00:00
TreeHugger Robot
2b1b3a3235 Merge "Add keywords for system naviagtion setting" into rvc-dev am: e55fe59844 am: 5230f73c24
Change-Id: I0286f3c98ac3f324ad22199ae41c7b8b26736a22
2020-04-07 10:51:30 +00:00
TreeHugger Robot
818a285564 Merge "Add keywords for system naviagtion setting" into rvc-dev am: e55fe59844 am: a08e2e4976
Change-Id: I945715634aa4723781ae2cdb34cbe889ba55580a
2020-04-07 10:51:08 +00:00
TreeHugger Robot
5230f73c24 Merge "Add keywords for system naviagtion setting" into rvc-dev am: e55fe59844
Change-Id: Iece5c56dd27f2777c725f665b3f14afa5fbc9839
2020-04-07 10:37:52 +00:00
TreeHugger Robot
a08e2e4976 Merge "Add keywords for system naviagtion setting" into rvc-dev am: e55fe59844
Change-Id: Ic357e80726731fad84ee277dfcc33afd8e8373a7
2020-04-07 10:37:43 +00:00
TreeHugger Robot
e55fe59844 Merge "Add keywords for system naviagtion setting" into rvc-dev 2020-04-07 10:22:07 +00:00
Bonian Chen
07f40dceeb [automerger skipped] Merge "[Settings] Refactor TelephonyConstants" am: 9371311309 am: d998b07a01 -s ours am: 54209e0477 -s ours am: de17f8a7f1 -s ours am: 71101c5cbd -s ours
am skip reason: Change-Id If0552d7ce20de5941667aa64e682202aaf32c597 with SHA-1 b1c7e21066 is in history

Change-Id: Iea34db826c246374c7b80fc98b3db047f009162a
2020-04-07 09:17:53 +00:00
Bonian Chen
71101c5cbd [automerger skipped] Merge "[Settings] Refactor TelephonyConstants" am: 9371311309 am: d998b07a01 -s ours am: 54209e0477 -s ours am: de17f8a7f1 -s ours
am skip reason: Change-Id If0552d7ce20de5941667aa64e682202aaf32c597 with SHA-1 b1c7e21066 is in history

Change-Id: Id3f57a4b4d8d2106c754ca23aa163425476a43c9
2020-04-07 09:05:32 +00:00
Treehugger Robot
e207c5a2c8 Merge "Button text for app space management is overwritten" am: 1d47b76cb5 am: 41087780ee am: a801eee2e9 am: 4ddf2ca9da am: 328e54d647
Change-Id: If43022128f5050366603d51246ef45f22f7b0e1a
2020-04-07 08:56:11 +00:00
Tsung-Mao Fang
9c69ded434 The text on toast should be changed when remains 1 time for SIM lock input
This cl was cherry-picked from aosp/585306

The behavior of getQuantityString() is different according to language, it gets
both "other" and "one" string if English is system language. But it always gets
"other" string if non-English, then the "other" string of wrong_pin_code is
shown even if remains 1 time of SIM lock input.

In order to change the string in any language, we add new string for
remains 1 time.

Test: Rebuild rom
Fix: 71783850
Change-Id: If4b53bbbc6b51582bc0837abf4497d9a75ebbaad
2020-04-07 16:54:06 +08:00
Bonian Chen
de17f8a7f1 [automerger skipped] Merge "[Settings] Refactor TelephonyConstants" am: 9371311309 am: d998b07a01 -s ours am: 54209e0477 -s ours
am skip reason: Change-Id If0552d7ce20de5941667aa64e682202aaf32c597 with SHA-1 b1c7e21066 is in history

Change-Id: I17d72b63f5bf87ffeccc114f2cf1c8cda3ba3e1c
2020-04-07 08:47:36 +00:00
Tsung-Mao Fang
73c2a8b76f Add keywords for system naviagtion setting
Fix: 152979084
Test: Open setting search, see system navigation when I typed "swipe"
Change-Id: I2937276f9eb7e9534aa61e2c4b256ce218b99140
2020-04-07 16:39:29 +08:00
Treehugger Robot
328e54d647 Merge "Button text for app space management is overwritten" am: 1d47b76cb5 am: 41087780ee am: a801eee2e9 am: 4ddf2ca9da
Change-Id: I6723473a8bb08eeeff34ebecaaf0f53f35d06746
2020-04-07 08:35:25 +00:00
Bonian Chen
54209e0477 [automerger skipped] Merge "[Settings] Refactor TelephonyConstants" am: 9371311309 am: d998b07a01 -s ours
am skip reason: Change-Id If0552d7ce20de5941667aa64e682202aaf32c597 with SHA-1 b1c7e21066 is in history

Change-Id: I9b62bcb7acaa2987681aaa8f921877f24222d3c4
2020-04-07 08:30:35 +00:00
Treehugger Robot
4ddf2ca9da Merge "Button text for app space management is overwritten" am: 1d47b76cb5 am: 41087780ee am: a801eee2e9
Change-Id: Ib3a2ea09b523f818359cd5b650c07a8bdeb2b5ea
2020-04-07 08:23:43 +00:00
Arc Wang
46799b06b9 Merge "[Wi-Fi] Index Wi-Fi preferences." into rvc-dev am: c707a93d00 am: c5c5d38005 am: b3cda50ae8 am: 78b1fc5efa am: 5db3701d12
Change-Id: I0994f4ed0c43e2408c6a45d6f9964477cf2e72b2
2020-04-07 08:23:16 +00:00
Bonian Chen
d998b07a01 Merge "[Settings] Refactor TelephonyConstants" am: 9371311309
Change-Id: I58dad89c087419ff07438ba02d08cde9d0e874ca
2020-04-07 08:15:41 +00:00
Arc Wang
5db3701d12 Merge "[Wi-Fi] Index Wi-Fi preferences." into rvc-dev am: c707a93d00 am: c5c5d38005 am: b3cda50ae8 am: 78b1fc5efa
Change-Id: I27055d7cdc3ff3ee6f72b9e7019ef168e5e888bb
2020-04-07 08:11:12 +00:00
Treehugger Robot
a801eee2e9 Merge "Button text for app space management is overwritten" am: 1d47b76cb5 am: 41087780ee
Change-Id: I526f17f1ba6f6c2502ce8691f38319828c3dc378
2020-04-07 08:10:22 +00:00
Bonian Chen
9371311309 Merge "[Settings] Refactor TelephonyConstants" 2020-04-07 08:05:32 +00:00
Arc Wang
a40d9ea837 Merge "[Wi-Fi] Index Wi-Fi preferences." into rvc-dev am: c707a93d00 am: c5c5d38005 am: d832fb47e2 am: 29b40334d7
Change-Id: I55e77762aa1ab0ccb8578e4be530316a9c1c39de
2020-04-07 08:00:02 +00:00
Arc Wang
59348f2400 Merge "[Wi-Fi] Index Wi-Fi preferences." into rvc-dev am: c707a93d00 am: 5b9efb3d2e am: b0b5bbf925 am: 365c7cd2f0
Change-Id: I2db444b28ef3b264bb4fdf34abd426ef1e19058d
2020-04-07 07:59:25 +00:00
Treehugger Robot
41087780ee Merge "Button text for app space management is overwritten" am: 1d47b76cb5
Change-Id: Ibd3486cb9338e910049e1e2bc9febb751575320b
2020-04-07 07:58:27 +00:00
Arc Wang
78b1fc5efa Merge "[Wi-Fi] Index Wi-Fi preferences." into rvc-dev am: c707a93d00 am: c5c5d38005 am: b3cda50ae8
Change-Id: Ia9590a7e6067052406b17d186086e80dcd37c0dd
2020-04-07 07:58:16 +00:00
Arc Wang
b3cda50ae8 Merge "[Wi-Fi] Index Wi-Fi preferences." into rvc-dev am: c707a93d00 am: c5c5d38005
Change-Id: If3e0fe6de11a6e072518b69d442802bcc4e51ce9
2020-04-07 07:45:31 +00:00