PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
50,617 Commits 1 Branch 0 Tags
e7908b5a4db9c7b35a027a11b3b1696d4554bc2c
Commit Graph

50617 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad Ebinger
9f2b104953 Merge "Close Wi-Fi Calling screen if provisioning status changes to disallow" am: db7da4cba8 
am: ee4a5291a1

Change-Id: I2a4d3f97899cbcfb96904386bfe7c28eacdbce33
 2019-02-14 13:19:37 -08:00
Brad Ebinger
ee4a5291a1 Merge "Close Wi-Fi Calling screen if provisioning status changes to disallow" 
am: db7da4cba8

Change-Id: I0e3a787020b6631e25496d5c75b39cbda27f9b92
 2019-02-14 13:15:44 -08:00
TreeHugger Robot
2bd74f7e50 Merge "Add accessibility usage preference to the Privacy screen." 2019-02-14 21:04:32 +00:00
Brad Ebinger
db7da4cba8 Merge "Close Wi-Fi Calling screen if provisioning status changes to disallow" 2019-02-14 21:01:05 +00:00
TreeHugger Robot
1de961d9ef Merge "Apply new slice attributes to customize layout" 2019-02-14 20:43:23 +00:00
jackqdyulei
26a5023d7f Add null check for CarrierConfig 
CarrierConfig maybe null when config loader is not ready, so we need
to add null check here.

Bug: 124447166
Test: RunSettingsRoboTests
Change-Id: I3c104f1ca44bb0bcacad460c68084163c758746a
 2019-02-14 12:39:36 -08:00
Fan Zhang
7db118e367 Mass clean up: don't cast class when not needed. 
Bug: none
Test: rebuild
Change-Id: Ie3f58a3d5ae99ade28a33dcac80c18de90d4d5b2
 2019-02-14 12:26:09 -08:00
Brad Ebinger
09285d72bd Merge "Close Wi-Fi Calling screen if provisioning status changes to disallow" 2019-02-14 18:54:55 +00:00
TreeHugger Robot
3fd17955e7 Merge "Updated screen lock type picker footer strings" 2019-02-14 18:24:40 +00:00
TreeHugger Robot
2f76f51300 Merge "Fix only one "active" HA showing under Accessibility Settings" 2019-02-14 18:03:19 +00:00
Bernard Chau
4ef6c99989 Updated screen lock type picker footer strings 
Bug: 111173457
Test: N/A
Change-Id: I5a4fe3d6e35cd8ae068f2235faa302c8a5c03c97
 2019-02-14 11:33:12 +00:00
Leon Liao
a165020047 Update education strings on A11y 'Time to read' UI 
Correction to 'Time to read' UI education strings.

Bug: 119283926
Test: atest AccessibilityTimeoutControllerTest
Test: make RunSettingsRoboTests
Change-Id: I52d0902a2151252803ee694f678aeebbce0b3151
 2019-02-14 18:38:54 +08:00
Jason Chiu
862bcc7787 Apply new slice attributes to customize layout 
Fixes: 114807643
Test: robotest
Change-Id: I6c3975f08268cb831627f63c241428ae4574af1f
 2019-02-14 18:16:25 +08:00
Xin Li
d61c2adf09 DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master 
Bug: 124234733
Change-Id: Ia72f271ae01966c235400ed9d582bf6d7d31a1dd
 2019-02-14 00:03:58 -08:00
markchien
72ba39cdf4 Merge "Fix wrong TetherProvisioningActivity definition" am: f1e3e9d627 am: 2ee5beaa32 
am: c77ee11e4e

Change-Id: Ib14b4a7b3a5b8eb23c7229318ecd785605e1a4f0
 2019-02-13 22:43:11 -08:00
markchien
c77ee11e4e Merge "Fix wrong TetherProvisioningActivity definition" am: f1e3e9d627 
am: 2ee5beaa32

Change-Id: Ifeb4b845b1842cff2096ec20bdd71e7ed4ea93be
 2019-02-13 22:39:00 -08:00
markchien
2ee5beaa32 Merge "Fix wrong TetherProvisioningActivity definition" 
am: f1e3e9d627

Change-Id: I3cc8c13e2a7ee50be4e3d1080232156ce6f30984
 2019-02-13 22:34:49 -08:00
Treehugger Robot
f1e3e9d627 Merge "Fix wrong TetherProvisioningActivity definition" 2019-02-14 06:19:30 +00:00
TreeHugger Robot
178d79dd66 Merge "Check for null before invoking finish()" 2019-02-14 04:58:05 +00:00
Pasty Chang
3c991847aa Merge "Remove TemplateLayout that is not for external use" 2019-02-14 04:03:43 +00:00
markchien
8c713fc756 Fix wrong TetherProvisioningActivity definition 
Bug: 122108346
Bug: 120069528
Test: build, boot, manual on/off hotspot
Change-Id: Iaeb2d271d901fcbd9d27c9a9de369e2af68d3645
 2019-02-14 03:24:52 +00:00
Malcolm Chen
0a36e91a49 Don't show hidden subscriptions. 
Replace getAvailableSubscriptionInfoList with getSelectableSubscriptionInfoList
so that hidden subscriptions won't show up.

Bug: 121396526
Test: manual
Change-Id: I73c41a6605b68011ba5b619f9d6e8d41d18a9dcd
 2019-02-14 02:54:31 +00:00
Kevin Chyn
ee922128e4 Check for null before invoking finish() 
Fixes: 124406109

Test: manual
Change-Id: Idee87c060ffd84395355ccdc5248166f1a6aeaf0
 2019-02-13 18:23:08 -08:00
TreeHugger Robot
57b076fa76 Merge "Add logging for SettingsPanels" 2019-02-14 01:36:30 +00:00
timhypeng
23233700e5 Fix only one "active" HA showing under Accessibility Settings 
-return main device on getConnectedHearingAidDevice()
-add test case

Bug: 123777253
Test: make -j42 RunSettingsRoboTests
Change-Id: I63522311b2248df983f200864b5465c0055056da
 2019-02-14 01:31:03 +00:00
TreeHugger Robot
cf3c895835 Merge "Robotest fix." 2019-02-14 01:25:39 +00:00
Hall Liu
ba06ace05b Merge "Add ACCESS_FINE_LOCATION to permissions" am: a23ceba5c3 am: 5232a30b03 
am: 89b61e8e0a

Change-Id: Id7ff8fadb12185700859ceea48e3ddc6db4688bd
 2019-02-13 17:17:51 -08:00
Hall Liu
89b61e8e0a Merge "Add ACCESS_FINE_LOCATION to permissions" am: a23ceba5c3 
am: 5232a30b03

Change-Id: Ia0a212d075868e020a784233dd6d5d640523a3d0
 2019-02-13 16:33:22 -08:00
Hall Liu
5232a30b03 Merge "Add ACCESS_FINE_LOCATION to permissions" 
am: a23ceba5c3

Change-Id: I873ee7b2898ab52b1a2a80d7da852d662bf10e6b
 2019-02-13 16:14:10 -08:00
Matthew Fritze
b197110f71 Add logging for SettingsPanels 
The 3 main categories are:
- Panel Opened
- Panel Closed
- Panel Slice interaction

There are 3 close events:
- See more button
- Done button
- Clicking outside the panel

Slice interactions will log the Uri of the Slice and the ActionType,
such as Toggle, Slider, Content (intent).

Change-Id: Iecad948f39f50dd12ae1bcb23a5d523e0df8bb98
Fixes: 117804231
Test: robotests
 2019-02-13 16:06:24 -08:00
Alex Buynytskyy
0be46defa6 Robotest fix. 
Repro: m dist RunSettingsRoboTests ROBOTEST_FILTER=widget

Test: Robolectric test
Change-Id: I4bd4be29ac28d7532bba8aa26d70758c58bd9a0e
 2019-02-13 15:57:09 -08:00
TreeHugger Robot
0c4d976b82 Merge "Remove weird background color on stroage donut in dark mode" 2019-02-13 23:47:33 +00:00
TreeHugger Robot
d4fafc0c1f Merge "Make WakeScreen conditionally avaialable" 2019-02-13 23:42:22 +00:00
Hall Liu
a23ceba5c3 Merge "Add ACCESS_FINE_LOCATION to permissions" 2019-02-13 23:21:43 +00:00
TreeHugger Robot
7523f77296 Merge "User photo: Remove reference to Photo Gallery" 2019-02-13 22:53:04 +00:00
Lei Yu
bd06923f2f Merge "Update search for mobile network" 2019-02-13 22:43:22 +00:00
Fan Zhang
bcefbf288c Remove weird background color on stroage donut in dark mode 
Bug: 124313940
Test: visual
Change-Id: Ie95c98c23bb67570418e49a1c6677d4b6809b5d2
 2019-02-13 14:17:47 -08:00
TreeHugger Robot
ea7fa41c0d Merge "Change the default snoop log level to off." 2019-02-13 21:45:25 +00:00
Lucas Dupin
862aaed38c Make WakeScreen conditionally avaialable 
Also moving the setting closer to 'Always On'

Fixes: 124389844
Test: manual
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WakeScreenGesturePreferenceController
Change-Id: Ic19e01bf4259608dc0430507fbb3ce5ebf6fa456
 2019-02-13 13:39:28 -08:00
TreeHugger Robot
7113ea2fde Merge "Update the font family for the conditional title" 2019-02-13 21:35:10 +00:00
TreeHugger Robot
2558451806 Merge "Make card bacground grey_900 instead of 800 in dark mode" 2019-02-13 21:11:15 +00:00
TreeHugger Robot
7b35e42f34 Merge "Set default background color for home icon." 2019-02-13 19:56:35 +00:00
Fan Zhang
dba9591fb7 Make card bacground grey_900 instead of 800 in dark mode 
Change-Id: I7ccd59984949620340ebe66710b7956acde3e381
Fixes: 124313940
Test: visual
 2019-02-13 11:16:00 -08:00
Fan Zhang
ca79899ebf Merge "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile"" am: dabfd96c82 am: 32fbf4740d 
am: 798c93aafc

Change-Id: I39c11b23af004e0eb24b3c68eef6373eb70188ec
 2019-02-13 10:43:46 -08:00
Alex Salo
469f1a345e Merge "Add more keywords to adaptive sleep setting" 2019-02-13 18:32:48 +00:00
Fan Zhang
798c93aafc Merge "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile"" am: dabfd96c82 
am: 32fbf4740d

Change-Id: I74ae067983820f52bf6c12a133b917a43695af9d
 2019-02-13 10:29:46 -08:00
Fan Zhang
32fbf4740d Merge "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile"" 
am: dabfd96c82

Change-Id: I3e0b3d34cc3dbca46b96910fe0b656d6b07c03d9
 2019-02-13 10:16:15 -08:00
Fan Zhang
dabfd96c82 Merge "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile"" 2019-02-13 18:04:09 +00:00
Fan Zhang
1ea003e834 Revert "Add LOCAL_RESOURCE_DIR in Settings makefile" 
This reverts commit 910457e37a.
Fixes: 124370422


Reason for revert: b/124370422


Error: 

The following topic from AOSP:

https://android-review.googlesource.com/q/topic:%22116821732%22+(status:open%20OR%20status:merged)

Has broken several builds (test_suites_x86_64, build_test, docs) with the following error:

FAILED:
build/make/core/aapt2.mk:33: error: overriding commands for target `out/target/common/obj/APPS/SetupWraith_intermediates/flat-res/frameworks/base/packages/SettingsLib/res/color_batterymeter_bolt_color.xml.flat', previously defined at build/make/core/aapt2.mk:33
05:05:47 ckati failed with: exit status 1
make: *** [run_soong_ui] Error 1
Return Code: 2

Change-Id: I2f6d443d06318b9bfa1283fb5f8255b126e4b507
 2019-02-13 17:59:40 +00:00
TreeHugger Robot
cd15971f14 Merge "Move horizontal progress bar into SettingsLib." 2019-02-13 13:53:56 +00:00