PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
71,731 Commits 1 Branch 0 Tags
851b51308fc6ae97401cb477ad62e467045bb47a
Commit Graph

71731 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
851b51308f Merge changes from topic "am-3bddd89fd6b84d1b8c5e5210dcfc3870" into rvc-qpr-dev-plus-aosp am: f2ebba9025 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883

Change-Id: Iaf9258d43189a94ce16eccf4bdff12006aafc3a7
 2020-06-19 23:18:39 +00:00
Beth Thibodeau
67126bdb74 [automerger skipped] Merge "[DO NOT MERGE] Add toggle for media resumption" into rvc-dev am: 0b152c29d0 am: 3ef895694d am: e9691bdc94 am: bd62fc7dae -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0d76ca4f1a0e08fbe0a3e356d6b439c2fecc0128
 2020-06-19 23:18:37 +00:00
Automerger Merge Worker
a28c2c57dd Merge changes from topic "am-d83d0d6d54d848d4ac8f04156f0b62c9" into rvc-d1-dev-plus-aosp am: 0701bcefbc am: ca5ce305af 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883

Change-Id: I33aad3b30406b95a3cf5fce3a4c019702a5b8c56
 2020-06-19 23:16:35 +00:00
Beth Thibodeau
57b516cddc [automerger skipped] Merge "[DO NOT MERGE] Add toggle for media resumption" into rvc-dev am: 0b152c29d0 am: 5e6f05a533 am: 941a4369d8 am: 87441e00b9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2bed6465f6ad7fd70ac18eb1ecc12488683c4cc3
 2020-06-19 23:16:33 +00:00
Beth Thibodeau
090802c1fd [automerger skipped] Merge "[DO NOT MERGE] Add toggle for media resumption" into rvc-dev am: 0b152c29d0 am: 3ef895694d am: 8b9b226bcf am: 2f749ba768 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I016ffc0a718e14fb1b4c79588befebeb7a6aa9f0
 2020-06-19 23:14:47 +00:00
Beth Thibodeau
91d1e64d5c [automerger skipped] [DO NOT MERGE] Add toggle for media resumption am: 13f3e8f04b am: 43834d78ff am: c30c0c381c am: e92c41ee14 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6c02289fc7911d226e37e4f3237e166ed1c4fa14
 2020-06-19 23:14:44 +00:00
Automerger Merge Worker
f2ebba9025 Merge changes from topic "am-3bddd89fd6b84d1b8c5e5210dcfc3870" into rvc-qpr-dev-plus-aosp 
* changes:
  Merge "[DO NOT MERGE] Add toggle for media resumption" into rvc-dev am: 0b152c29d0 am: 3ef895694d am: e9691bdc94
  [DO NOT MERGE] Add toggle for media resumption am: 13f3e8f04b am: 43834d78ff am: 44ce07125a
 2020-06-19 22:57:06 +00:00
Automerger Merge Worker
ca5ce305af Merge changes from topic "am-d83d0d6d54d848d4ac8f04156f0b62c9" into rvc-d1-dev-plus-aosp am: 0701bcefbc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883

Change-Id: I605fa7f7c2225713a267a4e60f26461a91e536d9
 2020-06-19 22:56:53 +00:00
Beth Thibodeau
87441e00b9 Merge "[DO NOT MERGE] Add toggle for media resumption" into rvc-dev am: 0b152c29d0 am: 5e6f05a533 am: 941a4369d8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883

Change-Id: I7e796e5e1b757d90d8f42ffe4230c3ff5e156db7
 2020-06-19 22:56:50 +00:00
Beth Thibodeau
bd62fc7dae Merge "[DO NOT MERGE] Add toggle for media resumption" into rvc-dev am: 0b152c29d0 am: 3ef895694d am: e9691bdc94 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883

Change-Id: I0ea0cf9d615041521a5bdbe2de483c8d94cec294
 2020-06-19 22:56:49 +00:00
Beth Thibodeau
ae0cf1d24b [DO NOT MERGE] Add toggle for media resumption am: 13f3e8f04b am: 43834d78ff am: 44ce07125a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883

Change-Id: I349e8fc01405d897a9219dd51118d7cf432e5a4a
 2020-06-19 22:56:46 +00:00
Beth Thibodeau
2f749ba768 Merge "[DO NOT MERGE] Add toggle for media resumption" into rvc-dev am: 0b152c29d0 am: 3ef895694d am: 8b9b226bcf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883

Change-Id: I2c732e309e17767ce72edcd9605cb978c3aa2e76
 2020-06-19 22:55:39 +00:00
Beth Thibodeau
e92c41ee14 [DO NOT MERGE] Add toggle for media resumption am: 13f3e8f04b am: 43834d78ff am: c30c0c381c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883

Change-Id: I59ea65df35ecc811e22dc57165982634b8806a7a
 2020-06-19 22:55:36 +00:00
Automerger Merge Worker
0701bcefbc Merge changes from topic "am-d83d0d6d54d848d4ac8f04156f0b62c9" into rvc-d1-dev-plus-aosp 
* changes:
  Merge "[DO NOT MERGE] Add toggle for media resumption" into rvc-dev am: 0b152c29d0 am: 5e6f05a533
  [DO NOT MERGE] Add toggle for media resumption am: 13f3e8f04b am: a648d121b7
 2020-06-19 22:44:12 +00:00
Beth Thibodeau
941a4369d8 Merge "[DO NOT MERGE] Add toggle for media resumption" into rvc-dev am: 0b152c29d0 am: 5e6f05a533 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883

Change-Id: Idd424e240102e9bf2c096711a76d7b60a54884af
 2020-06-19 22:44:00 +00:00
Beth Thibodeau
26c5f5082f [DO NOT MERGE] Add toggle for media resumption am: 13f3e8f04b am: a648d121b7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883

Change-Id: I27e4dc2c479259ec7d0ef5797f2a773d6b22baf9
 2020-06-19 22:43:58 +00:00
Beth Thibodeau
8b9b226bcf Merge "[DO NOT MERGE] Add toggle for media resumption" into rvc-dev am: 0b152c29d0 am: 3ef895694d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883

Change-Id: I02078c493b6d952b5b52d7accd5b248c77d4e234
 2020-06-19 22:43:47 +00:00
Beth Thibodeau
c30c0c381c [DO NOT MERGE] Add toggle for media resumption am: 13f3e8f04b am: 43834d78ff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883

Change-Id: I2b9690779b8cf6f5e6b8ae6c6dc6f428fb55c3bf
 2020-06-19 22:43:44 +00:00
Beth Thibodeau
e9691bdc94 Merge "[DO NOT MERGE] Add toggle for media resumption" into rvc-dev am: 0b152c29d0 am: 3ef895694d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883

Change-Id: Iad23f9254826d04f5b8c7f3ff22fa0dc780a27b9
 2020-06-19 22:41:18 +00:00
Beth Thibodeau
44ce07125a [DO NOT MERGE] Add toggle for media resumption am: 13f3e8f04b am: 43834d78ff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883

Change-Id: I90c457110b1bd444e08894560fccba483e2699f9
 2020-06-19 22:41:16 +00:00
Beth Thibodeau
5e6f05a533 Merge "[DO NOT MERGE] Add toggle for media resumption" into rvc-dev am: 0b152c29d0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883

Change-Id: Ib4dfa5a23c490651c0bc540866f4f99e77b70c6d
 2020-06-19 22:40:42 +00:00
Beth Thibodeau
a648d121b7 [DO NOT MERGE] Add toggle for media resumption am: 13f3e8f04b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883

Change-Id: Ifed5f6e94045c09bcb5009827c24e668a11ac0a2
 2020-06-19 22:40:39 +00:00
Beth Thibodeau
3ef895694d Merge "[DO NOT MERGE] Add toggle for media resumption" into rvc-dev am: 0b152c29d0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883

Change-Id: I2a1b2ee94f990485cf8f80b98daec71241eca000
 2020-06-19 22:40:27 +00:00
Beth Thibodeau
43834d78ff [DO NOT MERGE] Add toggle for media resumption am: 13f3e8f04b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883

Change-Id: Ib4fffb001ffe58da7e0a9ed759dc75c475b3ae8a
 2020-06-19 22:40:24 +00:00
Beth Thibodeau
0b152c29d0 Merge "[DO NOT MERGE] Add toggle for media resumption" into rvc-dev 2020-06-19 22:26:59 +00:00
TreeHugger Robot
992d31cd03 Merge "Add BatteryStatusFeatureProvider" 2020-06-19 14:02:13 +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
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