Commit Graph

73180 Commits

Author SHA1 Message Date
TreeHugger Robot
dacbe4cd63 Merge "Improved UX when no debuggable apps are available." into rvc-dev am: 6217af3fe1 am: 5b5c335b01 am: 3015d09885 am: 207d0a0af5 am: 0fe5efacda
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11675592

Change-Id: I4acd08cdcd002534be7dbab324becae752dbd921
2020-06-19 13:42:54 +00:00
TreeHugger Robot
583a707b5d Merge "Improved UX when no debuggable apps are available." into rvc-dev am: 6217af3fe1 am: 87c77496a5 am: 16c66d916d am: fecc48bf53 am: d3cf5eb03d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11675592

Change-Id: Iac1962b24264d541e7594c935e62f2a373f0d241
2020-06-19 13:42:13 +00:00
TreeHugger Robot
682376c2aa Merge "Improved UX when no debuggable apps are available." into rvc-dev am: 6217af3fe1 am: 5b5c335b01 am: 74a89fb9fd am: 01d0ea7443 am: c4471d716b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11675592

Change-Id: Ia976262684cd04e8dc33badcab153291ce7ed179
2020-06-19 13:41:19 +00:00
TreeHugger Robot
0fe5efacda Merge "Improved UX when no debuggable apps are available." into rvc-dev am: 6217af3fe1 am: 5b5c335b01 am: 3015d09885 am: 207d0a0af5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11675592

Change-Id: I151f59004f19a4e3120202ef29f468585809d7c3
2020-06-19 13:29:29 +00:00
TreeHugger Robot
d3cf5eb03d Merge "Improved UX when no debuggable apps are available." into rvc-dev am: 6217af3fe1 am: 87c77496a5 am: 16c66d916d am: fecc48bf53
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11675592

Change-Id: I63d2c17dab131e718550ce52c6a4a55748909411
2020-06-19 13:29:22 +00:00
TreeHugger Robot
c4471d716b Merge "Improved UX when no debuggable apps are available." into rvc-dev am: 6217af3fe1 am: 5b5c335b01 am: 74a89fb9fd am: 01d0ea7443
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11675592

Change-Id: Iadd7046da7869a864db428f78a122a250d8f98c3
2020-06-19 13:29:13 +00:00
TreeHugger Robot
207d0a0af5 Merge "Improved UX when no debuggable apps are available." into rvc-dev am: 6217af3fe1 am: 5b5c335b01 am: 3015d09885
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11675592

Change-Id: Ic441a6eec4d8bddefd5f7edac9dec9a219a9be44
2020-06-19 13:19:37 +00:00
TreeHugger Robot
fecc48bf53 Merge "Improved UX when no debuggable apps are available." into rvc-dev am: 6217af3fe1 am: 87c77496a5 am: 16c66d916d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11675592

Change-Id: Ib8c0f14839a114ba336edf332d294a0304b55e65
2020-06-19 13:19:27 +00:00
TreeHugger Robot
01d0ea7443 Merge "Improved UX when no debuggable apps are available." into rvc-dev am: 6217af3fe1 am: 5b5c335b01 am: 74a89fb9fd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11675592

Change-Id: I5973f425cb7c0568a763ea0172ff5f61f672ddff
2020-06-19 13:19:19 +00:00
TreeHugger Robot
3015d09885 Merge "Improved UX when no debuggable apps are available." into rvc-dev am: 6217af3fe1 am: 5b5c335b01
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11675592

Change-Id: I18c5baef9c87cf8a38a6b9f3333a280c9264b066
2020-06-19 13:02:31 +00:00
TreeHugger Robot
16c66d916d Merge "Improved UX when no debuggable apps are available." into rvc-dev am: 6217af3fe1 am: 87c77496a5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11675592

Change-Id: If0d6aa52c9029aab39d2aeda623e05f66632e555
2020-06-19 13:02:30 +00:00
TreeHugger Robot
74a89fb9fd Merge "Improved UX when no debuggable apps are available." into rvc-dev am: 6217af3fe1 am: 5b5c335b01
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11675592

Change-Id: If0cb802f53b37094ebc66d26e625a514f9d77ebb
2020-06-19 13:02:11 +00:00
TreeHugger Robot
87c77496a5 Merge "Improved UX when no debuggable apps are available." into rvc-dev am: 6217af3fe1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11675592

Change-Id: I6c594580c54b6b979d6044f14181cedb5311ed37
2020-06-19 12:48:56 +00:00
TreeHugger Robot
5b5c335b01 Merge "Improved UX when no debuggable apps are available." into rvc-dev am: 6217af3fe1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11675592

Change-Id: I650b4a287132e3b6b8c8dce5f7f88cdc148d08ad
2020-06-19 12:48:41 +00:00
TreeHugger Robot
6217af3fe1 Merge "Improved UX when no debuggable apps are available." into rvc-dev 2020-06-19 12:32:52 +00:00
Yanting Yang
86e5120ccf Merge "According to the enrolled status to show/hide face unlock results" into rvc-dev am: ec606d6cdf am: 95a27be9b2 am: 5b8300dfaf am: 7adecf0d27 am: 8c7968e7d3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908540

Change-Id: I8442af86af2dc83c87279f693254f6a315e05a41
2020-06-19 08:55:00 +00:00
Yanting Yang
fcbee32bb1 Merge "According to the enrolled status to show/hide face unlock results" into rvc-dev am: ec606d6cdf am: bd27683632 am: 0c61ab039f am: 7a965eb59f am: 838c44e0c1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908540

Change-Id: I290e5f778d4f9bd4100e0b34f306575fa98b3d1a
2020-06-19 08:54:53 +00:00
Yanting Yang
bf3c7135d4 Merge "According to the enrolled status to show/hide face unlock results" into rvc-dev am: ec606d6cdf am: bd27683632 am: 570f8e54f7 am: d208cb29c4 am: e51c4b3699
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908540

Change-Id: I846d5ad1f11f31c47c2fbae1e509f5217ebde522
2020-06-19 08:54:19 +00:00
Yanting Yang
8c7968e7d3 Merge "According to the enrolled status to show/hide face unlock results" into rvc-dev am: ec606d6cdf am: 95a27be9b2 am: 5b8300dfaf am: 7adecf0d27
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908540

Change-Id: I6805ff7f627da7bd6f34c8aef17824cf78dc0998
2020-06-19 08:41:32 +00:00
Yanting Yang
838c44e0c1 Merge "According to the enrolled status to show/hide face unlock results" into rvc-dev am: ec606d6cdf am: bd27683632 am: 0c61ab039f am: 7a965eb59f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908540

Change-Id: I4ab8a44962c84883c4978a3357bf70415ee173c1
2020-06-19 08:41:25 +00:00
Yanting Yang
e51c4b3699 Merge "According to the enrolled status to show/hide face unlock results" into rvc-dev am: ec606d6cdf am: bd27683632 am: 570f8e54f7 am: d208cb29c4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908540

Change-Id: I8c39949c17ce96758779fa806328e00f949b8149
2020-06-19 08:41:06 +00:00
Yanting Yang
7adecf0d27 Merge "According to the enrolled status to show/hide face unlock results" into rvc-dev am: ec606d6cdf am: 95a27be9b2 am: 5b8300dfaf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908540

Change-Id: Ie696d1c4f9dd13d6fd3cf556c601243316e262d7
2020-06-19 08:28:43 +00:00
Yanting Yang
7a965eb59f Merge "According to the enrolled status to show/hide face unlock results" into rvc-dev am: ec606d6cdf am: bd27683632 am: 0c61ab039f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908540

Change-Id: I32e465ee7043ef2fa49deb6840f874bf314accc7
2020-06-19 08:28:22 +00:00
Yanting Yang
d208cb29c4 Merge "According to the enrolled status to show/hide face unlock results" into rvc-dev am: ec606d6cdf am: bd27683632 am: 570f8e54f7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908540

Change-Id: Ieee50c71705156b64ba1fe795df2fe85abf5b9bb
2020-06-19 08:28:06 +00:00
Yanting Yang
5b8300dfaf Merge "According to the enrolled status to show/hide face unlock results" into rvc-dev am: ec606d6cdf am: 95a27be9b2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908540

Change-Id: I4a7899cf5cf6f9a5664ed7ff78cb534a4a8128df
2020-06-19 08:17:25 +00:00
Yanting Yang
0c61ab039f Merge "According to the enrolled status to show/hide face unlock results" into rvc-dev am: ec606d6cdf am: bd27683632
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908540

Change-Id: I9af4a1f4a16f638b6908b3bed52633b84b5afaed
2020-06-19 08:16:54 +00:00
Yanting Yang
570f8e54f7 Merge "According to the enrolled status to show/hide face unlock results" into rvc-dev am: ec606d6cdf am: bd27683632
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908540

Change-Id: I0cebc3bef3647df08ab11e4d0886654bc300c265
2020-06-19 08:16:46 +00:00
Yanting Yang
95a27be9b2 Merge "According to the enrolled status to show/hide face unlock results" into rvc-dev am: ec606d6cdf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908540

Change-Id: I5898459457a73270e973304c2cb3a8c0a1c80527
2020-06-19 08:00:27 +00:00
Yanting Yang
bd27683632 Merge "According to the enrolled status to show/hide face unlock results" into rvc-dev am: ec606d6cdf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908540

Change-Id: I021a1ef7170000c297e83a806d3272456011da2c
2020-06-19 08:00:14 +00:00
Yanting Yang
ec606d6cdf Merge "According to the enrolled status to show/hide face unlock results" into rvc-dev 2020-06-19 07:42:03 +00:00
Mark Chien
79b9dfbe21 Merge "Remove unused resource from TetherServiceTest" into rvc-dev am: 45a953b56c am: c3a501c02e am: cd0ffda87d am: 4efacef2f5 am: 4fb4c26893
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908542

Change-Id: I69f50aea890b26c53fc3de5787b320f352a178eb
2020-06-19 07:06:46 +00:00
Automerger Merge Worker
39eee47258 Merge "Merge "Remove the feature flag of contextual home V2" into rvc-dev am: e8e4e4bafc am: 25a8c13254 am: af7ac88c6d" into rvc-qpr-dev-plus-aosp am: 291a2249ad am: fa84ff9da3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11910083

Change-Id: I84a9b0545f04302ca3c983109e6487e8b27731e4
2020-06-19 07:06:36 +00:00
Mark Chien
3bda51caa2 Merge "Remove unused resource from TetherServiceTest" into rvc-dev am: 45a953b56c am: 5f643bb4db am: 89eb0d1e41 am: dd328aea20 am: 4174c994c0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908542

Change-Id: I8b81079faca74dd81c87f286d9c833a43d921a4c
2020-06-19 07:06:23 +00:00
Mark Chien
85b8ce2126 Merge "Remove unused resource from TetherServiceTest" into rvc-dev am: 45a953b56c am: 5f643bb4db am: e35a89ef62 am: 211a604243 am: cf18d506fe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908542

Change-Id: Ib65bab5f5dd140d8ddd3739dcce5c58d14f20235
2020-06-19 07:06:16 +00:00
Automerger Merge Worker
cf3e140ee6 Merge "[automerger skipped] Merge "Fix the dark theme obscures the center marker of audio balance slider." into rvc-dev am: 5d19a1f0d7 am: 479c1cb24a -s ours" into rvc-d1-dev-plus-aosp am: 26016b54c5 -s ours am: d9de06b059 -s ours am: cdf13b6a0a -s ours
am skip reason: Change-Id Id2d548778d1275709448f4c009a8469216950d8c with SHA-1 22ed240aab is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900664

Change-Id: Id0c46d3f12030f5955338ca6a980e02fc44e8923
2020-06-19 07:05:24 +00:00
TreeHugger Robot
11c9fd4a9f Merge "Remove the feature flag of contextual home V2" into rvc-dev am: e8e4e4bafc am: a68b7cc6bf am: 53d99db577 am: 79c3dc7f09 am: f81473ef1c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11910083

Change-Id: I8478c362408c387c1426587f06a6ee474c16d3c4
2020-06-19 07:03:41 +00:00
Automerger Merge Worker
b43c3529ea Merge "Merge "Remove the feature flag of contextual home V2" into rvc-dev am: e8e4e4bafc am: a68b7cc6bf am: 6c0d2225c0" into rvc-qpr-dev-plus-aosp am: 510920bab8 am: 871c15dcce
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11910083

Change-Id: I142ab3d4aebc6f1bb863dc9efc35a748fefc30f3
2020-06-19 07:03:26 +00:00
PETER LIANG
1f53c79936 [automerger skipped] Merge "Fix the dark theme obscures the center marker of audio balance slider." into rvc-dev am: 5d19a1f0d7 am: c0ccd1eac1 am: 18e02caa18 -s ours am: 76e422608e -s ours am: d4964caaaa -s ours
am skip reason: Change-Id Id2d548778d1275709448f4c009a8469216950d8c with SHA-1 22ed240aab is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900664

Change-Id: Ibbe3970126d11cc3b15817c9b73c1761ee375e46
2020-06-19 07:02:57 +00:00
PETER LIANG
60ec25053e [automerger skipped] Merge "Fix the dark theme obscures the center marker of audio balance slider." into rvc-dev am: 5d19a1f0d7 am: c0ccd1eac1 am: 31b09df257 am: 15ca8b0e0c -s ours am: 9c85809b45 -s ours
am skip reason: Change-Id Id2d548778d1275709448f4c009a8469216950d8c with SHA-1 34a873884d is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900664

Change-Id: I95015986cc0a1a55c6e226ea0fa349e4339401d9
2020-06-19 07:02:44 +00:00
Mark Chien
4fb4c26893 Merge "Remove unused resource from TetherServiceTest" into rvc-dev am: 45a953b56c am: c3a501c02e am: cd0ffda87d am: 4efacef2f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908542

Change-Id: Ic4f909cae0afefa8cad013d9213af353b3d1d71b
2020-06-19 06:47:53 +00:00
Automerger Merge Worker
fa84ff9da3 Merge "Merge "Remove the feature flag of contextual home V2" into rvc-dev am: e8e4e4bafc am: 25a8c13254 am: af7ac88c6d" into rvc-qpr-dev-plus-aosp am: 291a2249ad
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11910083

Change-Id: Ia82508709eebff12a99a06bec8e9402bca281610
2020-06-19 06:47:26 +00:00
Mark Chien
4174c994c0 Merge "Remove unused resource from TetherServiceTest" into rvc-dev am: 45a953b56c am: 5f643bb4db am: 89eb0d1e41 am: dd328aea20
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908542

Change-Id: I4fb330614bf47eb8e193b63bc8b574a0e2a0f98a
2020-06-19 06:47:09 +00:00
Mark Chien
cf18d506fe Merge "Remove unused resource from TetherServiceTest" into rvc-dev am: 45a953b56c am: 5f643bb4db am: e35a89ef62 am: 211a604243
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908542

Change-Id: I8ca3430f4bf89107b8a5b4a92f1bbd96023bf78d
2020-06-19 06:46:58 +00:00
Automerger Merge Worker
cdf13b6a0a Merge "[automerger skipped] Merge "Fix the dark theme obscures the center marker of audio balance slider." into rvc-dev am: 5d19a1f0d7 am: 479c1cb24a -s ours" into rvc-d1-dev-plus-aosp am: 26016b54c5 -s ours am: d9de06b059 -s ours
am skip reason: Change-Id Id2d548778d1275709448f4c009a8469216950d8c with SHA-1 22ed240aab is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900664

Change-Id: Ia36c4282327ce285be7342687d15d019821ae70a
2020-06-19 06:46:24 +00:00
TreeHugger Robot
f81473ef1c Merge "Remove the feature flag of contextual home V2" into rvc-dev am: e8e4e4bafc am: a68b7cc6bf am: 53d99db577 am: 79c3dc7f09
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11910083

Change-Id: Ie4d6d00975e52e7aab2482917e3108b14546815f
2020-06-19 06:45:02 +00:00
Automerger Merge Worker
871c15dcce Merge "Merge "Remove the feature flag of contextual home V2" into rvc-dev am: e8e4e4bafc am: a68b7cc6bf am: 6c0d2225c0" into rvc-qpr-dev-plus-aosp am: 510920bab8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11910083

Change-Id: I78d46ffd65eb69b12f0ae3a01aff47454803145c
2020-06-19 06:44:11 +00:00
PETER LIANG
d4964caaaa [automerger skipped] Merge "Fix the dark theme obscures the center marker of audio balance slider." into rvc-dev am: 5d19a1f0d7 am: c0ccd1eac1 am: 18e02caa18 -s ours am: 76e422608e -s ours
am skip reason: Change-Id Id2d548778d1275709448f4c009a8469216950d8c with SHA-1 22ed240aab is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900664

Change-Id: Ic7c5966050e2f11cfc69e6a48a208fdf2e440fe7
2020-06-19 06:43:10 +00:00
PETER LIANG
9c85809b45 [automerger skipped] Merge "Fix the dark theme obscures the center marker of audio balance slider." into rvc-dev am: 5d19a1f0d7 am: c0ccd1eac1 am: 31b09df257 am: 15ca8b0e0c -s ours
am skip reason: Change-Id Id2d548778d1275709448f4c009a8469216950d8c with SHA-1 34a873884d is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900664

Change-Id: I05b8c4ef7c05ca26aa19451ec9b4f14ed866fc3b
2020-06-19 06:42:25 +00:00
Mark Chien
4efacef2f5 Merge "Remove unused resource from TetherServiceTest" into rvc-dev am: 45a953b56c am: c3a501c02e am: cd0ffda87d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908542

Change-Id: I4cb2fb3e8a8c14f64a3bf55ad22fc9eecd0c95a1
2020-06-19 06:20:02 +00:00
Automerger Merge Worker
291a2249ad Merge "Merge "Remove the feature flag of contextual home V2" into rvc-dev am: e8e4e4bafc am: 25a8c13254 am: af7ac88c6d" into rvc-qpr-dev-plus-aosp 2020-06-19 06:19:59 +00:00