Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
59,603 Commits 1 Branch 0 Tags
a4fc50d316dd28007ac0bde82cff25196de0dcc0
Commit Graph

59603 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Menghan Li
3fd654becb Merge "Update R acessibility assets and strings (1/n)" into rvc-dev 2020-03-12 05:37:19 +00:00
Automerger Merge Worker
3cce160521 Merge "Fix DevelopmentSettingsDashboardFragmentTest" into rvc-dev am: 40613ef30c 
Change-Id: I345c9b8ccfcb801605066c2f0d14fe4b7a292d80
 2020-03-12 04:49:10 +00:00
TreeHugger Robot
40613ef30c Merge "Fix DevelopmentSettingsDashboardFragmentTest" into rvc-dev 2020-03-12 04:35:32 +00:00
Automerger Merge Worker
ee7f5bc540 Merge "Fix WifiTetherSettingsTest" into rvc-dev am: a7bd169814 
Change-Id: I343b3a129ef3875d45aabd52a9ffae85f14b8fcf
 2020-03-12 03:04:12 +00:00
TreeHugger Robot
a7bd169814 Merge "Fix WifiTetherSettingsTest" into rvc-dev 2020-03-12 02:54:35 +00:00
Automerger Merge Worker
631493c8e7 [automerger skipped] Merge "MetricId: Avoid byte[] and string ambiguity" am: 291ff22d7b am: 61167e098e -s ours 
am skip reason: skipped by user siyuanh

Change-Id: I0c69f31c9a4e16d3e6f479feddcf2ab452cab8a8
 2020-03-12 00:39:59 +00:00
Automerger Merge Worker
86fac6caee Merge "Remove search result for hidden magnification." into rvc-dev am: cbd5ec24d7 
Change-Id: I856ecc8f4edacd4879e0e72b81460504d5f8548e
 2020-03-12 00:39:49 +00:00
TreeHugger Robot
cbd5ec24d7 Merge "Remove search result for hidden magnification." into rvc-dev 2020-03-12 00:25:03 +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
69a31c2484 Merge "Partial revert of ag/10482633" into rvc-dev am: 8ee5045d68 
Change-Id: I0c30d3f4fb38b5ab066e62935d8ce9a7cf3e4e9b
 2020-03-11 21:00:17 +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
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
Automerger Merge Worker
61167e098e Merge "MetricId: Avoid byte[] and string ambiguity" am: 291ff22d7b 
Change-Id: I749ba8ae504f37a7a3e9f2c7aa09ebcca8245964
 2020-03-11 20:07:54 +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
Chen Chen
291ff22d7b Merge "MetricId: Avoid byte[] and string ambiguity" 2020-03-11 17:26:37 +00:00
jasonwshsu
27d06ff502 Remove search result for hidden magnification. 
* Use searchable = "false" to suppress search indexes.

Bug: 146019459
Test: manual test
Change-Id: I1188f201ddc9ec8d59faf2bcb549839c054f73bd
 2020-03-11 21:58:25 +08:00
Automerger Merge Worker
164dce85e4 Merge "Merge "Fix TetherSettingsTest" into rvc-dev am: 11dbe14584" into rvc-dev-plus-aosp 2020-03-11 13:29:35 +00:00
Automerger Merge Worker
d6c0f379c5 Merge "Fix TetherSettingsTest" into rvc-dev am: 11dbe14584 
Change-Id: I8d0ebe9a4b6c2acb19b8e1fc9003d85cf4818faf
 2020-03-11 13:29:29 +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
TreeHugger Robot
11dbe14584 Merge "Fix TetherSettingsTest" into rvc-dev 2020-03-11 13:12:56 +00:00
Automerger Merge Worker
ec71e52496 Merge "Fix Card 2's pin shows ON when only turn on card 1's pin" am: 23c382aa45 
Change-Id: I3f9d4e48bce108de162bb11daa91338951a71b46
 2020-03-11 13:09:00 +00:00
Automerger Merge Worker
fd3293d1db Merge "Tweak strings for assist app" into rvc-dev am: 16a7ba81f4 
Change-Id: I2193e15b508b9c2c5186afb2afa186d8d3f690fd
 2020-03-11 12:57:15 +00:00
Zoey Chen
23c382aa45 Merge "Fix Card 2's pin shows ON when only turn on card 1's pin" 2020-03-11 12:54:05 +00:00
TreeHugger Robot
16a7ba81f4 Merge "Tweak strings for assist app" into rvc-dev 2020-03-11 12:38:44 +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
Yi-Ling Chuang
b8eb466dd1 Fix WifiTetherSettingsTest 
Bug: 151201888
Test: run WifiTetherSettingsTest successfully
Change-Id: I80df83f3dc720c80734ec083c33bab5c56c52796
 2020-03-11 19:33:09 +08: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
Yi-Ling Chuang
f46fd991fa Fix DevelopmentSettingsDashboardFragmentTest 
Fixes: 151206654
Bug: 150907639
Test: robotests
Change-Id: I36a1dacc7fe2ccd3b724a9aa135447db97fa3d41
 2020-03-11 19:16:35 +08: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
Tsung-Mao Fang
a5da81db36 Tweak strings for assist app 
Follow up the new Assist app string updates.

Bug: 151193605
Test: build and see this page.
Change-Id: Ibbc51cd282c6ae0f9ef1722c33688f21e0c78da7
 2020-03-11 10:22:09 +00:00
Yi-Ling Chuang
542f76a51e Fix TetherSettingsTest 
Fixes: 151204777
Test: run TetherSettingsTest
Change-Id: Ic510aac7fc7f9af095e78473bc191a4e903dcaba
 2020-03-11 18:18:36 +08: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
Arc Wang
0a45c4099d [Wi-Fi] Fix 2 Wi-Fi shortcuts bug 
Check feature flag to show the shortcut of
WifiSettingsActivity or WifiSettings2Activity.

Bug: 151133236
Test: manual
      Home context menu -> Widgets -> Settings shortcut
      Should only show 1 Wi-Fi shortcut option.
Change-Id: Ie980b69ce1f23614475070b5c74d9a6d5cdab7ae
 2020-03-11 15:41:13 +08:00
Automerger Merge Worker
020efc050a [automerger skipped] Merge "Repoint ACTION_SECRET_CODE + ACTION_SIM_STATE_CHANGED" am: 7ef5614ee2 am: 382ac6e42e -s ours 
am skip reason: Change-Id I9404e2c3c816311c7ef3875622fe5cd5a315ec58 with SHA-1 721467c679 is in history

Change-Id: I62f64918ee1bf00cad66f117b400c4404f7e7996
 2020-03-11 06:04:38 +00:00
Automerger Merge Worker
382ac6e42e Merge "Repoint ACTION_SECRET_CODE + ACTION_SIM_STATE_CHANGED" am: 7ef5614ee2 
Change-Id: I2881def2e37235b8d9ef4d9d82ad0abc6e7ecab4
 2020-03-11 05:51:49 +00:00
Treehugger Robot
7ef5614ee2 Merge "Repoint ACTION_SECRET_CODE + ACTION_SIM_STATE_CHANGED" 2020-03-11 05:40:34 +00:00