Automerger Merge Worker
3248e62e0d
Merge "Fix the button display problem in Dark theme page" into rvc-dev am: 985b1e8ffb
...
Change-Id: I339fc21bfa9ecf76e5f0088127bad900df3bb76f
2020-03-02 10:12:45 +00:00
Automerger Merge Worker
572b728a87
Merge "Fix MediaSession.Token#equals()" into rvc-dev am: 18e16e416d
...
Change-Id: I12e169a2271b1c9f10b258bf720f23eeeaf968d4
2020-03-02 10:12:02 +00:00
Automerger Merge Worker
7cda6b423a
Merge "Fix for User edit info dialog during rotation" am: c6603dfda8
...
Change-Id: I4f5a29975aed084e1080387d6eb4500121c23ee0
2020-03-02 10:11:44 +00:00
Treehugger Robot
c6603dfda8
Merge "Fix for User edit info dialog during rotation"
2020-03-02 07:45:36 +00:00
TreeHugger Robot
985b1e8ffb
Merge "Fix the button display problem in Dark theme page" into rvc-dev
2020-03-02 07:42:19 +00:00
Jaewan Kim
18e16e416d
Merge "Fix MediaSession.Token#equals()" into rvc-dev
2020-03-02 06:28:20 +00:00
Automerger Merge Worker
4e9ab8a65b
Merge "[Settings] Remove unused string for erease eSIM" into rvc-dev am: 1f0c0b18e4
...
Change-Id: Id3af44eb9beea5a612e69c25fda4dd26fa22e5c6
2020-03-02 05:04:50 +00:00
Bonian Chen
1f0c0b18e4
Merge "[Settings] Remove unused string for erease eSIM" into rvc-dev
2020-03-02 04:51:05 +00:00
Sunny Shao
1de4c009ea
Fix the button display problem in Dark theme page
...
- Dark theme is disabled when Battery save is on.
- Let dark theme page not be searchable when Battery save is on.
Fixes: 150443799
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.display.darkmode
Change-Id: I2674499dd64333825765f70ed1f31dcb83e1b895
2020-03-02 11:59:28 +08:00
Automerger Merge Worker
2563b5f61d
Merge "Append status to title for the disconnected Bluetooth device" into rvc-dev am: d09ecc3e96
...
Change-Id: Ifd4be196c59b940bc4888effce73aaf28e50afb8
2020-03-02 01:39:04 +00:00
tim peng
d09ecc3e96
Merge "Append status to title for the disconnected Bluetooth device" into rvc-dev
2020-03-02 01:25:09 +00:00
Jaewan Kim
9f9ac53fe6
Fix MediaSession.Token#equals()
...
This also fixes the Activity#setMediaController() which previously
ignored because the MediaSessionService failed to find session set to
the foreground activity.
Bug: 149006225
Test: Run MediaActivityTest in CtsMediaTestCases
Change-Id: I18d3097f7b20275a20b1de789be6884f843668ae
2020-03-02 02:46:44 +09:00
Automerger Merge Worker
bd7f968a1c
Merge "Only show graphics driver option when the apk is available." into rvc-dev am: f302ee2aff
...
Change-Id: Iabc6caa61f028cb2a2f5b36a595cc1e6da6c8ec8
2020-03-01 04:53:23 +00:00
TreeHugger Robot
f302ee2aff
Merge "Only show graphics driver option when the apk is available." into rvc-dev
2020-03-01 04:42:02 +00:00
Automerger Merge Worker
88416ffaf6
Merge "Change volume panel title from "Volume" to "Sound"" into rvc-dev am: 3248376473
...
Change-Id: Ie864fbbc9631721b9f9fe4259cb13651dd135926
2020-03-01 03:34:25 +00:00
tim peng
3248376473
Merge "Change volume panel title from "Volume" to "Sound"" into rvc-dev
2020-03-01 03:22:29 +00:00
Bonian Chen
1b8174689d
[Settings] Remove unused string for erease eSIM
...
Remove strings added by ag/6804404 which are no longer required by b/132114333.
Bug: 133790033
Test: build pass
Change-Id: I3ce375efd04164cf93cff2c89436e222df14bfeb
2020-03-01 01:19:44 +00:00
Automerger Merge Worker
91f7309d5d
Merge "Fix notification history crash & layout" into rvc-dev am: 9229504fe2
...
Change-Id: I7da82152579dd6934937881fecb28ea056fd5937
2020-02-29 05:39:01 +00:00
TreeHugger Robot
9229504fe2
Merge "Fix notification history crash & layout" into rvc-dev
2020-02-29 05:23:07 +00:00
Automerger Merge Worker
bf69895603
[automerger skipped] DO NOT MERGE - Skip QQ2A.200305.003 in stage-aosp-master am: 9fe7d6c59b -s ours
...
am skip reason: subject contains skip directive
Change-Id: I5c3fb50f656ded58064ae0e18424ea9f9b0ba429
2020-02-29 04:20:58 +00:00
Julia Reynolds
291ee404c2
Fix notification history crash & layout
...
- Fix occasional crash on device boot
- No more overlapping text
Test: manual
Fixes: 150326599
Fixes: 149767075
Change-Id: I3032a2913f2ca4ce57af596c180faa819e4c9363
2020-02-28 16:16:44 -05:00
Quang Luong
834b0ade20
[WifiSettings2] Remove redundant save() call for new configs
...
Removing call to WifiManager#save() when configuring a new network
through tapping it in the wifi picker. Since WifiManager#connect()
already saves the passed in WifiConfiguration, the call to
WifiManager#save() is redundant.
Bug: 149579116
Test: build, manual verification by connecting to a new secure network
Change-Id: I9242e7fd7e9a459e8221b6bb491ab67833970e87
2020-02-28 12:58:36 -08:00
Automerger Merge Worker
47efc875da
Merge "Optimize NetworkScan for only User-Enabled RANs" into rvc-dev am: f7fe2b0dec
...
Change-Id: Iead26d883a75dc45269a9f060ea74a6b8aae3084
2020-02-28 16:55:59 +00:00
Sarah Chin
f7fe2b0dec
Merge "Optimize NetworkScan for only User-Enabled RANs" into rvc-dev
2020-02-28 16:48:41 +00:00
Automerger Merge Worker
31899646f8
Merge "[Wi-Fi] Ignore incorrect user certificates" into rvc-dev am: fc2939ddd1
...
Change-Id: Ia318c314d726f84aea16427b50ffb2f569ad44ef
2020-02-28 16:22:49 +00:00
TreeHugger Robot
fc2939ddd1
Merge "[Wi-Fi] Ignore incorrect user certificates" into rvc-dev
2020-02-28 16:14:33 +00:00
Automerger Merge Worker
767b00a6e8
Merge "[Wi-Fi] Set Wi-Fi Privacy option at the last one position" into rvc-dev am: c2153e244b
...
Change-Id: Ie36ad2199d53acaf7beb9ccbfdee374c1676c391
2020-02-28 15:46:31 +00:00
Automerger Merge Worker
48823ea702
Merge "Use AppOpsManager#setUidMode instead of #setMode" into rvc-dev am: 3071821207
...
Change-Id: Ie244a4c73d7724acb84f6e77f6609d2d9f2d665f
2020-02-28 15:34:24 +00:00
TreeHugger Robot
c2153e244b
Merge "[Wi-Fi] Set Wi-Fi Privacy option at the last one position" into rvc-dev
2020-02-28 15:33:44 +00:00
Shafik Nassar
3071821207
Merge "Use AppOpsManager#setUidMode instead of #setMode" into rvc-dev
2020-02-28 15:30:58 +00:00
Automerger Merge Worker
50637d69b9
[automerger skipped] Merge "[Wi-Fi] Force users to select a phase2 authentication for PEAP & TTLS" into qt-qpr1-dev am: 594a5c71f5 -s ours am: fe066eab8d -s ours
...
am skip reason: Change-Id I0cb1ceda6d89a52224f80ea5ffd1af709a6acace with SHA-1 41661fe69c is in history
Change-Id: I0e6d4e125ff32fc9afb1fb46ee279a5aee7a3ce2
2020-02-28 06:28:30 +00:00
Automerger Merge Worker
fe066eab8d
[automerger skipped] Merge "[Wi-Fi] Force users to select a phase2 authentication for PEAP & TTLS" into qt-qpr1-dev am: 594a5c71f5 -s ours
...
am skip reason: Change-Id I0cb1ceda6d89a52224f80ea5ffd1af709a6acace with SHA-1 41661fe69c is in history
Change-Id: Ie5c75f89bb59471650fbc4dbabfc85cf8f64b45e
2020-02-28 06:16:47 +00:00
Automerger Merge Worker
bcd758f57f
Skip QQ2A.200113.001 in stage-aosp-master am: 28f9734a4a
...
Change-Id: Icd30b28c72ab2495737ecd91373ed4b25f1a63aa
2020-02-28 06:10:26 +00:00
TreeHugger Robot
594a5c71f5
Merge "[Wi-Fi] Force users to select a phase2 authentication for PEAP & TTLS" into qt-qpr1-dev
2020-02-28 06:04:46 +00:00
Peiyong Lin
fc4155a02c
Only show graphics driver option when the apk is available.
...
Previously we always show all options, this patch makes the dashboard
only shows the option when the driver apk is available.
Bug: b/148626177
Test: make RunSettingsRoboTests ROBOTEST_FILTER=GraphicsDriver
Change-Id: Ifde5929d826d5ab542e855aa334546dd744b138b
2020-02-28 03:34:02 +00:00
Automerger Merge Worker
83c6fd40cc
Merge "[Wi-Fi] Fix hint text color contrast problem in 'Add networks'" into rvc-dev am: dc4f004cc9
...
Change-Id: Ia2925a46fb9f077a388b5ffe1e40f199aab3cb5f
2020-02-28 01:35:49 +00:00
Automerger Merge Worker
47e84d67a9
Merge "[Wi-Fi] Fix data usage screen flash 1~2 times problem" into rvc-dev am: 51b06031e8
...
Change-Id: I7d2a5b99b74784c9464f6722ffd4b023c337b1d8
2020-02-28 01:35:32 +00:00
TreeHugger Robot
dc4f004cc9
Merge "[Wi-Fi] Fix hint text color contrast problem in 'Add networks'" into rvc-dev
2020-02-28 01:31:08 +00:00
TreeHugger Robot
51b06031e8
Merge "[Wi-Fi] Fix data usage screen flash 1~2 times problem" into rvc-dev
2020-02-28 01:28:23 +00:00
Automerger Merge Worker
cafa42b471
Merge "Support updated rendering of conversation icons." into rvc-dev am: c1f6891ef3
...
Change-Id: Idc5e7757dcfc019be48b268f8730541f9cd8706e
2020-02-28 00:27:15 +00:00
Daniel Sandler
c1f6891ef3
Merge "Support updated rendering of conversation icons." into rvc-dev
2020-02-28 00:26:10 +00:00
Nathan Harold
b10babebd0
Optimize NetworkScan for only User-Enabled RANs
...
Network scans comprise multiple different access
technologies, and scanning each of those techs can
be very time consuming. Worse, depending on a user's
settings, the device may only be allowed to connect
to 2G, 2G+3G, or 2G+3G+4G networks. If a scan finds
network types that a user can't connect to, it also
creates a poor user experience if a user tries to
select those network types.
This CL restricts the scans to only find and return
results that a user can select based on the other
user settings.
Bug: 128572818
Test: manual (crosshatch) - set allowed networks to
2G+3G and verify that LTE networks are not returned.
Set allowed networks to 2G+3G+4G and verify that LTE
networks are returned.
Merged-In: Ic855100723b8604c1e872457a70fd8f25d225278
Change-Id: Ic855100723b8604c1e872457a70fd8f25d225278
(cherry picked from commit bda277b3b6 )
2020-02-27 16:10:19 -08:00
Sarah Chin
77dea1beb0
Rename calls to isGlobalModeEnabled
...
Test: atest FrameworksTelephonyTests
Bug: 148603998
Change-Id: If302350cfea7b2cd2cd25906dd1dd6a6d192a5d6
2020-02-27 16:00:13 -08:00
Xin Li
9fe7d6c59b
DO NOT MERGE - Skip QQ2A.200305.003 in stage-aosp-master
...
Bug: 150410372
Change-Id: I5a62dae10a3c5d0b6fd38c364cf38a39de021e2d
2020-02-27 15:45:16 -08:00
Xin Li
28f9734a4a
Skip QQ2A.200113.001 in stage-aosp-master
...
Bug: 146167222
Change-Id: I28eeb421d0e76d44f825436d0e4a61badd7e866d
2020-02-27 15:36:13 -08: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
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
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
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