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

30705 Commits

Author SHA1 Message Date
Eric Sandness
f483084edb Use ChooseLockGeneric When Started By Admin App am: 7430932305 am: 66df88126f am: e6951038a1 am: f9720237fc 
Change-Id: Ie0dedea428394e0b9b52584b48ea61671d8e1ef8
 2020-03-17 21:12:16 +00:00
Eric Sandness
66df88126f Use ChooseLockGeneric When Started By Admin App am: 7430932305 
Change-Id: I78fd46587c0d3c598867c972bb9c9df038b30a1b
 2020-03-17 20:34:12 +00:00
Eric Sandness
7430932305 Use ChooseLockGeneric When Started By Admin App 
The device management app may run before the end of device provisioning,
and it may start SetNewPasswordActivity.  If this happens, use
ChooseLockGeneric instead of SetupChooseLockGeneric.  Only use
SetupChoseLockGeneric if SetNewPasswordActivity was started by Setup
Wizard itself.

Fixes: 151552453
Test: atest com.android.settings.password.SetNewPasswordActivityTest
Test: atest com.android.settings.password.ChooseLockGenericTest
Test: Manually run consumer and enterprise device setup
Change-Id: I3b479ed18211d6625654f266fe692f07d0047e4f
 2020-03-17 17:16:08 +00:00
Automerger Merge Worker
4727170883 Merge "Remove the index of the homepage category tiles" into rvc-dev am: 9204d76c45 am: a4ad8f636a am: af6b6d2276 am: 3f8733ddca 
Change-Id: I7c78a425f3f16ef8d18a4720ee250f83d299f3ed
 2020-03-17 14:14:27 +00:00
Automerger Merge Worker
6cdc5bd287 Merge "Add NR Global to the logic to check if it is Global" into rvc-dev am: 76f4a29510 am: 85b0f5fcd2 am: 4f19e358c8 am: 5826fc7933 
Change-Id: I79d53f43e9d66a24ad025954b023faa94580abd6
 2020-03-17 14:00:52 +00:00
Automerger Merge Worker
af6b6d2276 Merge "Remove the index of the homepage category tiles" into rvc-dev am: 9204d76c45 am: a4ad8f636a 
Change-Id: I3f07c8c044cfccbdfaf2f4b7f0274bff79a611e4
 2020-03-17 13:48:00 +00:00
Automerger Merge Worker
618ebc3fdf Merge "Remove the index of the homepage category tiles" into rvc-dev am: 9204d76c45 
Change-Id: I5914dc21bfa9659fe8ad7abfff027aa10ab5c210
 2020-03-17 13:28:15 +00:00
Automerger Merge Worker
4f19e358c8 Merge "Add NR Global to the logic to check if it is Global" into rvc-dev am: 76f4a29510 am: 85b0f5fcd2 
Change-Id: I4fd74c8dba82fb6d92147c6b72bcbbe142704ea1
 2020-03-17 13:15:07 +00:00
Yanting Yang
9204d76c45 Merge "Remove the index of the homepage category tiles" into rvc-dev 2020-03-17 13:11:40 +00:00
Automerger Merge Worker
c63489139c Merge "Add NR Global to the logic to check if it is Global" into rvc-dev am: 76f4a29510 
Change-Id: Ic2788de5e3d7926813d5f36293cef55f67edc131
 2020-03-17 13:03:09 +00:00
TreeHugger Robot
76f4a29510 Merge "Add NR Global to the logic to check if it is Global" into rvc-dev 2020-03-17 12:51:04 +00:00
Automerger Merge Worker
4c8fb69605 Merge "Fix sim pin lock preference disappear in dual sim." into rvc-dev am: 217740d640 am: 05985cb26e am: f82c724f30 am: 7b83400539 
Change-Id: I33bbe3624d2901d68341a0555a45bbd1b42f9b99
 2020-03-17 12:35:45 +00:00
Automerger Merge Worker
f82c724f30 Merge "Fix sim pin lock preference disappear in dual sim." into rvc-dev am: 217740d640 am: 05985cb26e 
Change-Id: Ia01fd111005b4806d82f909d05cbd3f6359e61d4
 2020-03-17 12:04:25 +00:00
Automerger Merge Worker
c57774521c Merge "Fix sim pin lock preference disappear in dual sim." into rvc-dev am: 217740d640 
Change-Id: I6b25ea976cbde89633e917491513254163d8418d
 2020-03-17 11:50:00 +00:00
TreeHugger Robot
217740d640 Merge "Fix sim pin lock preference disappear in dual sim." into rvc-dev 2020-03-17 11:32:34 +00:00
calvinpan
ff11f200c8 Add NR Global to the logic to check if it is Global 
Bug: 151285260
Test: Build pass
Change-Id: I4d84c6669d6385bef5d75fca4cd6f2ff17533b6e
 2020-03-17 18:27:34 +08:00
Yanting Yang
298a7fe2e5 Remove the index of the homepage category tiles 
Do not index the tiles of homepage category since we would like to index
their target activity for search.

Fixes: 151418948
Test: visual
Change-Id: I693534de006b4dbcaf192858e6f7d031bad78fef
 2020-03-17 17:55:49 +08:00
Automerger Merge Worker
850ec0b38a Merge "Change to public POWER_SAVE_MODE_CHANGED broadcast." into rvc-dev am: 1a84719041 am: da9185b887 am: d4bf77db85 am: 5b0b67f6fd 
Change-Id: Ib2cc96a21a81b58cf1606daef9a4da48998e5f95
 2020-03-17 06:43:58 +00:00
SongFerngWang
3d54554521 Fix sim pin lock preference disappear in dual sim. 
If one sim hide the preference and another one show the preference,
the preference always hide. The root cause is config value is wrong.
It should get config with subid.

Bug: 149800931
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SimLockPreferenceControllerTest
Change-Id: I91b551bc363b8ecb0a4b6b40e9de79c74ccd76fd
 2020-03-17 14:35:31 +08:00
Automerger Merge Worker
d4bf77db85 Merge "Change to public POWER_SAVE_MODE_CHANGED broadcast." into rvc-dev am: 1a84719041 am: da9185b887 
Change-Id: I0a8007c3bfd9dbd61f1856d139a54e97b429fb99
 2020-03-17 06:11:19 +00:00
Automerger Merge Worker
e599f0432e Merge "Change to public POWER_SAVE_MODE_CHANGED broadcast." into rvc-dev am: 1a84719041 
Change-Id: Ief773b87a528393024fde3bef29816f6860e07f2
 2020-03-17 05:58:42 +00:00
TreeHugger Robot
1a84719041 Merge "Change to public POWER_SAVE_MODE_CHANGED broadcast." into rvc-dev 2020-03-17 05:43:45 +00:00
Automerger Merge Worker
ef04267344 Merge "Output switcher header is not updated with the latest media content" into rvc-dev am: 95cd4c9414 am: e1c3cdf682 am: dab418626e am: 61e1d03d3b 
Change-Id: I25c789e70f36b64c4756ef3e1f118bdce22f3934
 2020-03-17 04:29:14 +00:00
Automerger Merge Worker
dab418626e Merge "Output switcher header is not updated with the latest media content" into rvc-dev am: 95cd4c9414 am: e1c3cdf682 
Change-Id: I0819ebac710020ea2df799ada34f9fef48337860
 2020-03-17 03:55:31 +00:00
Automerger Merge Worker
bd59e9ad27 Merge "Output switcher header is not updated with the latest media content" into rvc-dev am: 95cd4c9414 
Change-Id: Iada645d9939d5b7343d1ebef27ccba669e9dc268
 2020-03-17 03:45:43 +00:00
tim peng
95cd4c9414 Merge "Output switcher header is not updated with the latest media content" into rvc-dev 2020-03-17 03:26:50 +00:00
Automerger Merge Worker
6fd068c58b Require attention pref not searchable by default am: 593b5671c8 am: 441019142c am: d227833dde am: aee938817b 
Change-Id: I9ae301b2067af818196c734aceec9e2f22063508
 2020-03-17 01:28:44 +00:00
Tim Peng
36c4949414 Output switcher header is not updated with the latest media content 
-Register media controller callback
-Update panel header when medadata changes
-Add test cases

Bug: 151396986
Test: make -j50 RunSettingsRoboTests
Change-Id: Id0b8f997899a96c0c94ca6bf099e624a9e87795b
 2020-03-17 09:02:34 +08:00
Automerger Merge Worker
d227833dde Require attention pref not searchable by default am: 593b5671c8 am: 441019142c 
Change-Id: I7e5d52e4317a06495ad3c62db4dc7682401d9e03
 2020-03-17 00:50:24 +00:00
Automerger Merge Worker
391d6763fa Require attention pref not searchable by default am: 593b5671c8 
Change-Id: I42a89f083a44b644b95f88ebf0a4ef93036a5ccd
 2020-03-17 00:34:28 +00:00
joshmccloskey
593b5671c8 Require attention pref not searchable by default 
Test: Attempted to search with the keyword eyes and found nothing.
Bug: 150933895
Change-Id: Ic69d4fc9fe495fe6d133b695ce48055f6fd65d35
 2020-03-16 22:03:28 +00:00
Automerger Merge Worker
ce524d941f Merge "Do not finish early if caller is SUW" into rvc-dev am: b2c35f7fcc am: f4ca410ad7 am: 19b27604b6 am: 5df00d8c17 
Change-Id: I18691f8b67c7b2f04edd1bf247fba35f7c13b9cc
 2020-03-16 20:17:44 +00:00
Kweku Adams
a7e58d7732 Change to public POWER_SAVE_MODE_CHANGED broadcast. 
The POWER_SAVE_MODE_CHANGING broadcast is sent at the same time as the
POWER_SAVE_MODE_CHANGED broadcast. Since broadcasts are asynchronous,
there's no reason to have both, so we're simplifying down to just one.

Bug: 79580230
Test: atest BatterySaverReceiverTest
Change-Id: Ib27fc91bc23126f58532e534575d912e3b72ac43
 2020-03-16 12:56:46 -07:00
Automerger Merge Worker
19b27604b6 Merge "Do not finish early if caller is SUW" into rvc-dev am: b2c35f7fcc am: f4ca410ad7 
Change-Id: Id7f186a312c69aeed5c7acefd7c3865df361e76a
 2020-03-16 19:25:31 +00:00
Automerger Merge Worker
022790b197 Merge "Do not finish early if caller is SUW" into rvc-dev am: b2c35f7fcc 
Change-Id: Ic74ab9f03b43fd1eebcb6fc32556f37b31c20943
 2020-03-16 19:08:28 +00:00
TreeHugger Robot
b2c35f7fcc Merge "Do not finish early if caller is SUW" into rvc-dev 2020-03-16 18:56:54 +00:00
Kevin Chyn
e6bcc49eb9 Do not finish early if caller is SUW 
Fixes: 151576034


Test: Wipe device, go past fingerprint enrollment in SUW, press
      back button. SUW should not get stuck
Change-Id: I9021946dd169acfa205e6bacc4c4581242452983
 2020-03-16 09:32:41 -07:00
Automerger Merge Worker
ba861466e8 Merge "Handle ransferring state in output switcher" into rvc-dev am: b669fff40c am: 2fe4235ae3 am: 1eedf27e67 am: 9586c26f3d 
Change-Id: I284375f76e39aeca2d08245d05235f8e4414abf8
 2020-03-16 14:31:43 +00:00
Automerger Merge Worker
1eedf27e67 Merge "Handle ransferring state in output switcher" into rvc-dev am: b669fff40c am: 2fe4235ae3 
Change-Id: I006df7c1d8e4e2512e9934ec107c4e41f25f6d8b
 2020-03-16 13:55:06 +00:00
Automerger Merge Worker
b32674e24f Merge "Handle ransferring state in output switcher" into rvc-dev am: b669fff40c 
Change-Id: Ibd5b7c7dfc2435253f969ba9f497e7a9dc1924f9
 2020-03-16 13:39:19 +00:00
tim peng
b669fff40c Merge "Handle ransferring state in output switcher" into rvc-dev 2020-03-16 13:17:03 +00:00
Automerger Merge Worker
876a6f5816 Merge "Fix AppButtonPreferenceControllerTest" into rvc-dev am: 6d6e0f45b2 am: 2ae7c371cb am: 225007141d am: 8a20a19b82 
Change-Id: I81cfd1e401042001cc5cdc39ee0e132f1e043fcf
 2020-03-16 12:51:36 +00:00
Automerger Merge Worker
225007141d Merge "Fix AppButtonPreferenceControllerTest" into rvc-dev am: 6d6e0f45b2 am: 2ae7c371cb 
Change-Id: I3b0dd3fb1aa1cfb4582948239b7d1a753dbe1e0b
 2020-03-16 12:33:39 +00:00
Automerger Merge Worker
c9e4a2934f Merge "Fix AppButtonPreferenceControllerTest" into rvc-dev am: 6d6e0f45b2 
Change-Id: I334933880d8a192e7d031cfa039c406a56a753c0
 2020-03-16 12:21:28 +00:00
TreeHugger Robot
6d6e0f45b2 Merge "Fix AppButtonPreferenceControllerTest" into rvc-dev 2020-03-16 12:05:02 +00:00
Alex Johnston
8d430de5d5 Fix AppButtonPreferenceControllerTest 
* isSystem was not being mocked.
* The tests where isSystem should return true
  were not being tested properly.

Bug: 151569506
Test: atest com.android.settings.applications.appinfo.AppButtonsPreferenceControllerTest
Change-Id: Ib4249bca8f3c0321d0b64b4dbd4c4e5fc29586e1
 2020-03-16 09:37:10 +00:00
Automerger Merge Worker
8064dce464 Merge "Use Gesture nav settings activity instead of dialog" into rvc-dev am: 42a906d874 am: 026ed69b8c am: 491eb59cfa am: 27c5efafe9 
Change-Id: Iee2521f1e743e237162bf2fc76bc92fa2ac33b42
 2020-03-16 04:32:13 +00:00
Automerger Merge Worker
026ed69b8c Merge "Use Gesture nav settings activity instead of dialog" into rvc-dev am: 42a906d874 
Change-Id: I679887c29602a2e445e22c1e0e7ce455605c2eed
 2020-03-16 04:06:36 +00:00
Mehdi Alizadeh
42a906d874 Merge "Use Gesture nav settings activity instead of dialog" into rvc-dev 2020-03-16 04:01:11 +00:00
Automerger Merge Worker
f61673d708 Merge "Remove duplicated index search data" into rvc-dev am: ed39b5bb1a am: 90d0060f81 am: 6ecf256ac9 am: f25b2550be 
Change-Id: I9f81da0c934113800d84f9bd12ca0604209654c2
 2020-03-16 02:24:07 +00:00