PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
59,300 Commits 1 Branch 0 Tags
7761f504ecb7f14f2ad86ab05452e1710ef12410
Commit Graph

59300 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
7761f504ec Merge "Support updated rendering of conversation icons." into rvc-dev am: c1f6891ef3 am: eb036399eb 
Change-Id: I8470280421e805d398236550a668afa5829c18d6
 2020-02-28 00:34:28 +00:00
Automerger Merge Worker
eb036399eb Merge "Support updated rendering of conversation icons." into rvc-dev am: c1f6891ef3 
Change-Id: I1c94629f0d01ada4c0a6444ab11aa685a7414f4b
 2020-02-28 00:26:23 +00:00
Daniel Sandler
c1f6891ef3 Merge "Support updated rendering of conversation icons." into rvc-dev 2020-02-28 00:26:10 +00:00
Automerger Merge Worker
bbab2a3873 Merge "Unhide work profile icon" into rvc-dev am: 7b9101e6a8 am: 52be7605c1 
Change-Id: I1e26b6f490b721c7f6926cf5a0b3888a38223597
 2020-02-27 21:50:12 +00:00
Automerger Merge Worker
32ab3a1853 Merge "Unhide work profile icon" into rvc-dev am: 7b9101e6a8 am: 4d3c4518e0 
Change-Id: Ib8df9d0b2ed001e302ddd22229f1de0f88ff06eb
 2020-02-27 21:47:25 +00:00
Automerger Merge Worker
4d3c4518e0 Merge "Unhide work profile icon" into rvc-dev am: 7b9101e6a8 
Change-Id: Iebe5c8a425ac02ed99ea8fd468e870cdf6ddac19
 2020-02-27 21:34:45 +00:00
Automerger Merge Worker
52be7605c1 Merge "Unhide work profile icon" into rvc-dev am: 7b9101e6a8 
Change-Id: I76f743fcdd60e45fd5fc8084d86efd8005c33dbc
 2020-02-27 21:34:25 +00:00
Julia Reynolds
7b9101e6a8 Merge "Unhide work profile icon" into rvc-dev 2020-02-27 21:27:08 +00:00
Julia Reynolds
323e9315d3 Unhide work profile icon 
Test: Manual, dismiss work profile notif, look at history
Fixes: 150361222
Change-Id: I7bf17b400f084f5e1a0763c2b6d1ebe69c78b9c2
 2020-02-27 11:12:46 -05:00
Automerger Merge Worker
07d2bbaa8a Merge "[Settings] "Data during calls" in DDS SUB is still in advanced option." into rvc-dev am: 0c3bd003d0 am: c86e3124d4 
Change-Id: Ibc384b968d9821763dffb077bc60d5a2cb36eb08
 2020-02-27 15:58:54 +00:00
Automerger Merge Worker
d6b261c49e Merge "[Settings] "Data during calls" in DDS SUB is still in advanced option." into rvc-dev am: 0c3bd003d0 am: 15dbc718e1 
Change-Id: I38cf1e8f818084261759f2aca0c9d21f2c34e82d
 2020-02-27 15:58:41 +00:00
Automerger Merge Worker
c86e3124d4 Merge "[Settings] "Data during calls" in DDS SUB is still in advanced option." into rvc-dev am: 0c3bd003d0 
Change-Id: I97d2c2c3e80af00c64a54cfb7a6c0e844b2610a6
 2020-02-27 15:49:31 +00:00
Automerger Merge Worker
15dbc718e1 Merge "[Settings] "Data during calls" in DDS SUB is still in advanced option." into rvc-dev am: 0c3bd003d0 
Change-Id: I6db41bb009930b62191d6066bfc4fcb958b66b2d
 2020-02-27 15:49:26 +00:00
James Lin
0c3bd003d0 Merge "[Settings] "Data during calls" in DDS SUB is still in advanced option." into rvc-dev 2020-02-27 15:37:22 +00:00
Automerger Merge Worker
594f014fa3 Merge "Minor change to cross profile setting subtext." into rvc-dev am: 4e3b62adde am: d2750a8d0e 
Change-Id: Ic4f7a701b016948d73fdf111824bf08e63443187
 2020-02-27 11:47:56 +00:00
Automerger Merge Worker
764a7eb922 Merge "Minor change to cross profile setting subtext." into rvc-dev am: 4e3b62adde am: 5c5d6ce282 
Change-Id: I4b276c003efe8e49f37bda5b58c91d196c275f0a
 2020-02-27 11:47:40 +00:00
Automerger Merge Worker
d2750a8d0e Merge "Minor change to cross profile setting subtext." into rvc-dev am: 4e3b62adde 
Change-Id: I4f82e4de83cc7982ea791d65dd8a97fc882f13a9
 2020-02-27 11:35:52 +00:00
Automerger Merge Worker
5c5d6ce282 Merge "Minor change to cross profile setting subtext." into rvc-dev am: 4e3b62adde 
Change-Id: If8492d184dad2daa43dcf5e39206cb029dad72e3
 2020-02-27 11:35:46 +00:00
TreeHugger Robot
4e3b62adde Merge "Minor change to cross profile setting subtext." into rvc-dev 2020-02-27 11:17:18 +00:00
James.cf Lin
64ac0d4a74 [Settings] "Data during calls" in DDS SUB is still in advanced option. 
The DataDuringCallsPreferenceController didn't listen the mobile data changed and update the preference.

Bug: 149344454
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataDuringCallsPreferenceControllerTest

Change-Id: I0121f06efb5257dccc05ad06b93a9db263f012b5
 2020-02-27 17:52:47 +08:00
Automerger Merge Worker
49ec2b321b [automerger skipped] Merge "Fixes ApnEditor not restoring previous UI" am: cd4ca97828 am: 9ac493094e -s ours am: 6af789dbd2 -s ours 
am skip reason: Change-Id I8147ec96569fa28867c088d6c36584aa344f40ed with SHA-1 c12b1b40ee is in history

Change-Id: If29361d1e382d652bfc72a229fd7b63e1bd4960f
 2020-02-27 09:26:38 +00:00
Automerger Merge Worker
6af789dbd2 [automerger skipped] Merge "Fixes ApnEditor not restoring previous UI" am: cd4ca97828 am: 9ac493094e -s ours 
am skip reason: Change-Id I8147ec96569fa28867c088d6c36584aa344f40ed with SHA-1 c12b1b40ee is in history

Change-Id: Ia028c322526bcaf784be278b8097767f5019066d
 2020-02-27 09:12:29 +00:00
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
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
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
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
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
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
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
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
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