Commit Graph

59496 Commits

Author SHA1 Message Date
Automerger Merge Worker
2ef7880b35 Merge "Let footer with learn more become selectable" into rvc-dev am: 9408533075 am: 3e5efba257 am: 7d8c70a4c6
Change-Id: Id4c7a4bf07a029baa37a370f03183105723afe39
2020-02-27 06:11:47 +00:00
Automerger Merge Worker
7af7d1bded Merge "Let footer with learn more become selectable" into rvc-dev am: 9408533075 am: 7e33c3e968 am: 20e9c2de4f
Change-Id: Id827e7460bf2dcef56c09d0ab73f83482f509e8f
2020-02-27 06:11:37 +00:00
Automerger Merge Worker
ec1b868e0a Merge "Let footer with learn more become selectable" into rvc-dev am: 9408533075 am: 7e33c3e968 am: e8dd783105
Change-Id: I997e5ffbc807ecfb3c9d97d692522c1c53865ee1
2020-02-27 06:11:27 +00:00
Betty Chang
efe4cc3db4 Merge "[Telephony Setting] Add supplementary conditions for CDMA display IMEI info when subscriptionInfo is null" into qt-qpr1-dev 2020-02-27 06:10:25 +00:00
Betty Chang
49f3da75cc Merge "[Telephony Setting] Add supplementary conditions for CDMA display IMEI info when subscriptionInfo is null" 2020-02-27 06:10:04 +00:00
Automerger Merge Worker
7d8c70a4c6 Merge "Let footer with learn more become selectable" into rvc-dev am: 9408533075 am: 3e5efba257
Change-Id: I315d61677b865bc6aee33ede80081772fbc00d9a
2020-02-27 05:56:42 +00:00
Automerger Merge Worker
20e9c2de4f Merge "Let footer with learn more become selectable" into rvc-dev am: 9408533075 am: 7e33c3e968
Change-Id: I04972b7b23d68f0c7c7ff953d5d35b25c0ae8dd7
2020-02-27 05:56:07 +00:00
Automerger Merge Worker
e8dd783105 Merge "Let footer with learn more become selectable" into rvc-dev am: 9408533075 am: 7e33c3e968
Change-Id: I6a991866d1d434c2a0fbebce874f2de9ab3dd285
2020-02-27 05:55:52 +00:00
Automerger Merge Worker
7e33c3e968 Merge "Let footer with learn more become selectable" into rvc-dev am: 9408533075
Change-Id: I60fe94ad8b1f44c73857df0ad428b9c1fba3da2a
2020-02-27 05:38:54 +00:00
Automerger Merge Worker
3e5efba257 Merge "Let footer with learn more become selectable" into rvc-dev am: 9408533075
Change-Id: Iaed39509cbc4011758e240cdefd2d23a44bdb4c6
2020-02-27 05:38:35 +00:00
TreeHugger Robot
9408533075 Merge "Let footer with learn more become selectable" into rvc-dev 2020-02-27 05:27:26 +00:00
Automerger Merge Worker
2139bea8b1 Merge "Fixes incorrect settings usages in AdaptiveSleepPreferenceController" into rvc-dev am: d20ca89728 am: 2a428bbe48 am: 52731ec548 am: 942981924c
Change-Id: I30db25cfb385205d96275b6488885ed03c2c7469
2020-02-27 04:40:56 +00:00
Automerger Merge Worker
14fd5c9284 Merge "Merge "Fixes incorrect settings usages in AdaptiveSleepPreferenceController" into rvc-dev am: d20ca89728 am: 64f8f95178 am: 853f56ddf6" into rvc-qpr-dev-plus-aosp am: e4cc6e2f00
Change-Id: I9eb0f156a8cde8c03b0af5b29370a3021eedd718
2020-02-27 04:40:50 +00:00
Automerger Merge Worker
32c2da7d2e Merge "Merge "Fixes incorrect settings usages in AdaptiveSleepPreferenceController" into rvc-dev am: d20ca89728 am: 64f8f95178" into rvc-d1-dev-plus-aosp am: 79dc71bdfc am: 03bea8f0e0
Change-Id: Iee7361cc1325154d8971aaeb556a7ebd2212cd23
2020-02-27 04:40:20 +00:00
Automerger Merge Worker
37c20fc401 Merge "Merge "[Wi-Fi] Apply new mock for supporting WiFi detail page for OpenRoaming feature." into rvc-dev am: 640245cda6 am: 3b67e90aa5 am: 5f89cb0f4a" into rvc-qpr-dev-plus-aosp am: aaa31daa76
Change-Id: Id5e13a3e3b1abab1bb85d769a39a2127cafc55a5
2020-02-27 04:39:54 +00:00
Automerger Merge Worker
6fd450320c Merge "[Wi-Fi] Apply new mock for supporting WiFi detail page for OpenRoaming feature." into rvc-dev am: 640245cda6 am: 02790d5285 am: 350ce54f14 am: 13d1a1d40a
Change-Id: I59ca786d6124202701d3aad6c8024534d5e7769a
2020-02-27 04:39:37 +00:00
Automerger Merge Worker
b71753f4e9 Merge "[Wi-Fi] Apply new mock for supporting WiFi detail page for OpenRoaming feature." into rvc-dev am: 640245cda6 am: 3b67e90aa5 am: a642ed8dba am: ab139d4620
Change-Id: I76030197c101393b1fd98da1b4bf6bea2a1c804f
2020-02-27 04:38:45 +00:00
Lee Chou
80d8c3bc83 Fixes ApnEditor not restoring previous UI
ApnEditor tries read and set the UI in onCreate, before the previous
bundle is restored. This caused problems when the configuration has
changed (such as switching to Dark Theme).

This moves the UI changes to onViewRestored

Fixes: 146399432
Test: make SettingsGoogle and manual test UI
Change-Id: I8147ec96569fa28867c088d6c36584aa344f40ed
Merged-In: I8147ec96569fa28867c088d6c36584aa344f40ed
2020-02-27 12:33:16 +08:00
Automerger Merge Worker
942981924c Merge "Fixes incorrect settings usages in AdaptiveSleepPreferenceController" into rvc-dev am: d20ca89728 am: 2a428bbe48 am: 52731ec548
Change-Id: I42316ad946e3401e5020e703b636b7905c72e37b
2020-02-27 03:58:58 +00:00
Automerger Merge Worker
e4cc6e2f00 Merge "Merge "Fixes incorrect settings usages in AdaptiveSleepPreferenceController" into rvc-dev am: d20ca89728 am: 64f8f95178 am: 853f56ddf6" into rvc-qpr-dev-plus-aosp 2020-02-27 03:58:57 +00:00
Automerger Merge Worker
a896fd8429 Merge "Fixes incorrect settings usages in AdaptiveSleepPreferenceController" into rvc-dev am: d20ca89728 am: 64f8f95178 am: 853f56ddf6
Change-Id: I6ed4d7580267ce76007f7cbee5ae99a5b468d6b5
2020-02-27 03:58:53 +00:00
Automerger Merge Worker
03bea8f0e0 Merge "Merge "Fixes incorrect settings usages in AdaptiveSleepPreferenceController" into rvc-dev am: d20ca89728 am: 64f8f95178" into rvc-d1-dev-plus-aosp am: 79dc71bdfc
Change-Id: Ia03d42cbe12887a0b2689a8bc73edf7dc2593b99
2020-02-27 03:58:52 +00:00
Automerger Merge Worker
aaa31daa76 Merge "Merge "[Wi-Fi] Apply new mock for supporting WiFi detail page for OpenRoaming feature." into rvc-dev am: 640245cda6 am: 3b67e90aa5 am: 5f89cb0f4a" into rvc-qpr-dev-plus-aosp 2020-02-27 03:58:51 +00:00
Automerger Merge Worker
bc830c55a2 Merge "[Wi-Fi] Apply new mock for supporting WiFi detail page for OpenRoaming feature." into rvc-dev am: 640245cda6 am: 3b67e90aa5 am: 5f89cb0f4a
Change-Id: I06302d594db31c5f8457432c4aa151d4102ba03a
2020-02-27 03:58:48 +00:00
Automerger Merge Worker
13d1a1d40a Merge "[Wi-Fi] Apply new mock for supporting WiFi detail page for OpenRoaming feature." into rvc-dev am: 640245cda6 am: 02790d5285 am: 350ce54f14
Change-Id: I846297138778fbd3dd61ed47ff45b5337cbc5d6a
2020-02-27 03:58:45 +00:00
Automerger Merge Worker
ab139d4620 Merge "[Wi-Fi] Apply new mock for supporting WiFi detail page for OpenRoaming feature." into rvc-dev am: 640245cda6 am: 3b67e90aa5 am: a642ed8dba
Change-Id: I5fb737abb49bec78c9bb0cc51895c0313be82ed3
2020-02-27 03:58:30 +00:00
Lee Chou
c12b1b40ee Fixes ApnEditor not restoring previous UI
ApnEditor tries read and set the UI in onCreate, before the previous bundle
is restored. This caused problems when the configuration has changed (such
as switching to Dark Theme).

This moves the UI changes to onViewRestored

Fixes: 146399432
Test: make SettingsGoogle and manual test UI
Change-Id: I8147ec96569fa28867c088d6c36584aa344f40ed
2020-02-27 11:50:03 +08:00
Automerger Merge Worker
52731ec548 Merge "Fixes incorrect settings usages in AdaptiveSleepPreferenceController" into rvc-dev am: d20ca89728 am: 2a428bbe48
Change-Id: I7527ad64e192cd01ad7f54f1c48b49da5eb9a714
2020-02-27 03:45:33 +00:00
Automerger Merge Worker
853f56ddf6 Merge "Fixes incorrect settings usages in AdaptiveSleepPreferenceController" into rvc-dev am: d20ca89728 am: 64f8f95178
Change-Id: I689b513ea5145a6eb1736a4db69c8087318537b2
2020-02-27 03:44:27 +00:00
Automerger Merge Worker
79dc71bdfc Merge "Merge "Fixes incorrect settings usages in AdaptiveSleepPreferenceController" into rvc-dev am: d20ca89728 am: 64f8f95178" into rvc-d1-dev-plus-aosp 2020-02-27 03:44:26 +00:00
Automerger Merge Worker
5805974b93 Merge "Fixes incorrect settings usages in AdaptiveSleepPreferenceController" into rvc-dev am: d20ca89728 am: 64f8f95178
Change-Id: I82cc783d9990e9d16c7ecf2e4511aa0c8824fe56
2020-02-27 03:44:23 +00:00
Automerger Merge Worker
5f89cb0f4a Merge "[Wi-Fi] Apply new mock for supporting WiFi detail page for OpenRoaming feature." into rvc-dev am: 640245cda6 am: 3b67e90aa5
Change-Id: I47601b56b513cd239d4a96cadd9a79d804575421
2020-02-27 03:44:22 +00:00
Automerger Merge Worker
350ce54f14 Merge "[Wi-Fi] Apply new mock for supporting WiFi detail page for OpenRoaming feature." into rvc-dev am: 640245cda6 am: 02790d5285
Change-Id: I2b5d39a38724c8c0df00171c3cd723a705b53940
2020-02-27 03:44:21 +00:00
Automerger Merge Worker
a642ed8dba Merge "[Wi-Fi] Apply new mock for supporting WiFi detail page for OpenRoaming feature." into rvc-dev am: 640245cda6 am: 3b67e90aa5
Change-Id: I8cb33aed6148d23d59f5757da26c40cbd602242d
2020-02-27 03:44:12 +00:00
Automerger Merge Worker
2a428bbe48 Merge "Fixes incorrect settings usages in AdaptiveSleepPreferenceController" into rvc-dev am: d20ca89728
Change-Id: I1a1a8c59a254fea7267dcf1be555573cf8c7c62a
2020-02-27 03:35:21 +00:00
Automerger Merge Worker
64f8f95178 Merge "Fixes incorrect settings usages in AdaptiveSleepPreferenceController" into rvc-dev am: d20ca89728
Change-Id: Ic9c13f75c7cfc12f6049ed671128f4fc8baa264a
2020-02-27 03:35:00 +00:00
TreeHugger Robot
d20ca89728 Merge "Fixes incorrect settings usages in AdaptiveSleepPreferenceController" into rvc-dev 2020-02-27 03:29:20 +00:00
Automerger Merge Worker
3b67e90aa5 Merge "[Wi-Fi] Apply new mock for supporting WiFi detail page for OpenRoaming feature." into rvc-dev am: 640245cda6
Change-Id: I57ab4ac108c5bebfaca5a18a0b9400bbd92a1822
2020-02-27 03:26:27 +00:00
Automerger Merge Worker
02790d5285 Merge "[Wi-Fi] Apply new mock for supporting WiFi detail page for OpenRoaming feature." into rvc-dev am: 640245cda6
Change-Id: I833d625652995ee1d8434935772d825e3a5c1a3d
2020-02-27 03:26:19 +00:00
Automerger Merge Worker
16934efca0 Merge "Launch output switcher with media package information" into rvc-dev am: b6c8fab86f am: 424965f608 am: dc3a744401 am: 10a84a365b
Change-Id: Icea05b158bdb7d7cf81ecc50069ae069f768316a
2020-02-27 03:17:55 +00:00
Automerger Merge Worker
620314625d Merge "Launch output switcher with media package information" into rvc-dev am: b6c8fab86f am: a8e4c9a7f3 am: b89c028b6d am: e1dc9058fe
Change-Id: I08f1f71f6a9f6539aea041d1164b11b4c54ba7e3
2020-02-27 03:17:31 +00:00
Automerger Merge Worker
71a3a316a5 Merge "Launch output switcher with media package information" into rvc-dev am: b6c8fab86f am: a8e4c9a7f3 am: 5d4e63734e am: b91c0a90dc
Change-Id: I5c3d640cebd486da4bebbcab715a9029f46242e5
2020-02-27 03:16:52 +00:00
TreeHugger Robot
640245cda6 Merge "[Wi-Fi] Apply new mock for supporting WiFi detail page for OpenRoaming feature." into rvc-dev 2020-02-27 03:15:29 +00:00
Automerger Merge Worker
10a84a365b Merge "Launch output switcher with media package information" into rvc-dev am: b6c8fab86f am: 424965f608 am: dc3a744401
Change-Id: I15f94569b4bca844245501f1f2f6ce0f64c0f5eb
2020-02-27 03:01:38 +00:00
Automerger Merge Worker
e1dc9058fe Merge "Launch output switcher with media package information" into rvc-dev am: b6c8fab86f am: a8e4c9a7f3 am: b89c028b6d
Change-Id: Ia5ff1233bde1170996343f8d916d86cf04f3c89e
2020-02-27 03:00:46 +00:00
Automerger Merge Worker
b91c0a90dc Merge "Launch output switcher with media package information" into rvc-dev am: b6c8fab86f am: a8e4c9a7f3 am: 5d4e63734e
Change-Id: I3f58b9bc451dcd9ec9f0fad32a5b552ddb9bf7ca
2020-02-27 03:00:31 +00:00
Automerger Merge Worker
dc3a744401 Merge "Launch output switcher with media package information" into rvc-dev am: b6c8fab86f am: 424965f608
Change-Id: I728b99f27a051bf55e31145cff26d851c4cc9fe3
2020-02-27 02:45:34 +00:00
Automerger Merge Worker
b89c028b6d Merge "Launch output switcher with media package information" into rvc-dev am: b6c8fab86f am: a8e4c9a7f3
Change-Id: I3c0fb3002cf73110060dbff2d3095eebe08d1362
2020-02-27 02:45:29 +00:00
Automerger Merge Worker
5d4e63734e Merge "Launch output switcher with media package information" into rvc-dev am: b6c8fab86f am: a8e4c9a7f3
Change-Id: Id35bebf502550f06fae410382c63d5267e9edd73
2020-02-27 02:45:22 +00:00
Automerger Merge Worker
5a56ff6645 Merge "Increase size of touch target" into rvc-dev am: e28bd9d6d9 am: 63f67ffb1a am: 915900ccdf am: 4ed77a80dd
Change-Id: Ibda50be6293e68b65f35d86e7b08125d568e7b50
2020-02-27 02:39:06 +00:00