PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
61,133 Commits 1 Branch 0 Tags
eda71b8c7695e2e2cb4323bf66b5044327dffea5
Commit Graph

30590 Commits

Author SHA1 Message Date
Automerger Merge Worker
05017ca458 Merge "Add policy transparency dialog to 'Remove work profile'" into rvc-dev am: 01d61e49af am: 60b59c3a56 am: 67e5d0e911 am: 7baff55fd5 
Change-Id: I53ec5ff4e27fc97b36336db03062e85178086a68
 2020-03-12 18:01:41 +00:00
Automerger Merge Worker
6bfc90ea6c Update ManageExternalStorageDetailsTest setUidMode am: 143ec3ec2b am: 8dfa636433 am: f7e7def0a4 am: 0b883269c2 
Change-Id: Ia6abe26b22ad4facd8de3cb258f7cba5fb1e7648
 2020-03-12 18:00:38 +00:00
Automerger Merge Worker
60b59c3a56 Merge "Add policy transparency dialog to 'Remove work profile'" into rvc-dev am: 01d61e49af 
Change-Id: I430ce4669bb4f56a4a62d8dbeed09c269db6c275
 2020-03-12 16:13:19 +00:00
Automerger Merge Worker
8dfa636433 Update ManageExternalStorageDetailsTest setUidMode am: 143ec3ec2b 
Change-Id: I29ec48cdee97305a70dba7fa76f28cb1a48ae5c9
 2020-03-12 16:12:46 +00:00
Alex Johnston
01d61e49af Merge "Add policy transparency dialog to 'Remove work profile'" into rvc-dev 2020-03-12 12:00:49 +00:00
shafik
143ec3ec2b Update ManageExternalStorageDetailsTest setUidMode 
We previously changed ManageExternalStorageDetails to use
AppOpsManager#setUidMode instead of AppOpsManager#setMode, but forgot to
update the relevant unittest. This CL changes that unittest.

Test: make RunSettingsRoboTests ROBOTEST_FILTER=ManageExternalStorageDetailsTest
Fix: 150914062
Change-Id: I2cfe7e7a19f2422474d11fb946089a6847b36b12
 2020-03-12 09:43:55 +00:00
Automerger Merge Worker
816f3b693c Merge "Hide the 5G opiton when 5G has been disallowed" into rvc-dev am: 59f5eb638e am: c1059b0f25 am: 977a698823 am: ab91b6fc7d 
Change-Id: I7ce1b6483994e8571d50c77e45ff0bc60e3fe4e4
 2020-03-12 07:24:10 +00:00
Automerger Merge Worker
977a698823 Merge "Hide the 5G opiton when 5G has been disallowed" into rvc-dev am: 59f5eb638e am: c1059b0f25 
Change-Id: I87825756a6920e39019c5dce12d34afb57c1f02f
 2020-03-12 06:54:18 +00:00
Automerger Merge Worker
01233f2fc2 Merge "Update R acessibility assets and strings (2/n)" into rvc-dev am: 873b50a46a am: 4c69bcab70 am: 5ed8894807 am: e5be54a8f4 
Change-Id: I31126710d4b2085711992fcb3da0ffef6e804a23
 2020-03-12 06:43:06 +00:00
Automerger Merge Worker
e673cc176f Merge "Update R acessibility assets and strings (1/n)" into rvc-dev am: 3fd654becb am: 9e15dc3582 am: d137a12391 am: 81f18805dd 
Change-Id: I7aa20264dced48447aa8ee8466b4f5e03b69bda3
 2020-03-12 06:42:26 +00:00
Zoey Chen
e34dc697d2 Merge "Fix Card 2's pin shows ON when only turn on card 1's pin" into rvc-dev 2020-03-12 06:40:04 +00:00
Automerger Merge Worker
a4fc50d316 Merge "Hide the 5G opiton when 5G has been disallowed" into rvc-dev am: 59f5eb638e 
Change-Id: If8c5007d7d1c2ca48420850acce74db358959f0f
 2020-03-12 06:38:34 +00:00
Calvin Pan
59f5eb638e Merge "Hide the 5G opiton when 5G has been disallowed" into rvc-dev 2020-03-12 06:25:11 +00:00
Automerger Merge Worker
5ed8894807 Merge "Update R acessibility assets and strings (2/n)" into rvc-dev am: 873b50a46a am: 4c69bcab70 
Change-Id: Ia3e222438b0716557f23bf6d2e39a2de9abe7cd9
 2020-03-12 06:17:51 +00:00
Automerger Merge Worker
d137a12391 Merge "Update R acessibility assets and strings (1/n)" into rvc-dev am: 3fd654becb am: 9e15dc3582 
Change-Id: Ib117c57c211d00b8bff1efcef59e4f6eb789a794
 2020-03-12 06:17:36 +00:00
Automerger Merge Worker
548e9e0370 Merge "Update R acessibility assets and strings (2/n)" into rvc-dev am: 873b50a46a 
Change-Id: I4ec3a3d4e082fb5f49de2aa1a48482e98afa9951
 2020-03-12 06:03:43 +00:00
Automerger Merge Worker
4636557ab7 Merge "Update R acessibility assets and strings (1/n)" into rvc-dev am: 3fd654becb 
Change-Id: Ifd71046d26c35b9bd400d1bc9a164e2210630280
 2020-03-12 06:03:23 +00:00
Menghan Li
873b50a46a Merge "Update R acessibility assets and strings (2/n)" into rvc-dev 2020-03-12 05:37:32 +00:00
zoey chen
cf33e51a55 Fix Card 2's pin shows ON when only turn on card 1's pin 
Bug: 150258187
Test: manual
Change-Id: Ifc54090da6737d31a2eb71eeabe6846592ff32fc
Merged-In: Ifc54090da6737d31a2eb71eeabe6846592ff32fc
 2020-03-12 03:56:46 +00:00
menghanli
a248e0e6d5 Update R acessibility assets and strings (1/n) 
- Color correction
- Color inversion
- Magnification
- Dwell
- Caption preferences
- Allow shortcut from lockscreen

Bug: 148837311
Test: Manual test
Change-Id: I1f5ff3bcbf53dab508311bcea3712ad2b30898eb
 2020-03-12 07:18:58 +08:00
Automerger Merge Worker
0080388a16 Merge "Partial revert of ag/10482633" into rvc-dev am: 8ee5045d68 am: 0cb70101c7 am: c678022a13 am: 75eaca4d0a 
Change-Id: Ib1fbd3288797f15eb80036d42dcd6917b3c7bddc
 2020-03-11 21:58:11 +00:00
Automerger Merge Worker
c678022a13 Merge "Partial revert of ag/10482633" into rvc-dev am: 8ee5045d68 am: 0cb70101c7 
Change-Id: Id210117c4d064bcd05adbc749a181271b5bd8413
 2020-03-11 21:23:05 +00:00
Automerger Merge Worker
a8b0106e27 Merge "Update empty state for apps bypassing dnd" into rvc-dev am: 79336396df am: 279d4d9983 am: f0034eb4ed am: bbe24da6a1 
Change-Id: I86cb18b1a8b18fb0270807cdbf8a9884547853e6
 2020-03-11 21:22:05 +00:00
Automerger Merge Worker
69a31c2484 Merge "Partial revert of ag/10482633" into rvc-dev am: 8ee5045d68 
Change-Id: I0c30d3f4fb38b5ab066e62935d8ce9a7cf3e4e9b
 2020-03-11 21:00:17 +00:00
Automerger Merge Worker
f0034eb4ed Merge "Update empty state for apps bypassing dnd" into rvc-dev am: 79336396df am: 279d4d9983 
Change-Id: I5b4d9c0ab3d2e087b0717728d6896209980986e1
 2020-03-11 20:59:10 +00:00
Kevin Chyn
8ee5045d68 Merge "Partial revert of ag/10482633" into rvc-dev 2020-03-11 20:56:42 +00:00
Automerger Merge Worker
5df2b2f142 Merge "Align help resource usage in caption preferences." into rvc-dev am: 91e5ece7ab am: 07fb084ce7 am: bfa63c5fbd am: 87b44ea9da 
Change-Id: I887ce0220886c085531c0e484373e2976865518a
 2020-03-11 20:49:45 +00:00
Automerger Merge Worker
706c05eaf4 Merge "Update empty state for apps bypassing dnd" into rvc-dev am: 79336396df 
Change-Id: I366b32e4d47fb10f0ff9b00cfa99d7cc53779ebe
 2020-03-11 20:47:37 +00:00
TreeHugger Robot
79336396df Merge "Update empty state for apps bypassing dnd" into rvc-dev 2020-03-11 20:33:15 +00:00
Automerger Merge Worker
07fb084ce7 Merge "Align help resource usage in caption preferences." into rvc-dev am: 91e5ece7ab 
Change-Id: I457fe332b417e991fe7e2625fef8f8f3c176daac
 2020-03-11 20:09:21 +00:00
Julia Reynolds
44b5b7c575 Update empty state for apps bypassing dnd 
Test: atest
Fixes: 150346679
Change-Id: Iccc5f1fb3dd7ee2c114f8757a020833b3b41e91d
 2020-03-11 18:09:47 +00:00
Jason Hsu
91e5ece7ab Merge "Align help resource usage in caption preferences." into rvc-dev 2020-03-11 17:47:16 +00:00
Automerger Merge Worker
a875ac154a Merge "Fix Card 2's pin shows ON when only turn on card 1's pin" am: 23c382aa45 am: ec71e52496 am: dcc0fa5f6e am: 9aa950e0d9 am: 607ecefc8c 
Change-Id: I6a50de7a97cbc78fb0c313dbde9c7c78f9a765da
 2020-03-11 14:11:00 +00:00
Automerger Merge Worker
dcc0fa5f6e Merge "Fix Card 2's pin shows ON when only turn on card 1's pin" am: 23c382aa45 am: ec71e52496 
Change-Id: I6f2b643c9c8a1aa799c6006943ed63ea68aeaf6a
 2020-03-11 13:29:27 +00:00
Automerger Merge Worker
c48e9b5e8e Merge "Fix NPE when coming back to settings homepage." into rvc-dev am: 21338186d5 am: f3aa88ccf2 am: 25325e9e20 am: e8d01bfdac 
Change-Id: I59f9155d553d19c6186123c4d2fa3a8e73b2c2fe
 2020-03-11 12:15:52 +00:00
Automerger Merge Worker
db7f6605bd Merge "Merge "[Wi-Fi] Fix 2 Wi-Fi shortcuts bug" into rvc-dev am: f9570ad33f am: 2df7ee7f0e" into rvc-d1-dev-plus-aosp am: 998ab43fc2 am: 2328c28f80 
Change-Id: Ia49c382eaee55bb1ae709d1c0fa5061ba8fafaa6
 2020-03-11 12:15:46 +00:00
Automerger Merge Worker
18627953fe Merge "Update the OWNER files" into rvc-dev am: a38859b2b7 am: ebe7dcaff8 am: dc192bf8ed am: 4ca5489d70 
Change-Id: Ic6213fe45e9169dd9c71cb7f0eff243b12f4b76d
 2020-03-11 12:15:02 +00:00
Automerger Merge Worker
25325e9e20 Merge "Fix NPE when coming back to settings homepage." into rvc-dev am: 21338186d5 am: f3aa88ccf2 
Change-Id: I1e6b3b26aa19fffc081123ff6eb000a3475866c7
 2020-03-11 11:50:59 +00:00
Automerger Merge Worker
95e42d21b1 Merge "[Wi-Fi] Fix 2 Wi-Fi shortcuts bug" into rvc-dev am: f9570ad33f am: 2df7ee7f0e 
Change-Id: I26ee114ba8ee4491e555bb0edbadac78e0b07466
 2020-03-11 11:50:55 +00:00
Automerger Merge Worker
dc192bf8ed Merge "Update the OWNER files" into rvc-dev am: a38859b2b7 am: ebe7dcaff8 
Change-Id: Ib261729db09b768a4f32502ee5dd405b36eee893
 2020-03-11 11:50:51 +00:00
Automerger Merge Worker
01a0945e36 Merge "Fix NPE when coming back to settings homepage." into rvc-dev am: 21338186d5 
Change-Id: I93e4bb5a6504c40bd708da9a461f0b8414838971
 2020-03-11 11:41:00 +00:00
TreeHugger Robot
21338186d5 Merge "Fix NPE when coming back to settings homepage." into rvc-dev 2020-03-11 11:40:02 +00:00
Automerger Merge Worker
a3b983560b Merge "[Wi-Fi] Fix 2 Wi-Fi shortcuts bug" into rvc-dev am: f9570ad33f 
Change-Id: I3fd8ec7621579ec4530cb0e37b9f8cfae72b737e
 2020-03-11 11:34:48 +00:00
TreeHugger Robot
f9570ad33f Merge "[Wi-Fi] Fix 2 Wi-Fi shortcuts bug" into rvc-dev 2020-03-11 11:32:12 +00:00
Automerger Merge Worker
818e26464d Merge "Update the OWNER files" into rvc-dev am: a38859b2b7 
Change-Id: Ia773a05c5375a17f8745dd2edf41f7ecf6f20151
 2020-03-11 11:29:17 +00:00
zoey chen
3bfbb818c7 Fix Card 2's pin shows ON when only turn on card 1's pin 
Bug: 150258187
Test: manual
Change-Id: Ifc54090da6737d31a2eb71eeabe6846592ff32fc
 2020-03-11 11:10:39 +00:00
TreeHugger Robot
a38859b2b7 Merge "Update the OWNER files" into rvc-dev 2020-03-11 11:08:21 +00:00
menghanli
19cf6ddff8 Update R acessibility assets and strings (2/n) 
- Temporary-use template summary by shortcut state

Bug: 148837311
Test: Manual test
Change-Id: Ia720b8f3f317bb1874d6758ebc4fbf4145d0c217
 2020-03-11 17:21:27 +08:00
Yi-Ling Chuang
a591d7a082 Fix NPE when coming back to settings homepage. 
When users navigate back to the homepage, if there is a slice being
displayed, slice callback will be triggered. It will then check if this
slice has any error hint, where NPE would occur if the slice turns out
to be null. Hence, add a null check before checking slice hint.

Fixes: 148158780
Test: rebuild and navigate back to the homepage.
Change-Id: I2b04dc0d64a223cc85f6af55b2ae2dbc5f3e1f40
 2020-03-11 16:52:44 +08:00
Sunny Shao
3d3757683c Update the OWNER files 
Bug: 151179432
Test: manual review
Change-Id: I2bfd917c2bea2d71303ed9aecf29d850f12eec3d
 2020-03-11 16:45:14 +08:00