PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
88,842 Commits 1 Branch 0 Tags
2c4fc20edb58a2651a2bd18c27702b2f8abb07f3
Commit Graph

88842 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
2c4fc20edb Merge "Fix test failures" into sc-dev am: ffd695983c am: 8618e4026e am: d20e26fa4b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14964818

Change-Id: I75fc96eb20fd50a36585247181a04cefc7c06b9c
 2021-06-15 06:54:16 +00:00
TreeHugger Robot
67ccf8e773 Merge "Fix test failures" into sc-dev am: ffd695983c am: 1c7f9846a1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14964818

Change-Id: I6c4fe6e91fecb412b7424880a239bd66a9f0262f
 2021-06-15 06:43:32 +00:00
TreeHugger Robot
d20e26fa4b Merge "Fix test failures" into sc-dev am: ffd695983c am: 8618e4026e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14964818

Change-Id: Ia571db49df9ea838bc4aff59e647820b9562c576
 2021-06-15 06:39:18 +00:00
TreeHugger Robot
1c7f9846a1 Merge "Fix test failures" into sc-dev am: ffd695983c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14964818

Change-Id: Ib3a0515d090845098292479f01be16fa31afaf3d
 2021-06-15 06:29:56 +00:00
TreeHugger Robot
8618e4026e Merge "Fix test failures" into sc-dev am: ffd695983c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14964818

Change-Id: If11d2f39990dbb57ef2300959807e6c5230ac505
 2021-06-15 06:29:37 +00:00
TreeHugger Robot
ffd695983c Merge "Fix test failures" into sc-dev 2021-06-15 06:17:52 +00:00
Wesley Wang
b0b9e36ade Merge "Make App info page support new battery entry" into sc-dev am: f2a884b8be am: 81fb7ab045 am: b6bc1d1957 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14800151

Change-Id: Ice9bc741fd5d1deac1fd878310cc70195b2bf588
 2021-06-15 05:22:26 +00:00
Wesley Wang
7554748653 Merge "Make App info page support new battery entry" into sc-dev am: f2a884b8be am: 4dc71183a3 am: e0775fc7c0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14800151

Change-Id: Ic8079d2452033d53a1e1f1170af1a1c77a31fc29
 2021-06-15 05:22:18 +00:00
Wesley Wang
b6bc1d1957 Merge "Make App info page support new battery entry" into sc-dev am: f2a884b8be am: 81fb7ab045 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14800151

Change-Id: I4740922d8ffed93ab5bb679fc4b1a8e251275274
 2021-06-15 05:14:41 +00:00
Wesley Wang
027d900daf Merge "Make App info page support new battery entry" into sc-dev am: f2a884b8be am: f294981a7d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14800151

Change-Id: Ia289536f84e1b0d6423c9dda42de5c52aeb0ef15
 2021-06-15 05:12:05 +00:00
Wesley Wang
e0775fc7c0 Merge "Make App info page support new battery entry" into sc-dev am: f2a884b8be am: 4dc71183a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14800151

Change-Id: I535bf60f62d1eb5a8a8da4e1e5146d6226663ca2
 2021-06-15 05:10:57 +00:00
Wesley Wang
81fb7ab045 Merge "Make App info page support new battery entry" into sc-dev am: f2a884b8be 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14800151

Change-Id: Ibf688fb3d207f0abd435f7d8b87d0d4f00c916a3
 2021-06-15 05:02:38 +00:00
Wesley Wang
4dc71183a3 Merge "Make App info page support new battery entry" into sc-dev am: f2a884b8be 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14800151

Change-Id: I5ad77479d5cbc6d5c230bbea5db5fac198e957de
 2021-06-15 04:58:04 +00:00
Wesley Wang
f294981a7d Merge "Make App info page support new battery entry" into sc-dev am: f2a884b8be 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14800151

Change-Id: I958acb81047e0e459ddc8efb458ee7f0effb1afe
 2021-06-15 04:58:02 +00:00
Wesley Wang
f2a884b8be Merge "Make App info page support new battery entry" into sc-dev 2021-06-15 04:41:16 +00:00
Midas Chien
5969f7f807 Merge "Change strings for force highest refresh rate in Developer options" into sc-dev am: 9598398df3 am: 5f13b2ac15 am: 8ae7364175 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934758

Change-Id: I1b8e5984166d47bba0dce8bea0d131dc8325166a
 2021-06-15 04:36:51 +00:00
Midas Chien
66e287c111 Merge "Change strings for force highest refresh rate in Developer options" into sc-dev am: 9598398df3 am: c252e58322 am: 8d543cd62c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934758

Change-Id: Ie61d572692195c8149330e2d40fd9a670240894a
 2021-06-15 04:36:45 +00:00
Midas Chien
8ae7364175 Merge "Change strings for force highest refresh rate in Developer options" into sc-dev am: 9598398df3 am: 5f13b2ac15 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934758

Change-Id: I7236d712626ef04310fbe88c4c47e2ac800ccd41
 2021-06-15 04:20:06 +00:00
Midas Chien
8d543cd62c Merge "Change strings for force highest refresh rate in Developer options" into sc-dev am: 9598398df3 am: c252e58322 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934758

Change-Id: I9df65fbcfd1326a36cc422a240710c83f51360f7
 2021-06-15 04:19:57 +00:00
Midas Chien
6cfe9da99d Merge "Change strings for force highest refresh rate in Developer options" into sc-dev am: 9598398df3 am: c5a736f633 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934758

Change-Id: I09f702a8ae8a7862d278a02b2823b0f6e8d62cc4
 2021-06-15 04:19:05 +00:00
Midas Chien
c252e58322 Merge "Change strings for force highest refresh rate in Developer options" into sc-dev am: 9598398df3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934758

Change-Id: Id90f416bb41b697b3d7de89082cb7cf7591ea37f
 2021-06-15 04:10:55 +00:00
Midas Chien
c5a736f633 Merge "Change strings for force highest refresh rate in Developer options" into sc-dev am: 9598398df3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934758

Change-Id: I046cd43607ef3abe416967bdb3acbfacb3f15590
 2021-06-15 04:10:06 +00:00
Midas Chien
5f13b2ac15 Merge "Change strings for force highest refresh rate in Developer options" into sc-dev am: 9598398df3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934758

Change-Id: I9c276afa567f7aefa79d4732581a7911dacbfa81
 2021-06-15 04:10:02 +00:00
Midas Chien
9598398df3 Merge "Change strings for force highest refresh rate in Developer options" into sc-dev 2021-06-15 04:00:43 +00:00
Arc Wang
ff5bb849ba Fix test failures 
Add the color contextual_card_background to fix.

Bug: 190868608
Bug: 190870129
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SliceContextualCardRendererTest
      make RunSettingsRoboTests ROBOTEST_FILTER=SliceHalfCardRendererHelperTest
Change-Id: I430dab9c72a8f4efb2402e44fd015c1c1ce0f7e6
 2021-06-15 10:25:06 +08:00
TreeHugger Robot
5417f61636 Merge "Changes to 'Alarms & reminders' permission setting" into sc-dev am: 052ae78759 am: c2546ecc86 am: e410232963 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14939788

Change-Id: I2b04f806790c43e89d63819ca65ae01b44908284
 2021-06-15 01:39:20 +00:00
TreeHugger Robot
e5839e5940 Merge "Changes to 'Alarms & reminders' permission setting" into sc-dev am: 052ae78759 am: bf5039ed58 am: 9509b385a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14939788

Change-Id: I911a71d7e7bd59f7f31e47578adb9c1eb7ee1f9b
 2021-06-15 01:39:07 +00:00
TreeHugger Robot
e410232963 Merge "Changes to 'Alarms & reminders' permission setting" into sc-dev am: 052ae78759 am: c2546ecc86 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14939788

Change-Id: I671d8e68eef9fa616f99c825611b1001be20a3c6
 2021-06-15 01:27:31 +00:00
TreeHugger Robot
9509b385a3 Merge "Changes to 'Alarms & reminders' permission setting" into sc-dev am: 052ae78759 am: bf5039ed58 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14939788

Change-Id: If1500c37a9c1e6b7a0a1afc4367f57da3ee8d154
 2021-06-15 01:27:00 +00:00
TreeHugger Robot
bd4ea47f6d Merge "Changes to 'Alarms & reminders' permission setting" into sc-dev am: 052ae78759 am: e919947ad0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14939788

Change-Id: I61d13da7ba7f6edb6a19b790efc9543065b15c28
 2021-06-15 01:26:45 +00:00
TreeHugger Robot
bf5039ed58 Merge "Changes to 'Alarms & reminders' permission setting" into sc-dev am: 052ae78759 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14939788

Change-Id: I2ef40f8dbccbb0dc7a933267f1d4718f18393f96
 2021-06-15 01:12:20 +00:00
TreeHugger Robot
e919947ad0 Merge "Changes to 'Alarms & reminders' permission setting" into sc-dev am: 052ae78759 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14939788

Change-Id: Ibbef8459369b5f31315e0680f69e8e2a3e4d2868
 2021-06-15 01:11:37 +00:00
TreeHugger Robot
c2546ecc86 Merge "Changes to 'Alarms & reminders' permission setting" into sc-dev am: 052ae78759 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14939788

Change-Id: Ica8a071cf361e64f899e786ff1658c1a9b12fba4
 2021-06-15 01:10:48 +00:00
TreeHugger Robot
052ae78759 Merge "Changes to 'Alarms & reminders' permission setting" into sc-dev 2021-06-15 00:57:46 +00:00
Peter Wang
8f72495046 Merge "Fix ToggleSubscriptionDialogActivity dialog theme." into sc-dev am: 5a6655d356 am: 55d804ab71 am: ec429acb15 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14941671

Change-Id: I9e2e4016a1e3286bbd0282b267b47ef45d746f0a
 2021-06-14 19:19:12 +00:00
Peter Wang
50cb0b8d45 Merge "Fix ToggleSubscriptionDialogActivity dialog theme." into sc-dev am: 5a6655d356 am: ceaec5d877 am: 38c34dd446 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14941671

Change-Id: I3969258b7b2684d05c1f62037e686770d2d4e737
 2021-06-14 19:18:24 +00:00
Peter Wang
ec429acb15 Merge "Fix ToggleSubscriptionDialogActivity dialog theme." into sc-dev am: 5a6655d356 am: 55d804ab71 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14941671

Change-Id: I44419344855118b47bd354d77837f4001db67593
 2021-06-14 18:31:38 +00:00
Peter Wang
38c34dd446 Merge "Fix ToggleSubscriptionDialogActivity dialog theme." into sc-dev am: 5a6655d356 am: ceaec5d877 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14941671

Change-Id: I802da3cbef2fe5bfa9ede0161a0ec623b2201486
 2021-06-14 18:28:06 +00:00
Peter Wang
fa10eff411 Merge "Fix ToggleSubscriptionDialogActivity dialog theme." into sc-dev am: 5a6655d356 am: 43fe473265 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14941671

Change-Id: I4a45e5e98d8c59c4f3abcc114bdfbe8e3495920b
 2021-06-14 18:23:55 +00:00
Peter Wang
55d804ab71 Merge "Fix ToggleSubscriptionDialogActivity dialog theme." into sc-dev am: 5a6655d356 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14941671

Change-Id: I9603abb876fa91771d07377292567aac3a3aa7a0
 2021-06-14 18:15:52 +00:00
Peter Wang
ceaec5d877 Merge "Fix ToggleSubscriptionDialogActivity dialog theme." into sc-dev am: 5a6655d356 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14941671

Change-Id: Iede2f2c33a6cf6202bbe1ee0f7523f8e4f372788
 2021-06-14 18:15:33 +00:00
Peter Wang
43fe473265 Merge "Fix ToggleSubscriptionDialogActivity dialog theme." into sc-dev am: 5a6655d356 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14941671

Change-Id: I55ec0dbdc4484a507558624e9a4ffc0afde4baea
 2021-06-14 18:15:02 +00:00
Peter Wang
5a6655d356 Merge "Fix ToggleSubscriptionDialogActivity dialog theme." into sc-dev 2021-06-14 17:58:40 +00:00
TreeHugger Robot
785e35b345 Merge "Remove "Require all non-trusted certificate statuses" option" into sc-dev am: 46bcf5ae17 am: 1f3b3c1b26 am: c577ce155e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14948330

Change-Id: I2522350d2fbdbf19cd3babde9e716429ea1706c7
 2021-06-14 17:55:02 +00:00
TreeHugger Robot
cd7e2ab9c9 Merge "Remove "Require all non-trusted certificate statuses" option" into sc-dev am: 46bcf5ae17 am: 71abdcf20d am: 26a2dd9ebf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14948330

Change-Id: Id28f90719037730643ce5afd4edac3d3be4edf1e
 2021-06-14 17:54:53 +00:00
TreeHugger Robot
c577ce155e Merge "Remove "Require all non-trusted certificate statuses" option" into sc-dev am: 46bcf5ae17 am: 1f3b3c1b26 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14948330

Change-Id: I6c07d53ff4acb2196ab8aaa589ded1386153af61
 2021-06-14 17:30:17 +00:00
TreeHugger Robot
2c4942d41b Merge "Remove "Require all non-trusted certificate statuses" option" into sc-dev am: 46bcf5ae17 am: 958d43aa1d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14948330

Change-Id: Ia24f7a6b48a1697c1ab48eb27d7973dd3fa5aa6f
 2021-06-14 17:30:06 +00:00
TreeHugger Robot
26a2dd9ebf Merge "Remove "Require all non-trusted certificate statuses" option" into sc-dev am: 46bcf5ae17 am: 71abdcf20d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14948330

Change-Id: I769a00426b437bff90d03ed23ca7e7fcaf223a67
 2021-06-14 17:29:53 +00:00
Joe Bolinger
d6d7e53e9b Merge "Delay invoking biometric prompt." into sc-dev am: a72230977d am: 2ddba89db0 am: 57b3de9edf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14925234

Change-Id: I0d4d25469e830ec38acf389e458b77e7e1f4dd54
 2021-06-14 17:24:10 +00:00
TreeHugger Robot
71abdcf20d Merge "Remove "Require all non-trusted certificate statuses" option" into sc-dev am: 46bcf5ae17 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14948330

Change-Id: If09eefeab60fcb33d93b3c5491d97e366751a93c
 2021-06-14 17:15:10 +00:00