Yomna Nasser
9057e39d7f
Merge "Move "Allow 2G" controller under DisabledSubscriptionController." into sc-dev am: cf77b7a248
am: ea343fa5a4
am: cc7d1df747
am: f64dc309ac
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15491273
Change-Id: Ia48a04ba72dddc241d1378e1638ed0e7db9d773b
2021-08-17 01:10:40 +00:00
Yomna Nasser
b4034002b4
Merge "Move "Allow 2G" controller under DisabledSubscriptionController." into sc-dev am: cf77b7a248
am: ea343fa5a4
am: 4ff69294a4
am: e4bfb7de87
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15491273
Change-Id: I37ac2d1bd35a8eef30b408944013b304b52ec2da
2021-08-17 01:10:33 +00:00
Yomna Nasser
22bbcb5acd
Merge "Move "Allow 2G" controller under DisabledSubscriptionController." into sc-dev am: cf77b7a248
am: 87259ab2af
am: da6c658b99
am: 19c1eba133
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15491273
Change-Id: Id58f711e1671d0347ebc78cc13fa1a268e6b9b53
2021-08-17 01:10:21 +00:00
Curtis Belmonte
af9f57c928
Merge "Remove/replace old fingerprint icon in SUW/Settings" into sc-dev am: 7fb2316a21
am: fe7d4e0100
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15585467
Change-Id: I094031933a8eff88ffb0357649d86ee94e1c121c
2021-08-17 01:01:28 +00:00
Curtis Belmonte
a0847b6130
Merge changes from topic "presubmit-am-50cf8052ea594bbfb9d45e820e7b72cd" into sc-mainline-prod am: 562d29d081
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15585467
Change-Id: Ia95f2c062c6dcdbd40ed5f51bcb7c4fa96dc3f88
2021-08-17 01:01:21 +00:00
Curtis Belmonte
fe7d4e0100
Merge "Remove/replace old fingerprint icon in SUW/Settings" into sc-dev am: 7fb2316a21
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15585467
Change-Id: I3be1462474321f1834f44cd193836ec71dd20542
2021-08-17 01:01:21 +00:00
Yomna Nasser
f64dc309ac
Merge "Move "Allow 2G" controller under DisabledSubscriptionController." into sc-dev am: cf77b7a248
am: ea343fa5a4
am: cc7d1df747
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15491273
Change-Id: I324006143b33deeca77021a6187ad7636588ad2e
2021-08-17 00:56:43 +00:00
Yomna Nasser
e4bfb7de87
Merge "Move "Allow 2G" controller under DisabledSubscriptionController." into sc-dev am: cf77b7a248
am: ea343fa5a4
am: 4ff69294a4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15491273
Change-Id: Ie79c34db0894229d263fd2361285e4eeb2391ea7
2021-08-17 00:56:23 +00:00
Yomna Nasser
19c1eba133
Merge "Move "Allow 2G" controller under DisabledSubscriptionController." into sc-dev am: cf77b7a248
am: 87259ab2af
am: da6c658b99
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15491273
Change-Id: I50a1f816db1831e0570c07878e963632c70c7d31
2021-08-17 00:56:17 +00:00
Curtis Belmonte
562d29d081
Merge changes from topic "presubmit-am-50cf8052ea594bbfb9d45e820e7b72cd" into sc-mainline-prod
...
* changes:
[automerge] Remove/replace old fingerprint icon in SUW/Settings 2p: dc9b53c446
Remove/replace old fingerprint icon in SUW/Settings
2021-08-17 00:47:58 +00:00
Curtis Belmonte
7fb2316a21
Merge "Remove/replace old fingerprint icon in SUW/Settings" into sc-dev
2021-08-17 00:47:58 +00:00
Yomna Nasser
cc7d1df747
Merge "Move "Allow 2G" controller under DisabledSubscriptionController." into sc-dev am: cf77b7a248
am: ea343fa5a4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15491273
Change-Id: I66ce87c90de8da8b288295dfbb7f9be0b05132fc
2021-08-17 00:43:43 +00:00
Yomna Nasser
4ff69294a4
Merge "Move "Allow 2G" controller under DisabledSubscriptionController." into sc-dev am: cf77b7a248
am: ea343fa5a4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15491273
Change-Id: I357fb09a14d85c85fed75603da9f96aa44ff6786
2021-08-17 00:43:41 +00:00
Yomna Nasser
da6c658b99
Merge "Move "Allow 2G" controller under DisabledSubscriptionController." into sc-dev am: cf77b7a248
am: 87259ab2af
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15491273
Change-Id: I3a5aa2741d2a8bb9495fb5e88b27d1248d60f7ef
2021-08-17 00:43:26 +00:00
Yomna Nasser
4c7c958e02
Merge "Move "Allow 2G" controller under DisabledSubscriptionController." into sc-dev am: cf77b7a248
am: 862a35d7fb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15491273
Change-Id: I151a87339710d05d0f737b507ff911788b423455
2021-08-17 00:42:56 +00:00
Yomna Nasser
ea343fa5a4
Merge "Move "Allow 2G" controller under DisabledSubscriptionController." into sc-dev am: cf77b7a248
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15491273
Change-Id: Ic40a46ce6d36e5147fc99ed3afb1bb1735164cad
2021-08-17 00:30:30 +00:00
Yomna Nasser
87259ab2af
Merge "Move "Allow 2G" controller under DisabledSubscriptionController." into sc-dev am: cf77b7a248
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15491273
Change-Id: I04e70b72a0c2cd197ae993139c9fb60b01a07a23
2021-08-17 00:29:43 +00:00
Yomna Nasser
862a35d7fb
Merge "Move "Allow 2G" controller under DisabledSubscriptionController." into sc-dev am: cf77b7a248
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15491273
Change-Id: I336dfff8e36549bc33431748f60fa88650a8ea01
2021-08-17 00:29:40 +00:00
Yomna Nasser
cf77b7a248
Merge "Move "Allow 2G" controller under DisabledSubscriptionController." into sc-dev
2021-08-17 00:12:39 +00:00
Curtis Belmonte
5cf728d2fc
[automerge] Remove/replace old fingerprint icon in SUW/Settings 2p: dc9b53c446
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15585467
Change-Id: Ib847b70e4bc427d4f3c3b78f67a68b63b71d74c8
2021-08-16 21:44:39 +00:00
Curtis Belmonte
dc9b53c446
Remove/replace old fingerprint icon in SUW/Settings
...
Replaces instances of the old fingerprint icon shown during Setup Wizard
or in Settings with either an updated version or an entirely different
icon.
Test: Manual
Fixes: 196600265
Change-Id: If78e8f0dbdb033f557614a019d4c9dde4493b6c6
2021-08-16 14:44:15 -07:00
Alex Florescu
d65e8ad16e
Set a maximum width for the settings bottom panel on large screens am: 9fab04b913
am: d6adfa60d5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15543301
Change-Id: Ib5266152aae2fcbaaa6be9c3ced83f672f681c36
2021-08-16 10:56:19 +00:00
Alex Florescu
d6adfa60d5
Set a maximum width for the settings bottom panel on large screens am: 9fab04b913
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15543301
Change-Id: Icba157112b88c2568b7ffcaaafc8422e919af6f6
2021-08-16 10:41:40 +00:00
Alex Florescu
9fab04b913
Set a maximum width for the settings bottom panel on large screens
...
Bug: 187297703
Test: manual
Change-Id: I18ec554dbb6edae88b1d73f4682a77106f787461
2021-08-16 09:15:01 +00:00
TreeHugger Robot
517a5aedda
Merge "Prototyping : Demo Image on color setting" into sc-qpr1-dev am: 7efaff8d0f
am: e9f836a004
am: 641f879e66
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15531055
Change-Id: I5feaeb19a363c337e26aa5ec309f16cdba18c826
2021-08-14 07:50:11 +00:00
TreeHugger Robot
80544241db
Merge "Prototyping : Demo Image on color setting" into sc-qpr1-dev am: 7efaff8d0f
am: f680c9b0b5
am: 85e6aba27f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15531055
Change-Id: I8e6d18b8be6960be4e1557a07405d65412205b70
2021-08-14 07:49:54 +00:00
TreeHugger Robot
641f879e66
Merge "Prototyping : Demo Image on color setting" into sc-qpr1-dev am: 7efaff8d0f
am: e9f836a004
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15531055
Change-Id: I07cd46ff34317a30e2b90f8d500b86c2c82e03ee
2021-08-14 07:37:45 +00:00
TreeHugger Robot
85e6aba27f
Merge "Prototyping : Demo Image on color setting" into sc-qpr1-dev am: 7efaff8d0f
am: f680c9b0b5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15531055
Change-Id: I22f3bf1a65273f70a59cb59018bc9f44d04552b2
2021-08-14 07:37:41 +00:00
TreeHugger Robot
e9f836a004
Merge "Prototyping : Demo Image on color setting" into sc-qpr1-dev am: 7efaff8d0f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15531055
Change-Id: Ic64df3fc905575608ec561ba9e8d2efb93fe0b7c
2021-08-14 07:26:54 +00:00
TreeHugger Robot
f680c9b0b5
Merge "Prototyping : Demo Image on color setting" into sc-qpr1-dev am: 7efaff8d0f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15531055
Change-Id: If4c7ffd19e06965e34f5185e63b22d58d3ca08d8
2021-08-14 07:26:53 +00:00
TreeHugger Robot
7efaff8d0f
Merge "Prototyping : Demo Image on color setting" into sc-qpr1-dev
2021-08-14 07:13:12 +00:00
Adam Bookatz
dc8a5ad008
Merge "Easy app-installing for Guest users"
2021-08-14 01:37:43 +00:00
Joshua Lewis
d16c016142
Merge "Add JobScheduler support in factor controller"
2021-08-14 01:04:34 +00:00
Joshua
76ca8923ab
Add JobScheduler support in factor controller
...
Initializes the JobScheduler constants string in Global Settings and
takes it through the parsing of creating a map with the key:value pairs
linked to the JobScheduler policy. Also changes the way the getter
methods work to take a factor policy so we can know what policy to
change.
Bug: 195056296
Bug: 195056102
Bug: 195055895
Test: Manual
Change-Id: Id82101b2a045dd14bb8eacfbe51c363b4bafb1ce
2021-08-13 23:44:59 +00:00
Alex Salo
ec94cff0f6
Merge "Add toggle switch for auto rotate preference in display settings."
2021-08-13 23:24:18 +00:00
TreeHugger Robot
df442a7a94
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 87a7ebe1d9
-s ours am: d3a02937ce
-s ours am: 0af8e8e5cd
-s ours am: 17a08343bf
-s ours am: 146e5545ca
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15550359
Change-Id: I0b0b534383cc9f12d20621f4bbdcc6726e8cadb2
2021-08-13 22:53:35 +00:00
Bill Yi
a9388a6f42
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca003ac628
-s ours am: 04c33bbf71
-s ours am: 15bb8d9aae
-s ours am: 6e95702bd8
-s ours am: 005b4f57a7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551606
Change-Id: Id2b14f24bc37cfe68ccd4558550bd3e3f048515e
2021-08-13 22:53:23 +00:00
TreeHugger Robot
440007d2de
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 87a7ebe1d9
-s ours am: d3a02937ce
-s ours am: e51ac2563b
-s ours am: 69f2f00362
-s ours am: d645a1cd93
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15550359
Change-Id: I0eb158becbb305e2e740f0503d8f22201f9b530e
2021-08-13 22:53:05 +00:00
Bill Yi
96ada3a832
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca003ac628
-s ours am: 04c33bbf71
-s ours am: c23385ba9c
-s ours am: 8e53fa2ae0
-s ours am: 07c3ce6345
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551606
Change-Id: Ia5b93a160017bbb3fb2fad39b36684b29151c5fa
2021-08-13 22:52:46 +00:00
TreeHugger Robot
d8d36fb56b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 737f4d76c9
-s ours am: cc5b59c9a4
-s ours am: 32cf5641ea
-s ours am: 4a59379253
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551919
Change-Id: Ic14262213423b215ff9374fd58d9a603d924fe18
2021-08-13 22:52:24 +00:00
TreeHugger Robot
a585f43503
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 65d286f6a9
-s ours am: 7508bd0cd2
-s ours am: 37dde5b3df
-s ours am: 3f94586dbd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551913
Change-Id: I96f7a2c2689c377b84afe0f42343101cdf5695cb
2021-08-13 22:52:03 +00:00
TreeHugger Robot
8143cf3bd2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b75551a41c
-s ours am: 96bd289bf7
-s ours am: dcd45dca23
-s ours am: ea855b2730
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551901
Change-Id: I480f1f3544b939d794031bd73555be2500fffae5
2021-08-13 22:51:40 +00:00
TreeHugger Robot
db5c82b443
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 737f4d76c9
-s ours am: bd1e418efc
-s ours am: d7c6436ea4
-s ours am: 360cfb2b6b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551919
Change-Id: I943c1c043483ca3b9573f2f7ee4b7a7455af9816
2021-08-13 22:51:22 +00:00
TreeHugger Robot
af5c682741
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 65d286f6a9
-s ours am: 652c469f3e
-s ours am: edcd71932d
-s ours am: e583bf989f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551913
Change-Id: I15531968f4c1e69a2c21fe25ac784f605c9e9ed6
2021-08-13 22:50:50 +00:00
TreeHugger Robot
ad46b427a3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b75551a41c
-s ours am: 612fb2cb80
-s ours am: 4ea6925fef
-s ours am: f99c370e3e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551901
Change-Id: Icf5510d187a40b977b7f08d4b9ad5e04b4a93170
2021-08-13 22:50:10 +00:00
TreeHugger Robot
61ef34b94a
Merge changes from topic "presubmit-am-721dec71ccbe4d0dbf043884e732f7a9" into sc-dev-plus-aosp am: afa6f208d0
am: bffa291613
am: 2354bb5b95
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551919
Change-Id: Ife9f5aa34850df5410ed735d2db41bd13c301984
2021-08-13 22:49:42 +00:00
Bill Yi
801746d469
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d486302dc9
am: f13f8b9065
-s ours am: 9a2aa2693b
-s ours am: 7fcd3e9c0c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551919
Change-Id: Iadb4cb025803b81af77b33619d82414a9bb084e5
2021-08-13 22:49:39 +00:00
TreeHugger Robot
b150f31d39
Merge changes from topic "presubmit-am-3e93273879994225a8d8eeed67c1ef7b" into sc-dev-plus-aosp am: 255f31826f
am: 3759660383
am: 739ee8ed8c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551913
Change-Id: I523e47fac345e6acda05d4cf13b97b39bf4c0a91
2021-08-13 22:49:01 +00:00
Bill Yi
6de25d5671
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f30152962c
am: f13d3514ec
-s ours am: 4948e577ec
-s ours am: 4cccd4bd25
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551913
Change-Id: Ie80b94a2b1f2c14903fca4fe765e4b6b0a1d97be
2021-08-13 22:49:00 +00:00
TreeHugger Robot
17e3f28bb4
Merge changes from topic "presubmit-am-68e20da25bf941f39d414fc5cb3e17a3" into sc-dev-plus-aosp am: 3f6005944c
am: a755975337
am: 4559f1ee53
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551901
Change-Id: I22e51d2ea712e52c80cf53f94a023025d23ba234
2021-08-13 22:47:55 +00:00