Commit Graph

509578 Commits

Author SHA1 Message Date
TreeHugger Robot
08613e741b Merge "Only use padding for the multi-user empty state screens." into rvc-dev am: 1f659da696 am: b6a2999593 am: b32dd3dc3c am: dcc1acdfad
Change-Id: I7df1d514a168de0ab96a2d539790f73eb1230274
2020-04-07 14:52:56 +00:00
TreeHugger Robot
09b04d0503 Merge "Controls UI - Direct 'add controls' to the proper activity" into rvc-dev am: 4552718e95 am: 6af09306ff am: 3889fdccd6 am: acff47704d
Change-Id: Id5948030ba93b5bf8d2f7bf697d68efdc1766cf5
2020-04-07 14:52:13 +00:00
TreeHugger Robot
dcc1acdfad Merge "Only use padding for the multi-user empty state screens." into rvc-dev am: 1f659da696 am: b6a2999593 am: b32dd3dc3c
Change-Id: I68039d7786bc8f5322badebcac6ee68aea2c2a35
2020-04-07 14:41:45 +00:00
TreeHugger Robot
acff47704d Merge "Controls UI - Direct 'add controls' to the proper activity" into rvc-dev am: 4552718e95 am: 6af09306ff am: 3889fdccd6
Change-Id: Ief449d95bc5450b71d8a465c305779536ed9f969
2020-04-07 14:41:15 +00:00
TreeHugger Robot
82fbdd5cc7 Merge "Don't update the genID for an immutable bitmap" into rvc-dev am: 10dd5e9a18 am: e9f550649f am: 33815daea6 am: df56fd56d4 am: 5e84f2f1d2
Change-Id: I642a172f8dade2e0e9968bce205f1f36e9c8a85e
2020-04-07 14:27:22 +00:00
András Klöczl
9213f90c4f Merge "Redesign user switcher" into rvc-dev am: 46b8dc5f20 am: 5412d05d3c am: 3d016c3136 am: 8432891edb am: 17e9323af9
Change-Id: Iaf4a7528acac4229a45bc512dfe3732330a6a336
2020-04-07 14:27:13 +00:00
TreeHugger Robot
5d386d58c8 Merge "WifiNetworkSpecifier: Ensure we don't match a regular wifi network" into rvc-dev am: c524ad59f3 am: 890252cbbf am: 667d03d406 am: 435d80005f am: f539b87cd8
Change-Id: Ibf4954088c55c612d27786228e5e32d5e8222ee6
2020-04-07 14:27:02 +00:00
Leon Scroggins
164e7b63ab Merge "Switch get_env_or_die to requireEnv" into rvc-dev am: b1dfb8e575 am: 44bc63016b am: c29735fbc2 am: 1c0fe25ad9 am: aa38f786b4
Change-Id: Ib35379d86a8ae2b1fc752efdf927ad8f1c55afa8
2020-04-07 14:26:53 +00:00
TreeHugger Robot
6ee7822043 Merge "Don't update the genID for an immutable bitmap" into rvc-dev am: 10dd5e9a18 am: df8afda623 am: 03c7185bf4 am: a0213f2fb4
Change-Id: I6516d230b0325587496ea51b2956bd284d4c0259
2020-04-07 14:26:33 +00:00
András Klöczl
b2a6bfb1db Merge "Redesign user switcher" into rvc-dev am: 46b8dc5f20 am: 4a948cabba am: 948ff18d66 am: 90dd10eecf
Change-Id: Id970ab56e1a92854ab937a4f6ccac5642471c082
2020-04-07 14:26:17 +00:00
TreeHugger Robot
f6b2b9d495 Merge "WifiNetworkSpecifier: Ensure we don't match a regular wifi network" into rvc-dev am: c524ad59f3 am: b1c496b40c am: 23940a0e29 am: 6be96caf48
Change-Id: I62ef86dc39278630db27348e857d3f1308a7e219
2020-04-07 14:26:08 +00:00
Automerger Merge Worker
ff80d0ec95 Merge "Merge "Don't update the genID for an immutable bitmap" into rvc-dev am: 10dd5e9a18 am: e9f550649f" into rvc-d1-dev-plus-aosp am: 848a36f78f am: 934dc9ec1f
Change-Id: I15e75e79c1d64d6de976fd314f18422e8bdf1df1
2020-04-07 14:25:53 +00:00
TreeHugger Robot
5e84f2f1d2 Merge "Don't update the genID for an immutable bitmap" into rvc-dev am: 10dd5e9a18 am: e9f550649f am: 33815daea6 am: df56fd56d4
Change-Id: Iaabe4a0ca6a9dc8d950317e33ae65c33c03c1841
2020-04-07 14:25:42 +00:00
Automerger Merge Worker
7acafc9300 Merge "Merge "Switch get_env_or_die to requireEnv" into rvc-dev am: b1dfb8e575 am: 63b3c143ac" into rvc-d1-dev-plus-aosp am: a4da018b3c am: 85fb7b4403
Change-Id: I6e9057aaffce321137c976496b97601a5d20b8fe
2020-04-07 14:25:36 +00:00
András Klöczl
17e9323af9 Merge "Redesign user switcher" into rvc-dev am: 46b8dc5f20 am: 5412d05d3c am: 3d016c3136 am: 8432891edb
Change-Id: If34e7fbb94cd3c928d05ae50128e47b661eb2517
2020-04-07 14:25:32 +00:00
TreeHugger Robot
f539b87cd8 Merge "WifiNetworkSpecifier: Ensure we don't match a regular wifi network" into rvc-dev am: c524ad59f3 am: 890252cbbf am: 667d03d406 am: 435d80005f
Change-Id: Ia020df39fac81fa93477777d0cfeb901ef482838
2020-04-07 14:25:22 +00:00
András Klöczl
ecf2e152a1 Merge "Redesign user switcher" into rvc-dev am: 46b8dc5f20 am: 5412d05d3c am: 63e67d729c am: 9b4bab0c72
Change-Id: I916056c60c3761070662a468e80d719d64b1e3fe
2020-04-07 14:25:11 +00:00
Leon Scroggins
aa38f786b4 Merge "Switch get_env_or_die to requireEnv" into rvc-dev am: b1dfb8e575 am: 44bc63016b am: c29735fbc2 am: 1c0fe25ad9
Change-Id: If2fc9421618624933151e05efecce334edd0d028
2020-04-07 14:25:00 +00:00
TreeHugger Robot
c645bc09ad Merge "WifiNetworkSpecifier: Ensure we don't match a regular wifi network" into rvc-dev am: c524ad59f3 am: 890252cbbf am: 26789cc723 am: 3e2c8372cb
Change-Id: I917241b0fa701f39eb937fc60517ac970a8c4522
2020-04-07 14:24:55 +00:00
TreeHugger Robot
b32dd3dc3c Merge "Only use padding for the multi-user empty state screens." into rvc-dev am: 1f659da696 am: b6a2999593
Change-Id: I589cbab58976abba2b8235a49347fa630775e652
2020-04-07 14:24:53 +00:00
TreeHugger Robot
3889fdccd6 Merge "Controls UI - Direct 'add controls' to the proper activity" into rvc-dev am: 4552718e95 am: 6af09306ff
Change-Id: I6d2acfdb4cd1d0e9e4bf3925bbfa81bf4474f7a2
2020-04-07 14:24:37 +00:00
Leon Scroggins
059bebf77a Merge "Switch get_env_or_die to requireEnv" into rvc-dev am: b1dfb8e575 am: 44bc63016b am: 761fdfe1fa am: 1523435934
Change-Id: I98ed1221d28b23762016791345c9df9fc8ad05d9
2020-04-07 14:24:27 +00:00
TreeHugger Robot
b6a2999593 Merge "Only use padding for the multi-user empty state screens." into rvc-dev am: 1f659da696
Change-Id: Ie13a443ff5b4b63ac2576209322722ce731cd0e8
2020-04-07 14:18:06 +00:00
TreeHugger Robot
6af09306ff Merge "Controls UI - Direct 'add controls' to the proper activity" into rvc-dev am: 4552718e95
Change-Id: If40eced3b54b8ea96fe11aa0c6bf58aa7124bf67
2020-04-07 14:17:33 +00:00
TreeHugger Robot
a0213f2fb4 Merge "Don't update the genID for an immutable bitmap" into rvc-dev am: 10dd5e9a18 am: df8afda623 am: 03c7185bf4
Change-Id: Ida35e1a7e74e5bad62ecb94a3b1176f3ddba3c99
2020-04-07 14:12:00 +00:00
András Klöczl
90dd10eecf Merge "Redesign user switcher" into rvc-dev am: 46b8dc5f20 am: 4a948cabba am: 948ff18d66
Change-Id: I31342be8c500b0b0636f336d30a99cf85b58b468
2020-04-07 14:11:52 +00:00
TreeHugger Robot
6be96caf48 Merge "WifiNetworkSpecifier: Ensure we don't match a regular wifi network" into rvc-dev am: c524ad59f3 am: b1c496b40c am: 23940a0e29
Change-Id: Id3baa5645ddde58336deb5f990b252817296eea3
2020-04-07 14:11:43 +00:00
Automerger Merge Worker
934dc9ec1f Merge "Merge "Don't update the genID for an immutable bitmap" into rvc-dev am: 10dd5e9a18 am: e9f550649f" into rvc-d1-dev-plus-aosp am: 848a36f78f
Change-Id: Idb026a6486d3cb401441ee8b942e49fac6ce9e6c
2020-04-07 14:11:34 +00:00
TreeHugger Robot
df56fd56d4 Merge "Don't update the genID for an immutable bitmap" into rvc-dev am: 10dd5e9a18 am: e9f550649f am: 33815daea6
Change-Id: Idc17a498b587a9fcd4b6c2cfb967cf0a71774d29
2020-04-07 14:11:22 +00:00
András Klöczl
8432891edb Merge "Redesign user switcher" into rvc-dev am: 46b8dc5f20 am: 5412d05d3c am: 3d016c3136
Change-Id: Id940412e8a353d8faab438962526d7404b4298d5
2020-04-07 14:11:13 +00:00
Automerger Merge Worker
85fb7b4403 Merge "Merge "Switch get_env_or_die to requireEnv" into rvc-dev am: b1dfb8e575 am: 63b3c143ac" into rvc-d1-dev-plus-aosp am: a4da018b3c
Change-Id: Ifdfa0c39b5b5ae8e279d996e5419965f3da20bac
2020-04-07 14:11:12 +00:00
TreeHugger Robot
435d80005f Merge "WifiNetworkSpecifier: Ensure we don't match a regular wifi network" into rvc-dev am: c524ad59f3 am: 890252cbbf am: 667d03d406
Change-Id: Iaa1aa25c78d7396efbd1aa9ad01b2ab0f304e404
2020-04-07 14:11:01 +00:00
András Klöczl
9b4bab0c72 Merge "Redesign user switcher" into rvc-dev am: 46b8dc5f20 am: 5412d05d3c am: 63e67d729c
Change-Id: Ief0f4c8a84a3501d4132dc659fb8d7c0912a85d0
2020-04-07 14:11:01 +00:00
TreeHugger Robot
1f659da696 Merge "Only use padding for the multi-user empty state screens." into rvc-dev 2020-04-07 14:11:01 +00:00
TreeHugger Robot
3e2c8372cb Merge "WifiNetworkSpecifier: Ensure we don't match a regular wifi network" into rvc-dev am: c524ad59f3 am: 890252cbbf am: 26789cc723
Change-Id: Iee7453da0adaba21e47f7051778a06af406b996a
2020-04-07 14:10:36 +00:00
Leon Scroggins
1c0fe25ad9 Merge "Switch get_env_or_die to requireEnv" into rvc-dev am: b1dfb8e575 am: 44bc63016b am: c29735fbc2
Change-Id: Ib5f6e86eef01eaabe06596232bd29d915a1d009d
2020-04-07 14:10:25 +00:00
Leon Scroggins
1523435934 Merge "Switch get_env_or_die to requireEnv" into rvc-dev am: b1dfb8e575 am: 44bc63016b am: 761fdfe1fa
Change-Id: I7d4f201bdd594afc4701fb491b58a3b9c5d2ffa7
2020-04-07 14:10:19 +00:00
TreeHugger Robot
4552718e95 Merge "Controls UI - Direct 'add controls' to the proper activity" into rvc-dev 2020-04-07 14:03:32 +00:00
TreeHugger Robot
33815daea6 Merge "Don't update the genID for an immutable bitmap" into rvc-dev am: 10dd5e9a18 am: e9f550649f
Change-Id: I48ac142c34c48ac2e573e8ff6164862ecb9f0d71
2020-04-07 13:56:51 +00:00
TreeHugger Robot
03c7185bf4 Merge "Don't update the genID for an immutable bitmap" into rvc-dev am: 10dd5e9a18 am: df8afda623
Change-Id: I8e8235e61dc1cbf81fd9315ac01a67c3c9e8bb52
2020-04-07 13:56:42 +00:00
András Klöczl
3d016c3136 Merge "Redesign user switcher" into rvc-dev am: 46b8dc5f20 am: 5412d05d3c
Change-Id: Ia8604da3b15e1c84d24056dd342c1d7ba0003d68
2020-04-07 13:56:42 +00:00
András Klöczl
948ff18d66 Merge "Redesign user switcher" into rvc-dev am: 46b8dc5f20 am: 4a948cabba
Change-Id: Ib78f47f1461ac46c9e0fef0cbd12b0a6c2d4936f
2020-04-07 13:56:29 +00:00
TreeHugger Robot
23940a0e29 Merge "WifiNetworkSpecifier: Ensure we don't match a regular wifi network" into rvc-dev am: c524ad59f3 am: b1c496b40c
Change-Id: Ie20f3cf87c2d5e37da0e10bc9799132bcd631e96
2020-04-07 13:56:14 +00:00
TreeHugger Robot
667d03d406 Merge "WifiNetworkSpecifier: Ensure we don't match a regular wifi network" into rvc-dev am: c524ad59f3 am: 890252cbbf
Change-Id: I256da6b751f612f044d82432c4aa83af1d034c56
2020-04-07 13:56:13 +00:00
Automerger Merge Worker
848a36f78f Merge "Merge "Don't update the genID for an immutable bitmap" into rvc-dev am: 10dd5e9a18 am: e9f550649f" into rvc-d1-dev-plus-aosp 2020-04-07 13:56:11 +00:00
Automerger Merge Worker
a4da018b3c Merge "Merge "Switch get_env_or_die to requireEnv" into rvc-dev am: b1dfb8e575 am: 63b3c143ac" into rvc-d1-dev-plus-aosp 2020-04-07 13:56:10 +00:00
TreeHugger Robot
5178a2ef42 Merge "Don't update the genID for an immutable bitmap" into rvc-dev am: 10dd5e9a18 am: e9f550649f
Change-Id: I2599623f2540eaab27deed0135fd997f3dc8c873
2020-04-07 13:56:05 +00:00
Leon Scroggins
c16169ed92 Merge "Switch get_env_or_die to requireEnv" into rvc-dev am: b1dfb8e575 am: 63b3c143ac
Change-Id: I205e12e8a4473a278c1c3d2ad7998624b6910589
2020-04-07 13:55:59 +00:00
András Klöczl
63e67d729c Merge "Redesign user switcher" into rvc-dev am: 46b8dc5f20 am: 5412d05d3c
Change-Id: I52b401e1b0a32200503668d2f3d40f58e292692d
2020-04-07 13:55:56 +00:00
TreeHugger Robot
26789cc723 Merge "WifiNetworkSpecifier: Ensure we don't match a regular wifi network" into rvc-dev am: c524ad59f3 am: 890252cbbf
Change-Id: I3b030610f97fc450878c98fb84f396aa7db83716
2020-04-07 13:55:45 +00:00