Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
510,920 Commits 3 Branches 0 Tags
bdff67ab7349e3c99cf46292d41ea12ff5b9deb3
Commit Graph

5093 Commits

Author SHA1 Message Date
Bill Yi
e5144c0bc8 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: If64d160b357f7f2159a8c7a02ab5e5f6221e01fd
 2020-04-07 21:28:10 -07:00
Arc Wang
e6b0746034 Merge "[Wi-Fi] Add WifiSavedConfigUtils#getAllConfigsCount" into rvc-dev am: b02f8ff74f am: d5c409d9b1 am: ed862a160f am: 66e47dce24 
Change-Id: Ibdc86327088b694fb802100b3c313e9ba7bf7d79
 2020-04-07 07:59:25 +00:00
Arc Wang
d5c409d9b1 Merge "[Wi-Fi] Add WifiSavedConfigUtils#getAllConfigsCount" into rvc-dev am: b02f8ff74f 
Change-Id: I60886f8edd7b00e7160f743dcb720a634fa88fd5
 2020-04-07 07:26:36 +00:00
Arc Wang
b02f8ff74f Merge "[Wi-Fi] Add WifiSavedConfigUtils#getAllConfigsCount" into rvc-dev 2020-04-07 07:16:24 +00:00
TreeHugger Robot
034b7106c4 Merge "Store conversation requirement in a setting" into rvc-dev am: 5eb9c8fada am: fb7f470b5a am: a2ce73bd87 am: 958fd97525 
Change-Id: I7daa6a63311bc1fd03f937abe031bd1ed8e9cee0
 2020-04-07 04:48:36 +00:00
TreeHugger Robot
a2ce73bd87 Merge "Store conversation requirement in a setting" into rvc-dev am: 5eb9c8fada am: fb7f470b5a 
Change-Id: Ib1a9712eb4a447752a83c7606c561a0fb31a7085
 2020-04-07 04:08:32 +00:00
TreeHugger Robot
6e3f679b0f Merge "[adbwifi] Fix case on pairing QR code description." 2020-04-07 04:05:02 +00:00
TreeHugger Robot
8bfdc107cc Merge "Store conversation requirement in a setting" into rvc-dev am: 5eb9c8fada 
Change-Id: I7cb2dde555ac4480d3ad18c675f3a6466184345b
 2020-04-07 03:58:21 +00:00
TreeHugger Robot
fb7f470b5a Merge "Store conversation requirement in a setting" into rvc-dev am: 5eb9c8fada 
Change-Id: Id0498070faaf38a0ed59fc2859908d21cfaddc90
 2020-04-07 03:57:57 +00:00
TreeHugger Robot
5eb9c8fada Merge "Store conversation requirement in a setting" into rvc-dev 2020-04-07 03:47:02 +00:00
Joshua Duong
58109a5873 [adbwifi] Fix case on pairing QR code description. 
Change "... a QR Code" to "... a QR code"

Bug: 153391965

Test: make
Change-Id: I79a8b7df4a0ad518d7cc67d2aad17cd75619cc0a
 2020-04-06 19:29:12 -07:00
Joshua Duong
10b13264f6 [adbwifi] Fix adbwifi string case. 
Changed 'Scanner' to 'scanner'.

Bug: 153271332

Test: make
Change-Id: I4c34314753277859860dc3b981ba4ea86025557d
 2020-04-06 22:37:26 +00:00
TreeHugger Robot
e234ca4a9c Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-04-06 16:31:35 +00:00
Bill Yi
9bd7bfc084 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: Ic9d06c70eedc5c1048f2c3d9a7ead357c4c02fd2
 2020-04-06 02:20:45 -07:00
tim peng
b70a169c4b Merge "No feedback when attempting to transfer to an unpowered BT device" into rvc-dev am: 064a827708 am: 585d6df24a am: 4d3d43609b am: a62ea2f042 
Change-Id: Ifd4645fa9598ea99bffe90355f19fd502f079455
 2020-04-06 07:56:10 +00:00
TreeHugger Robot
8a88735f54 Merge "Fix null point exception on LocalMediaManager" into rvc-dev am: 072d9fe006 am: b309fa5eb1 am: 9960d6381f am: 79533dfa16 
Change-Id: I638a56762289f19ce663fc3c1edf521aa2a4df49
 2020-04-06 07:55:40 +00:00
tim peng
4d3d43609b Merge "No feedback when attempting to transfer to an unpowered BT device" into rvc-dev am: 064a827708 am: 585d6df24a 
Change-Id: I1885360c96b4996fe4b75c6ede70042e5cd6fae1
 2020-04-06 07:26:58 +00:00
TreeHugger Robot
9960d6381f Merge "Fix null point exception on LocalMediaManager" into rvc-dev am: 072d9fe006 am: b309fa5eb1 
Change-Id: Id00af898178e8f69182d2574d4a9f7d108ec45b1
 2020-04-06 07:26:25 +00:00
tim peng
585d6df24a Merge "No feedback when attempting to transfer to an unpowered BT device" into rvc-dev am: 064a827708 
Change-Id: I57ebcd5112638fbcab31fe78a5376f01cc24dd94
 2020-04-06 07:14:09 +00:00
tim peng
a518cffc01 Merge "No feedback when attempting to transfer to an unpowered BT device" into rvc-dev am: 064a827708 
Change-Id: I9026ffbfb967589438e53df9e4bf2f1ed02ae741
 2020-04-06 07:06:57 +00:00
tim peng
064a827708 Merge "No feedback when attempting to transfer to an unpowered BT device" into rvc-dev 2020-04-06 07:06:03 +00:00
TreeHugger Robot
26290b3e3d Merge "Fix null point exception on LocalMediaManager" into rvc-dev am: 072d9fe006 
Change-Id: I0c503dd407a8a271078666d3d97db6492f290104
 2020-04-06 07:05:52 +00:00
TreeHugger Robot
b309fa5eb1 Merge "Fix null point exception on LocalMediaManager" into rvc-dev am: 072d9fe006 
Change-Id: Ie80f09ce9884d0d138ca5cb3a13ba65a1c54638c
 2020-04-06 07:04:04 +00:00
hughchen
4e6e52443d Fix null point exception on LocalMediaManager 
- Use TextUtils.equal() to check string compare.
- Add test case.

Bug: 153144708
Test: make -j42 RunSettingsLibRoboTests
Change-Id: Iabaf4bc86bcf353e1dd86269c7add7690bae0bfe
 2020-04-06 11:42:33 +08:00
Tim Peng
92fb2199d9 No feedback when attempting to transfer to an unpowered BT device 
-Set transfering state when trying to connect
-Reset to onTransferBluetoothDevice when failing connecting
-Add test cases

Bug: 152606143
Test: make -j50 RunSettingsLibRoboTests
Change-Id: Ifc4cb16a5d7d2b2c85b1171aa070651a5feaa4e2
 2020-04-06 01:19:39 +00:00
Julia Reynolds
e24faa2c86 Store conversation requirement in a setting 
So we can show it in developer options. Also fix a bug
where the setting wasn't being respected in systemui.

Test: atest
Bug: 152907434
Change-Id: I1eaed93a0c8a1ec4486c7072972e2f924402bb94
 2020-04-02 16:28:40 -04:00
Bill Yi
75a3ed54c1 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: I4fc12101652d5a28c0ec0f19032571fe28352dc7
 2020-03-31 19:30:17 -07:00
TreeHugger Robot
2d16769a0c Merge "Update devices list when onRoutesChanged() called" into rvc-dev am: a3645665e4 am: 8e2f48fe0c am: 96d4e9439f am: 24ff318d30 
Change-Id: I3e539b1f1b01825d11c6ba0cbdfd0c3383aeb9a9
 2020-03-31 06:16:05 +00:00
TreeHugger Robot
5acff69496 Merge "List 5 disconnected bt device" into rvc-dev am: d7437c58c0 am: 1f6612ba29 am: c536c9be6e am: aa2dd58935 
Change-Id: I0afff896cdc880e73f2c5f9c515df3622ee43489
 2020-03-31 06:15:54 +00:00
TreeHugger Robot
d5efb89498 Merge "Remove BluetoothMediaManager" into rvc-dev am: bd90d86ca1 am: 585a6f3c5c am: 5635ab0b40 am: 2c0d8274ef 
Change-Id: I92f39d18e74244dd82bb48346d91ece5a4558aba
 2020-03-31 06:15:31 +00:00
TreeHugger Robot
34ef72993a Merge "Fix talkback ordering of zen duration dialog" into rvc-dev am: b59775ada7 am: e526c39729 am: fc76178d77 am: 022e349975 
Change-Id: I49d2e91e51d87295b896211c22077ded22d0ede5
 2020-03-31 05:48:51 +00:00
TreeHugger Robot
96d4e9439f Merge "Update devices list when onRoutesChanged() called" into rvc-dev am: a3645665e4 am: 8e2f48fe0c 
Change-Id: I1a474196cdbfb19e2efbe4d277c7d3308aa0ef92
 2020-03-31 05:04:21 +00:00
TreeHugger Robot
408fda45fd Merge "Update devices list when onRoutesChanged() called" into rvc-dev am: a3645665e4 
Change-Id: I051f0c4b17316afe347b811b4bd277b1b2bafe27
 2020-03-31 04:43:09 +00:00
TreeHugger Robot
8e2f48fe0c Merge "Update devices list when onRoutesChanged() called" into rvc-dev am: a3645665e4 
Change-Id: I8e147f3860b735dae53f7d7079827007fcdedae0
 2020-03-31 04:42:59 +00:00
TreeHugger Robot
a2b703c957 Merge "Update MediaRouter2Manager api" into rvc-dev am: bb138f21d7 am: 662cb9aa7a am: 4247b8aa7b am: 741c4f41ea am: 890b88b518 
Change-Id: Ibcf5e1627eeede918f21fff051fa66c0cb7092d4
 2020-03-31 04:35:12 +00:00
TreeHugger Robot
a3645665e4 Merge "Update devices list when onRoutesChanged() called" into rvc-dev 2020-03-31 04:26:27 +00:00
TreeHugger Robot
c536c9be6e Merge "List 5 disconnected bt device" into rvc-dev am: d7437c58c0 am: 1f6612ba29 
Change-Id: I7e89933cbcce0716887b8ede94acf187023c87c9
 2020-03-31 03:08:06 +00:00
TreeHugger Robot
5635ab0b40 Merge "Remove BluetoothMediaManager" into rvc-dev am: bd90d86ca1 am: 585a6f3c5c 
Change-Id: I6ec622e1f710dda4eba0af663f4b9a91c66ed892
 2020-03-31 03:06:51 +00:00
Ben Murdoch
2f51fadc1b Merge "Add user switcher related strings to SettingsLib." into rvc-dev am: 66041721d7 am: 71a605714f am: fb79b493d6 am: 534d249544 am: a2c2e9cb7b 
Change-Id: Ieb5726b650c60d0329bff35ff0bfe3f51b969905
 2020-03-31 02:44:45 +00:00
TreeHugger Robot
c9253eabf2 Merge "List 5 disconnected bt device" into rvc-dev am: d7437c58c0 
Change-Id: I6e3bcf4a40f4080b94d8802e2b20f868e20b6874
 2020-03-31 02:33:12 +00:00
TreeHugger Robot
1f6612ba29 Merge "List 5 disconnected bt device" into rvc-dev am: d7437c58c0 
Change-Id: If5bca4c681e5fba5091f857f35bec33ff723e021
 2020-03-31 02:33:09 +00:00
TreeHugger Robot
d7437c58c0 Merge "List 5 disconnected bt device" into rvc-dev 2020-03-31 02:26:47 +00:00
TreeHugger Robot
802ceee330 Merge "Remove BluetoothMediaManager" into rvc-dev am: bd90d86ca1 
Change-Id: I0e257d1937dc297235dec8bdfc436564c393c115
 2020-03-31 02:21:25 +00:00
TreeHugger Robot
585a6f3c5c Merge "Remove BluetoothMediaManager" into rvc-dev am: bd90d86ca1 
Change-Id: Ie1fbad2a36d98c8acd229ef37ba5fbe4d367cdb8
 2020-03-31 02:19:30 +00:00
TreeHugger Robot
bd90d86ca1 Merge "Remove BluetoothMediaManager" into rvc-dev 2020-03-31 02:15:12 +00:00
TreeHugger Robot
fc76178d77 Merge "Fix talkback ordering of zen duration dialog" into rvc-dev am: b59775ada7 am: e526c39729 
Change-Id: I4ebe0660c69f0bf214a72131e5e57303a8fd0dd0
 2020-03-30 20:04:18 +00:00
TreeHugger Robot
a1875dc8a3 Merge "Fix talkback ordering of zen duration dialog" into rvc-dev am: b59775ada7 
Change-Id: Ibc56bc96bbbf9574d395ba00d2e23159895ea724
 2020-03-30 19:48:05 +00:00
TreeHugger Robot
e526c39729 Merge "Fix talkback ordering of zen duration dialog" into rvc-dev am: b59775ada7 
Change-Id: Ib45fe5a3b66bc7df68d2501172c2064f0645d480
 2020-03-30 19:47:38 +00:00
TreeHugger Robot
3cf6771505 Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-03-30 19:35:00 +00:00
TreeHugger Robot
b59775ada7 Merge "Fix talkback ordering of zen duration dialog" into rvc-dev 2020-03-30 19:32:18 +00:00