Commit Graph

64435 Commits

Author SHA1 Message Date
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
Automerger Merge Worker
7ab0499a38 Merge "Catch crash in mobile network ProgressDialog" am: aaee4539c7 am: 840506e88a am: 2d84cdbc3a am: e6c57426cd am: 7300bab2b6
Bug: 146057372

Change-Id: If80a964d28950288f042d4a1ccfc183b9c4f0067
(cherry picked from commit 0577514d0d)
2020-04-07 11:49:41 +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
Bonian Chen
1df6c9cdd4 [Settings] Code refactor
Remove unused import

Bug: 10956255
Test: build pass
Change-Id: I256870483d85bf7000556357071834cad24884d1
2020-04-07 19:29:49 +08: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
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
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
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
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
Jason Chiu
b12e3b96c9 Support click metrics logs in several pages
- Assign metrics category to perferences at an earlier stage in
  DashboardFragment for better usability.

Bug: 137559984
Test: robotest
Change-Id: Icd4185efa0e655be20c4b673a1380fa42140923f
2020-04-07 16:44:53 +08: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
d6879ac38e Merge "[Settings] Refactor TelephonyConstants" am: 9371311309 am: d998b07a01
Change-Id: Ic323de2fbac45591c80d727b86aadad292c3dc8b
2020-04-07 08:30:59 +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
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
e50b81128d Merge "Button text for app space management is overwritten" am: 1d47b76cb5 am: 41087780ee
Change-Id: Id76cad599bfd29182de1b018e708f3beb7089227
2020-04-07 08:10:43 +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
Tim Peng
6fb4059944 Transferring to a cast device should not close the output switcher
-Close panel only when on pause and stop
-Transfer device would set the play state to "STATE_NONE"
-Add test case

Bug: 152632226
Test: make -j42 RunSettingsRoboTests
Change-Id: Ibf6ce1454b1d5bf3facc07abec15b8735029f2cf
2020-04-07 08:02:30 +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
Tim Peng
2f87c336da Settings crashed by a null worker
-Add worker checker
-Add test case

Bug: 153356562
Test: make -j42 RunSettingsRoboTests
Change-Id: I129ff63a48b3785aacc846fe1dd67a926a8e5e1f
2020-04-07 07:48:38 +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
Arc Wang
29b40334d7 Merge "[Wi-Fi] Index Wi-Fi preferences." into rvc-dev am: c707a93d00 am: c5c5d38005 am: d832fb47e2
Change-Id: Iaa827f84b7e1d7f4d091eabba0ef2ac99d492172
2020-04-07 07:45:24 +00:00
Arc Wang
365c7cd2f0 Merge "[Wi-Fi] Index Wi-Fi preferences." into rvc-dev am: c707a93d00 am: 5b9efb3d2e am: b0b5bbf925
Change-Id: I81998b7e38dc37210241bf726c1c21ea67a51b8d
2020-04-07 07:45:10 +00:00
Arc Wang
d832fb47e2 Merge "[Wi-Fi] Index Wi-Fi preferences." into rvc-dev am: c707a93d00 am: c5c5d38005
Change-Id: I095d7ab59481b39f5836ca25ec445d390a7fa10b
2020-04-07 07:45:02 +00:00
Treehugger Robot
1d47b76cb5 Merge "Button text for app space management is overwritten" 2020-04-07 07:39:37 +00:00
Arc Wang
b0b5bbf925 Merge "[Wi-Fi] Index Wi-Fi preferences." into rvc-dev am: c707a93d00 am: 5b9efb3d2e
Change-Id: Ibb466ca77d7260c20ca0c91025fac788a4fc4995
2020-04-07 07:27:16 +00:00
Jason Chiu
44ab9715c6 Merge "Refine metrics log in infrastructure" into rvc-dev am: 4edb83b260 am: 664adc4691 am: 79303fd5cd am: 0758d7e00c
Change-Id: I8652a0e25e6f776923bad68bc21502b9885eaed6
2020-04-07 07:27:07 +00:00
Jason Hsu
fb17be897f Merge "Add accessibility color inversion help resources to link to existing help page." into rvc-dev am: dfa6cf0d05 am: 5aa7cde292 am: cda683567e am: 3ee44a4d74
Change-Id: I2bd27b30f6d11f34fecf100fe26b19968aa2eb15
2020-04-07 07:26:59 +00:00
Arc Wang
c5c5d38005 Merge "[Wi-Fi] Index Wi-Fi preferences." into rvc-dev am: c707a93d00
Change-Id: If1dc968d1fd0ebca7fbe4dc45c7ab47c3a2f6215
2020-04-07 07:26:45 +00:00
Arc Wang
5b9efb3d2e Merge "[Wi-Fi] Index Wi-Fi preferences." into rvc-dev am: c707a93d00
Change-Id: I57c99292620516bd443d7100fc3afbe703966b97
2020-04-07 07:26:36 +00:00
Arc Wang
c707a93d00 Merge "[Wi-Fi] Index Wi-Fi preferences." into rvc-dev 2020-04-07 07:16:26 +00:00