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

59252 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
424965f608 Merge "Launch output switcher with media package information" into rvc-dev am: b6c8fab86f 
Change-Id: Ie5eb8cbdc00528c59bfa9d972de1149dab40477c
 2020-02-27 02:29:23 +00:00
Automerger Merge Worker
a8e4c9a7f3 Merge "Launch output switcher with media package information" into rvc-dev am: b6c8fab86f 
Change-Id: Ic4244cf0d1a09ec727a0d4b320b7c314d933cc43
 2020-02-27 02:29:17 +00:00
tim peng
b6c8fab86f Merge "Launch output switcher with media package information" into rvc-dev 2020-02-27 02:18:03 +00:00
Automerger Merge Worker
915900ccdf Merge "Increase size of touch target" into rvc-dev am: e28bd9d6d9 am: 63f67ffb1a 
Change-Id: Ib7f349792430c0bf06f720be0656fe3dd5baf820
 2020-02-27 02:09:01 +00:00
Automerger Merge Worker
56df848fba Merge "Increase size of touch target" into rvc-dev am: e28bd9d6d9 am: e58ea87a9d 
Change-Id: I627a586abfecd61434d0ab5191ae7b44d11fe632
 2020-02-27 02:08:33 +00:00
Automerger Merge Worker
63f67ffb1a Merge "Increase size of touch target" into rvc-dev am: e28bd9d6d9 
Change-Id: I76cfbbc6147fc441d532f43b53b05d0ffd01e1ba
 2020-02-27 01:51:16 +00:00
Automerger Merge Worker
e58ea87a9d Merge "Increase size of touch target" into rvc-dev am: e28bd9d6d9 
Change-Id: Iff4ea6685a8322161e88dcd2bb851b9059df2f58
 2020-02-27 01:51:11 +00:00
TreeHugger Robot
e28bd9d6d9 Merge "Increase size of touch target" into rvc-dev 2020-02-27 01:34:28 +00:00
Automerger Merge Worker
af7dab44ed Merge "Rename WifiNetworkSuggestion#getPasspointConfiguration" into rvc-dev am: 5c69259751 am: 91715a9b68 
Change-Id: I6f654f5c3384c5e155b9d6c0f8e13b33380ec680
 2020-02-27 00:03:25 +00:00
Automerger Merge Worker
da81e98492 Merge "Rename WifiNetworkSuggestion#getPasspointConfiguration" into rvc-dev am: 5c69259751 am: 5145c82a2e 
Change-Id: Icd319494a30181c55bd6221e19814c8c0652dd41
 2020-02-27 00:00:06 +00:00
Automerger Merge Worker
91715a9b68 Merge "Rename WifiNetworkSuggestion#getPasspointConfiguration" into rvc-dev am: 5c69259751 
Change-Id: I7ecc380c7bbf300912a8956fdc985f8ea2112af9
 2020-02-26 23:44:14 +00:00
Automerger Merge Worker
5145c82a2e Merge "Rename WifiNetworkSuggestion#getPasspointConfiguration" into rvc-dev am: 5c69259751 
Change-Id: I41d6c5acfac1296fb7500ed4a7e7998847776c16
 2020-02-26 23:44:06 +00:00
David Su
5c69259751 Merge "Rename WifiNetworkSuggestion#getPasspointConfiguration" into rvc-dev 2020-02-26 23:42:35 +00:00
Yi Jiang
c68a08fc7c Fixes incorrect settings usages in AdaptiveSleepPreferenceController 
Test: manually tested on device
Bug: 139319542
Change-Id: I7b50d75862a678aecea9356253e443f7bded97b2
(cherry picked from commit c0f9424779)
 2020-02-26 21:46:38 +00:00
Julia Reynolds
fceea9d0a1 Increase size of touch target 
Test: make
Fixes: 146848768
Change-Id: Ib1e5886f5953ed48b2a5b851a696e037124d45eb
 2020-02-26 15:15:16 -05:00
Automerger Merge Worker
28000977cc Include changes that happen when history is open am: 8b031276b7 am: 70e242c19c 
Change-Id: Id6c6720fa3dc5d90175e905f6d92bb3d37452086
 2020-02-26 16:26:14 +00:00
Automerger Merge Worker
dfd34e2e8c Include changes that happen when history is open am: 8b031276b7 am: d60d581e78 
Change-Id: Icff65bc16a19467c20afc7d6c3ad699bf6383fc7
 2020-02-26 16:25:49 +00:00
Automerger Merge Worker
70e242c19c Include changes that happen when history is open am: 8b031276b7 
Change-Id: I46e0855230e7f2cd36fbd3f38ec27d0a5f992074
 2020-02-26 16:13:36 +00:00
Automerger Merge Worker
d60d581e78 Include changes that happen when history is open am: 8b031276b7 
Change-Id: Ia3745b7d99ef5acae3becb123be35548f8dacda6
 2020-02-26 16:13:15 +00:00
Sunny Shao
721f60515d Let footer with learn more become selectable 
- Update this attribute after synced with the Switch Access team.

Bug: 149808249
Test: manual test
Change-Id: I8e4fb7738541b4ccbbb5acf643265c78a61f8c45
 2020-02-26 13:08:01 +00:00
Julia Reynolds
8b031276b7 Include changes that happen when history is open 
Test: manual
Fixes: 150202759
Change-Id: Ic05be6c5c85a16567556d3f3902f4d557a8e7c1f
 2020-02-26 12:42:57 +00:00
changbetty
288fa30c2d [Telephony Setting] Add supplementary conditions for CDMA display IMEI info when subscriptionInfo is null 
Bug: 149307162
Test: make RunSettingsRoboTests ROBOTEST_FILTER=ImeiInfoDialogControllerTest
Change-Id: I1dd83ba55b34433b2b600b8a998000347b6ae5e8
Merged-In: I011b52fd25ca9ad48be3afcdabd9bdd443cd121d
 2020-02-26 18:23:31 +08:00
Automerger Merge Worker
737d47ecea Merge "Merge "Stop controller from steal preference clicks" into rvc-dev am: 9f6351b596 am: 1d63b3f5c6" into rvc-d1-dev-plus-aosp 2020-02-26 05:00:48 +00:00
Automerger Merge Worker
278f6d7c5b Merge "Stop controller from steal preference clicks" into rvc-dev am: 9f6351b596 am: 1d63b3f5c6 
Change-Id: I843980b9d3af5968e1ed631aca721121f8ddc1b7
 2020-02-26 05:00:40 +00:00
Automerger Merge Worker
fe90e0f750 Merge "Stop controller from steal preference clicks" into rvc-dev am: 9f6351b596 am: 907051e8c0 
Change-Id: Ide5a5710d57542e239105c5e14ab11f3167ab42b
 2020-02-26 05:00:35 +00:00
Automerger Merge Worker
1d63b3f5c6 Merge "Stop controller from steal preference clicks" into rvc-dev am: 9f6351b596 
Change-Id: Id570b28ba84f3d7de23fe399044f99d6766f0ede
 2020-02-26 04:45:05 +00:00
Automerger Merge Worker
907051e8c0 Merge "Stop controller from steal preference clicks" into rvc-dev am: 9f6351b596 
Change-Id: Iec32172aa8bf4222e235c7bc7b6991f6c25ed9f9
 2020-02-26 04:44:49 +00:00
Julia Reynolds
9f6351b596 Merge "Stop controller from steal preference clicks" into rvc-dev 2020-02-26 04:32:52 +00:00