Automerger Merge Worker
eb6d6edadb
Merge "Fix the button display problem in Dark theme page" into rvc-dev am: 985b1e8ffb am: 5962711f8f am: 26953558d9
...
Change-Id: I796caa927be4dd29dbb663201fef66a3ed462c19
2020-03-02 10:33:30 +00:00
Automerger Merge Worker
ef73a232b4
Merge "Fix the button display problem in Dark theme page" into rvc-dev am: 985b1e8ffb am: 3248e62e0d am: 86513a62cb
...
Change-Id: I2b948ab21a65058a8e3c5fa042d44bfa0ee1c9e0
2020-03-02 10:33:13 +00:00
Automerger Merge Worker
26953558d9
Merge "Fix the button display problem in Dark theme page" into rvc-dev am: 985b1e8ffb am: 5962711f8f
...
Change-Id: I622b1f56afd574bf3d280299da9cd3c253798c2a
2020-03-02 10:28:39 +00:00
Automerger Merge Worker
454dbfd402
Merge "Fix for User edit info dialog during rotation" am: c6603dfda8 am: 7cda6b423a
...
Change-Id: Ia6a3ca26dd3b2fdfce8df0cb21b24927fcb07bcb
2020-03-02 10:27:50 +00:00
Automerger Merge Worker
86513a62cb
Merge "Fix the button display problem in Dark theme page" into rvc-dev am: 985b1e8ffb am: 3248e62e0d
...
Change-Id: I2ad0df1265c331a9bde63e8db069395f11a42b1e
2020-03-02 10:27:17 +00:00
Automerger Merge Worker
8e0e86cfb3
Merge "Fix MediaSession.Token#equals()" into rvc-dev am: 18e16e416d am: 143575e128 am: 315fb9d172
...
Change-Id: I16b7c483b8266f2aeb28609be48a69055f7b5299
2020-03-02 10:27:05 +00:00
Automerger Merge Worker
8023599c8d
Merge "Fix the button display problem in Dark theme page" into rvc-dev am: 985b1e8ffb am: 5962711f8f
...
Change-Id: Ie0c432a3f5fa44812f90cd21278d4861dadedc0d
2020-03-02 10:26:57 +00:00
Automerger Merge Worker
ea0ff4fe06
Merge "Fix MediaSession.Token#equals()" into rvc-dev am: 18e16e416d am: 143575e128
...
Change-Id: I7b1cb006ec1cad2e5a1e5a315eab8cfe37199827
2020-03-02 10:26:41 +00:00
Automerger Merge Worker
48f99cf65b
Merge "Fix MediaSession.Token#equals()" into rvc-dev am: 18e16e416d am: 572b728a87 am: ae4e86c4db
...
Change-Id: I150aec8290c1e0681b996dc92b38b9169742caad
2020-03-02 10:26:39 +00:00
Automerger Merge Worker
315fb9d172
Merge "Fix MediaSession.Token#equals()" into rvc-dev am: 18e16e416d am: 143575e128
...
Change-Id: Iee2a8a55feea913e0e76bb9057bbcd89fc35e892
2020-03-02 10:26:24 +00:00
Automerger Merge Worker
ae4e86c4db
Merge "Fix MediaSession.Token#equals()" into rvc-dev am: 18e16e416d am: 572b728a87
...
Change-Id: Iec0bc80c3f2bb4a974a394b5cf4dc2ecfadc918f
2020-03-02 10:21:18 +00:00
Automerger Merge Worker
5962711f8f
Merge "Fix the button display problem in Dark theme page" into rvc-dev am: 985b1e8ffb
...
Change-Id: I5c7a85ba47eb9f069341946957cedbcf084457f0
2020-03-02 10:13:13 +00:00
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
bba607b3d2
Merge "[Settings] Remove unused string for erease eSIM" into rvc-dev am: 1f0c0b18e4 am: 3ea368bc36 am: 06f1bd646e am: 6ee2833a49
...
Change-Id: I59a9acd224b98791c4cdcbe71353fa54e16dbe8e
2020-03-02 10:11:58 +00:00
Automerger Merge Worker
143575e128
Merge "Fix MediaSession.Token#equals()" into rvc-dev am: 18e16e416d
...
Change-Id: Ic4fd81e813044d707d1e3067ed6047c03a67b98c
2020-03-02 10:11:55 +00:00
Automerger Merge Worker
b6d058bc34
Merge "[Settings] Remove unused string for erease eSIM" into rvc-dev am: 1f0c0b18e4 am: 4e9ab8a65b am: f3226a5b25 am: 26426c8d14
...
Change-Id: I046fe33452e85e5ca1297e872857838d45eda9d2
2020-03-02 10:11:53 +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
Automerger Merge Worker
b25813149a
Merge "[Settings] Remove unused string for erease eSIM" into rvc-dev am: 1f0c0b18e4 am: 3ea368bc36 am: afdfab09f5 am: 0dc3ce9d55
...
Change-Id: I987f41f80fee2b72bd67db9289aeceef7cac32fa
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
6ee2833a49
Merge "[Settings] Remove unused string for erease eSIM" into rvc-dev am: 1f0c0b18e4 am: 3ea368bc36 am: 06f1bd646e
...
Change-Id: I0b432e548a0f5c52abd0cd7d31bbf59b9d4d32ec
2020-03-02 05:27:52 +00:00
Automerger Merge Worker
26426c8d14
Merge "[Settings] Remove unused string for erease eSIM" into rvc-dev am: 1f0c0b18e4 am: 4e9ab8a65b am: f3226a5b25
...
Change-Id: I139a2f99b815e775abdc8197ec833b8bb9ad0f51
2020-03-02 05:27:43 +00:00
Automerger Merge Worker
0dc3ce9d55
Merge "[Settings] Remove unused string for erease eSIM" into rvc-dev am: 1f0c0b18e4 am: 3ea368bc36 am: afdfab09f5
...
Change-Id: I8228558e467f00779d62197335e11ac738e60c5d
2020-03-02 05:27:37 +00:00
Automerger Merge Worker
06f1bd646e
Merge "[Settings] Remove unused string for erease eSIM" into rvc-dev am: 1f0c0b18e4 am: 3ea368bc36
...
Change-Id: Ib4d88f6b283090b68c26bec80c41d83fb311a669
2020-03-02 05:14:52 +00:00
Automerger Merge Worker
f3226a5b25
Merge "[Settings] Remove unused string for erease eSIM" into rvc-dev am: 1f0c0b18e4 am: 4e9ab8a65b
...
Change-Id: Id0edd2b8f72503b92a04fe68135b61012120e42e
2020-03-02 05:14:52 +00:00
Automerger Merge Worker
afdfab09f5
Merge "[Settings] Remove unused string for erease eSIM" into rvc-dev am: 1f0c0b18e4 am: 3ea368bc36
...
Change-Id: I3f032e01f758caf48a711e432343783cf697af05
2020-03-02 05:14:41 +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
Automerger Merge Worker
3ea368bc36
Merge "[Settings] Remove unused string for erease eSIM" into rvc-dev am: 1f0c0b18e4
...
Change-Id: I5ca697af3382e26d3d5e981e972aba269cdad131
2020-03-02 05:04:44 +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
d2290321ce
Merge "Merge "Append status to title for the disconnected Bluetooth device" into rvc-dev am: d09ecc3e96 am: 2563b5f61d" into rvc-d1-dev-plus-aosp am: 7dc09bd0ed am: 2e436079e9
...
Change-Id: I7ca3893ecb776e60f12549cda87c19f4e7a3e288
2020-03-02 02:20:12 +00:00
Automerger Merge Worker
43e7f7812d
Merge "Merge "Append status to title for the disconnected Bluetooth device" into rvc-dev am: d09ecc3e96 am: 6b0088679f am: 1761fa1911" into rvc-qpr-dev-plus-aosp am: 17dbaebd6c
...
Change-Id: I7406bb5155663b91d1b57351d12a3cdd29efe504
2020-03-02 02:19:59 +00:00
Automerger Merge Worker
000c7401e9
Merge "Append status to title for the disconnected Bluetooth device" into rvc-dev am: d09ecc3e96 am: 6b0088679f am: 9845b9f08d am: 401c586bc5
...
Change-Id: I9c77f53016d2c22ecafc324f5164801303b4f2f9
2020-03-02 02:19:34 +00:00
Automerger Merge Worker
2e436079e9
Merge "Merge "Append status to title for the disconnected Bluetooth device" into rvc-dev am: d09ecc3e96 am: 2563b5f61d" into rvc-d1-dev-plus-aosp am: 7dc09bd0ed
...
Change-Id: I3756b4b309fd91a8612bb6e247c50094d2319094
2020-03-02 02:05:33 +00:00
Automerger Merge Worker
17dbaebd6c
Merge "Merge "Append status to title for the disconnected Bluetooth device" into rvc-dev am: d09ecc3e96 am: 6b0088679f am: 1761fa1911" into rvc-qpr-dev-plus-aosp
2020-03-02 02:05:27 +00:00
Automerger Merge Worker
134b177e46
Merge "Append status to title for the disconnected Bluetooth device" into rvc-dev am: d09ecc3e96 am: 6b0088679f am: 1761fa1911
...
Change-Id: I586d911d8b89f25d2fab2f70f171ae45a9ebba13
2020-03-02 02:05:22 +00:00
Automerger Merge Worker
401c586bc5
Merge "Append status to title for the disconnected Bluetooth device" into rvc-dev am: d09ecc3e96 am: 6b0088679f am: 9845b9f08d
...
Change-Id: I5945c988305e15fb6ed16387fe354f79b7102416
2020-03-02 02:05:11 +00:00
Automerger Merge Worker
1761fa1911
Merge "Append status to title for the disconnected Bluetooth device" into rvc-dev am: d09ecc3e96 am: 6b0088679f
...
Change-Id: I9e7c4fe582c9b6336610b87b4c7b70d9e84e3a71
2020-03-02 01:49:44 +00:00
Automerger Merge Worker
7dc09bd0ed
Merge "Merge "Append status to title for the disconnected Bluetooth device" into rvc-dev am: d09ecc3e96 am: 2563b5f61d" into rvc-d1-dev-plus-aosp
2020-03-02 01:49:41 +00:00
Automerger Merge Worker
9845b9f08d
Merge "Append status to title for the disconnected Bluetooth device" into rvc-dev am: d09ecc3e96 am: 6b0088679f
...
Change-Id: I739b9860174ae08584b0d4c941a9d2976653ec56
2020-03-02 01:49:37 +00:00
Automerger Merge Worker
275f21d3e7
Merge "Append status to title for the disconnected Bluetooth device" into rvc-dev am: d09ecc3e96 am: 2563b5f61d
...
Change-Id: Ic23a9891a8f667e48c41b0f188a25d5afd4a396e
2020-03-02 01:49:37 +00: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
Automerger Merge Worker
6b0088679f
Merge "Append status to title for the disconnected Bluetooth device" into rvc-dev am: d09ecc3e96
...
Change-Id: I3cccfeaa5e5e5b1e448764a50e503ba02e094f27
2020-03-02 01:38:51 +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
ffe0b12b9e
Merge "Only show graphics driver option when the apk is available." into rvc-dev am: f302ee2aff am: 2534b7ddf8 am: 75d5b3d477 am: d10fcb8cf4
...
Change-Id: I019aa9feef4256cf46a5cf05d4788980671a420b
2020-03-01 05:24:20 +00:00
Automerger Merge Worker
ec39b16e50
Merge "Only show graphics driver option when the apk is available." into rvc-dev am: f302ee2aff am: bd7f968a1c am: 4f211b3faa am: a3efd61c95
...
Change-Id: I0fcc469898aeffe52055bf1dc05f646c6846c564
2020-03-01 05:24:13 +00:00
Automerger Merge Worker
10b861e5c9
Merge "Only show graphics driver option when the apk is available." into rvc-dev am: f302ee2aff am: 2534b7ddf8 am: d543081a23 am: db0b266c7b
...
Change-Id: Ie5e63e32376caad84904ec5442ca90ac09e50b4b
2020-03-01 05:24:06 +00:00
