Commit Graph

59555 Commits

Author SHA1 Message Date
Automerger Merge Worker
6c38423605 Merge "Fixes ApnEditor not restoring previous UI" into rvc-dev am: 2f492604e5 am: 4a791935a6
Change-Id: Id1c73a5a0faab9cfa7089cee7be81a35325eefbe
2020-02-27 09:08:13 +00:00
Automerger Merge Worker
1c4f76ec18 Merge "Fixes ApnEditor not restoring previous UI" into rvc-dev am: 2f492604e5 am: 554b10a866
Change-Id: I86ded0cbe8c2b3960c7df9d4baeb14cc26a38e2f
2020-02-27 09:07:55 +00:00
Automerger Merge Worker
6820c6e8f5 Merge "Fixes ApnEditor not restoring previous UI" into rvc-dev am: 2f492604e5 am: 554b10a866
Change-Id: I322771c42e3890b57e3fa4b72f56023c0096c875
2020-02-27 09:07:54 +00:00
Automerger Merge Worker
9ac493094e Merge "Fixes ApnEditor not restoring previous UI" am: cd4ca97828
Change-Id: I20438b787bb2424cc4455c476e5f6bd95d559d87
2020-02-27 09:02:56 +00:00
Automerger Merge Worker
4a791935a6 Merge "Fixes ApnEditor not restoring previous UI" into rvc-dev am: 2f492604e5
Change-Id: If2e85409f09d02876a496af93f76a2753e493da9
2020-02-27 08:55:25 +00:00
Automerger Merge Worker
554b10a866 Merge "Fixes ApnEditor not restoring previous UI" into rvc-dev am: 2f492604e5
Change-Id: I4947e650122998b51413fc81397a6728f9ef837b
2020-02-27 08:55:13 +00:00
Treehugger Robot
cd4ca97828 Merge "Fixes ApnEditor not restoring previous UI" 2020-02-27 08:50:37 +00:00
TreeHugger Robot
2f492604e5 Merge "Fixes ApnEditor not restoring previous UI" into rvc-dev 2020-02-27 08:41:57 +00:00
Arc Wang
9b69fd17bf [Wi-Fi] Fix data usage screen flash 1~2 times problem
Data loaders should be destroyed at onPause or
the APP list will be updated twice.

Bug: 146841747
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataUsageListTest
Change-Id: Ic1b8ef443dd8e50777f1e3a16977add654748c54
2020-02-27 16:18:04 +08:00
Tim Peng
3405c3dfa9 Change volume panel title from "Volume" to "Sound"
Bug: 150337735
Test: manual
Change-Id: Icc457c2c1aae21282261549de47eeaf9c7219887
2020-02-27 08:11:39 +00:00
Automerger Merge Worker
77a7e01609 Merge "Accessibility Service & Shortcut Redesign - Remove “volume key shortcut” setting (5/n)" into rvc-dev am: c023e758f7 am: 8c131f3213 am: dc8597abc0
Change-Id: Ic8cc77addb6aaa871f4137ebd32586fbfbef18de
2020-02-27 07:47:04 +00:00
Automerger Merge Worker
afeb69eefb Merge "Accessibility Service & Shortcut Redesign - Remove “volume key shortcut” setting (5/n)" into rvc-dev am: c023e758f7 am: 7cef543f21 am: 26a84c1a46
Change-Id: If6daeafa9edb7504f779c9608c16c6be7da751be
2020-02-27 07:47:00 +00:00
Automerger Merge Worker
1d6fcee05e Merge "Accessibility Service & Shortcut Redesign - Remove “volume key shortcut” setting (5/n)" into rvc-dev am: c023e758f7 am: 8c131f3213 am: d7ba7964c1
Change-Id: Id74d916099278dc9226db3b6381d400e93e7be10
2020-02-27 07:46:55 +00:00
Automerger Merge Worker
26a84c1a46 Merge "Accessibility Service & Shortcut Redesign - Remove “volume key shortcut” setting (5/n)" into rvc-dev am: c023e758f7 am: 7cef543f21
Change-Id: Idce28e518850dfe686b21ce5eef34e334a3cd75a
2020-02-27 07:34:54 +00:00
Automerger Merge Worker
dc8597abc0 Merge "Accessibility Service & Shortcut Redesign - Remove “volume key shortcut” setting (5/n)" into rvc-dev am: c023e758f7 am: 8c131f3213
Change-Id: I5553443a9b25d1f3e32121d51d0fb3347501cdbc
2020-02-27 07:34:40 +00:00
Automerger Merge Worker
d7ba7964c1 Merge "Accessibility Service & Shortcut Redesign - Remove “volume key shortcut” setting (5/n)" into rvc-dev am: c023e758f7 am: 8c131f3213
Change-Id: If6a6f5eccc086139583a5a3a8fab65050ad6c590
2020-02-27 07:34:40 +00:00
Automerger Merge Worker
7ac59cda41 Merge "Call releaseSession() when "stop casting" button click" into rvc-dev am: 63105b36a7 am: dbf643c5e9 am: d3bf448f40
Change-Id: I76c3843c64190d7633844ae7ff53c8c3e55fb042
2020-02-27 07:21:28 +00:00
Automerger Merge Worker
c1fa4a9889 Merge "Call releaseSession() when "stop casting" button click" into rvc-dev am: 63105b36a7 am: 7367bb4f2f am: 07c3fd058f
Change-Id: I8320bf776525176aadd9b5afc5d6899fe7ed0fd2
2020-02-27 07:21:00 +00:00
Automerger Merge Worker
8a9b719705 Merge "Merge "[Telephony Setting] Add supplementary conditions for CDMA display IMEI info when subscriptionInfo is null" into qt-qpr1-dev am: efe4cc3db4 am: 23d5e32943 am: 71f6ccd61a" into rvc-d1-dev-plus-aosp am: 8e478b7247
Change-Id: I03c110fb906f8d91da134c74bee5f3bfc6c83621
2020-02-27 07:20:43 +00:00
Automerger Merge Worker
1fcd257e80 Merge "Call releaseSession() when "stop casting" button click" into rvc-dev am: 63105b36a7 am: 7367bb4f2f am: 4278ed856f
Change-Id: I78b21c0b757b75ad0d0973d3abf7a412aa600679
2020-02-27 07:20:21 +00:00
Automerger Merge Worker
31826aa648 Merge "[Telephony Setting] Add supplementary conditions for CDMA display IMEI info when subscriptionInfo is null" into qt-qpr1-dev am: efe4cc3db4 am: 23d5e32943 am: 155fd0ce61 am: ee14b37f5f
Change-Id: I7b0f40443abcbeb4c1155908f0a51ba15034493f
2020-02-27 07:20:08 +00:00
Automerger Merge Worker
2d8cc7d8d0 Merge "[Telephony Setting] Add supplementary conditions for CDMA display IMEI info when subscriptionInfo is null" into qt-qpr1-dev am: efe4cc3db4 am: 23d5e32943 am: 155fd0ce61 am: c586f9f7be
Change-Id: I0a7eeaf2e0c1d2625b2d43aed0cb5ccaad8b82c9
2020-02-27 07:19:58 +00:00
Automerger Merge Worker
7cef543f21 Merge "Accessibility Service & Shortcut Redesign - Remove “volume key shortcut” setting (5/n)" into rvc-dev am: c023e758f7
Change-Id: I1201bf090cbf65a6aa1584c4078e7fdee11aef68
2020-02-27 07:19:52 +00:00
Automerger Merge Worker
8c131f3213 Merge "Accessibility Service & Shortcut Redesign - Remove “volume key shortcut” setting (5/n)" into rvc-dev am: c023e758f7
Change-Id: Idbb5eae9bd8183c5889c97adf46093c04dd00b9f
2020-02-27 07:19:48 +00:00
Automerger Merge Worker
4278ed856f Merge "Call releaseSession() when "stop casting" button click" into rvc-dev am: 63105b36a7 am: 7367bb4f2f
Change-Id: I76b9651da7fe68dc79fb90b649768bd06fa9953f
2020-02-27 06:58:10 +00:00
Automerger Merge Worker
d3bf448f40 Merge "Call releaseSession() when "stop casting" button click" into rvc-dev am: 63105b36a7 am: dbf643c5e9
Change-Id: Id284fb7b4c2907549132b67d2970e2cd7bfa715d
2020-02-27 06:58:09 +00:00
Automerger Merge Worker
ee14b37f5f Merge "[Telephony Setting] Add supplementary conditions for CDMA display IMEI info when subscriptionInfo is null" into qt-qpr1-dev am: efe4cc3db4 am: 23d5e32943 am: 155fd0ce61
Change-Id: Ib2e3d9bcf37586c92326d01ed0f5154b115f6d9f
2020-02-27 06:57:50 +00:00
Automerger Merge Worker
07c3fd058f Merge "Call releaseSession() when "stop casting" button click" into rvc-dev am: 63105b36a7 am: 7367bb4f2f
Change-Id: Ib0107cb103ece3b1bc82eb9d1b029f1f25e50bae
2020-02-27 06:57:48 +00:00
Automerger Merge Worker
8e478b7247 Merge "Merge "[Telephony Setting] Add supplementary conditions for CDMA display IMEI info when subscriptionInfo is null" into qt-qpr1-dev am: efe4cc3db4 am: 23d5e32943 am: 71f6ccd61a" into rvc-d1-dev-plus-aosp 2020-02-27 06:57:45 +00:00
Automerger Merge Worker
e92f62030e Merge "[Telephony Setting] Add supplementary conditions for CDMA display IMEI info when subscriptionInfo is null" into qt-qpr1-dev am: efe4cc3db4 am: 23d5e32943 am: 71f6ccd61a
Change-Id: Ifd985b85de7f1e16652484d8742729406196a9a4
2020-02-27 06:57:42 +00:00
Automerger Merge Worker
c586f9f7be Merge "[Telephony Setting] Add supplementary conditions for CDMA display IMEI info when subscriptionInfo is null" into qt-qpr1-dev am: efe4cc3db4 am: 23d5e32943 am: 155fd0ce61
Change-Id: I832ec03cc05bd9ca6bad3eb336221c640d861af9
2020-02-27 06:57:35 +00:00
TreeHugger Robot
c023e758f7 Merge "Accessibility Service & Shortcut Redesign - Remove “volume key shortcut” setting (5/n)" into rvc-dev 2020-02-27 06:57:22 +00:00
Automerger Merge Worker
dbf643c5e9 Merge "Call releaseSession() when "stop casting" button click" into rvc-dev am: 63105b36a7
Change-Id: I1b6a7e48fdf94f62cd83899718b8e5c233e7e211
2020-02-27 06:46:33 +00:00
Automerger Merge Worker
7367bb4f2f Merge "Call releaseSession() when "stop casting" button click" into rvc-dev am: 63105b36a7
Change-Id: Ie2b32661845ac31ba856d11b6003879f7e919a4a
2020-02-27 06:46:31 +00:00
TreeHugger Robot
63105b36a7 Merge "Call releaseSession() when "stop casting" button click" into rvc-dev 2020-02-27 06:42:25 +00:00
Automerger Merge Worker
155fd0ce61 Merge "[Telephony Setting] Add supplementary conditions for CDMA display IMEI info when subscriptionInfo is null" into qt-qpr1-dev am: efe4cc3db4 am: 23d5e32943
Change-Id: Id7354273a08808f7d59d2cee380392b8dce014bd
2020-02-27 06:40:40 +00:00
Automerger Merge Worker
71f6ccd61a Merge "[Telephony Setting] Add supplementary conditions for CDMA display IMEI info when subscriptionInfo is null" into qt-qpr1-dev am: efe4cc3db4 am: 23d5e32943
Change-Id: Ie29d41ddd7387380708acdc0a313f000da280193
2020-02-27 06:40:38 +00:00
Automerger Merge Worker
23d5e32943 Merge "[Telephony Setting] Add supplementary conditions for CDMA display IMEI info when subscriptionInfo is null" into qt-qpr1-dev am: efe4cc3db4
Change-Id: I11f38c08c75c835821e92e761750ffb211b3b98e
2020-02-27 06:25:22 +00:00
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
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
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