PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
59,536 Commits 1 Branch 0 Tags
bd6419b22b190f49c7428e40b0a5e63b6145d300
Commit Graph

59536 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
bd6419b22b Merge "Merge "Accessibility shortcut primary action - add settings UI for accessibility shortcut type fragment" into rvc-dev am: 58081f2c36 am: 2f0acb9ac5" into rvc-d1-dev-plus-aosp 2020-03-04 12:49:22 +00:00
Automerger Merge Worker
92014f4ce2 Merge "Accessibility shortcut primary action - add settings UI for accessibility shortcut type fragment" into rvc-dev am: 58081f2c36 am: 2f0acb9ac5 
Change-Id: I02e7040b64bb4a95709893be57c6385580223f3c
 2020-03-04 12:49:12 +00:00
Automerger Merge Worker
53dcd289d9 Merge "Accessibility shortcut primary action - add settings UI for accessibility shortcut type fragment" into rvc-dev am: 58081f2c36 am: f453b47d90 
Change-Id: Ideac47f0bd31db31f57ab64ba5875a360a9f00b4
 2020-03-04 12:49:11 +00:00
Automerger Merge Worker
2f0acb9ac5 Merge "Accessibility shortcut primary action - add settings UI for accessibility shortcut type fragment" into rvc-dev am: 58081f2c36 
Change-Id: Ibe74593cc2d37aa17f49e179ac80aa092e43e95d
 2020-03-04 12:32:12 +00:00
Automerger Merge Worker
f453b47d90 Merge "Accessibility shortcut primary action - add settings UI for accessibility shortcut type fragment" into rvc-dev am: 58081f2c36 
Change-Id: I536f70269a545f2263f68939e56a97b2a87bfd0e
 2020-03-04 12:31:57 +00:00
Jason Hsu
58081f2c36 Merge "Accessibility shortcut primary action - add settings UI for accessibility shortcut type fragment" into rvc-dev 2020-03-04 12:13:42 +00:00
Automerger Merge Worker
69ff0559c1 Merge "Fix exception when filtering the APPs which can CHANGE_WIFI_STATE" into rvc-dev am: d3946b5479 am: 96d04824ed 
Change-Id: I8a17fb537b8e6a71e4505a7198e5c6c0c9c67a9b
 2020-03-04 11:15:26 +00:00
Automerger Merge Worker
b616ab6e6d Merge "Fix exception when filtering the APPs which can CHANGE_WIFI_STATE" into rvc-dev am: d3946b5479 am: a2027e5960 
Change-Id: I7585337e5cbd967256487dd3b7773157a3acf69b
 2020-03-04 11:15:15 +00:00
Automerger Merge Worker
96d04824ed Merge "Fix exception when filtering the APPs which can CHANGE_WIFI_STATE" into rvc-dev am: d3946b5479 
Change-Id: I24e5d0d7d90371f0c755045476f8f34436dd7879
 2020-03-04 11:00:07 +00:00
Automerger Merge Worker
a2027e5960 Merge "Fix exception when filtering the APPs which can CHANGE_WIFI_STATE" into rvc-dev am: d3946b5479 
Change-Id: I84cb4504ee074d0ab9bbc4bc2d46f3fa8d2afb02
 2020-03-04 10:59:52 +00:00
TreeHugger Robot
d3946b5479 Merge "Fix exception when filtering the APPs which can CHANGE_WIFI_STATE" into rvc-dev 2020-03-04 10:40:39 +00:00
Arc Wang
d5bdbdb345 Fix exception when filtering the APPs which can CHANGE_WIFI_STATE 
When filtering AppEntry, only allow the extraInfo type of WifiSettingsState.

Bug: 148486719
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AppStateChangeWifiStateBridgeTest
Change-Id: I486e88629aec8cfecf6174de8987d37394043743
 2020-03-04 16:09:41 +08:00
jasonwshsu
c7fa4da58d Accessibility shortcut primary action - add settings UI for accessibility shortcut type fragment 
Bug: 142531433
Test: manual test
Change-Id: I6a9eebc1718f2b924cfb373f09abb57890fa10a5
 2020-03-04 16:06:41 +08:00
Automerger Merge Worker
5452c86902 Merge "Fix double scroller of App info page" into rvc-dev am: 0ab87cce3d am: b62bdbb1ba 
Change-Id: I5b711a731d988d24ac10ea5eeb1bdfd95a7d7000
 2020-03-04 07:25:28 +00:00
Automerger Merge Worker
c480a5a219 Merge "Fix double scroller of App info page" into rvc-dev am: 0ab87cce3d am: 85b274b6c9 
Change-Id: I1b3249edd8b1c3ceb653c8d82571ddf29032e947
 2020-03-04 07:25:13 +00:00
Automerger Merge Worker
b62bdbb1ba Merge "Fix double scroller of App info page" into rvc-dev am: 0ab87cce3d 
Change-Id: I5debb5a498a2a898cccf74d61209597295e3bd46
 2020-03-04 07:04:26 +00:00
Automerger Merge Worker
85b274b6c9 Merge "Fix double scroller of App info page" into rvc-dev am: 0ab87cce3d 
Change-Id: I43a6edf20ab7fdaa5323d6b955e3f5408423629e
 2020-03-04 07:04:18 +00:00
Yanting Yang
0ab87cce3d Merge "Fix double scroller of App info page" into rvc-dev 2020-03-04 06:51:19 +00:00
Automerger Merge Worker
b4acbd0cb3 Merge "Add dynamic group panel" into rvc-dev am: 9a1701b42f am: b856ed655c 
Change-Id: I38325fe26892d8db1a2b4310479744df5da62822
 2020-03-04 03:07:10 +00:00
Automerger Merge Worker
2ba30b9e04 Merge "Add slice regist key for dynamic group" into rvc-dev am: 9904275968 am: 74bd004539 
Change-Id: I35bc6b0470c37926f0cf7bb7279f09b1f4d5a2b6
 2020-03-04 03:07:07 +00:00
Automerger Merge Worker
32df3f1e11 Merge "Add slice for dynamic grouping in output switcher" into rvc-dev am: 09ff25cdf9 am: ddaa0871cb 
Change-Id: I48cdae6972a93866e66ab0e09f27009dde190270
 2020-03-04 03:07:05 +00:00
Automerger Merge Worker
05e452fabf [automerger skipped] [Wi-Fi] Ignore incorrect user certificates am: 9e46a0bc93 -s ours am: d6f421d593 -s ours am: aa8531e082 -s ours 
am skip reason: Change-Id Iab35ac975933abc54fda83b99a2109d53d6722d4 with SHA-1 9730b5aa86 is in history

Change-Id: Ifecde9540d9093fa033d3522ff02c9d57e48dace
 2020-03-04 03:06:59 +00:00
Automerger Merge Worker
eef2d790d2 Merge "[Wi-Fi] Apply WifiEntry onUpdate to support refresh WiFi detail page for OpenRoaming feature." into rvc-dev am: e64fb77bc8 am: d105b75046 
Change-Id: I2bcb99373bb7a29529fd93c44ceed0ef68002a3b
 2020-03-04 03:06:53 +00:00
Automerger Merge Worker
5171781e75 Merge "Add dynamic group panel" into rvc-dev am: 9a1701b42f am: 5c5c13e2a9 
Change-Id: Ib8b8acc72ddbb21bb1bb9e70721e144653401bca
 2020-03-04 02:59:35 +00:00
Automerger Merge Worker
cfbdb03d2d Merge "Add slice regist key for dynamic group" into rvc-dev am: 9904275968 am: 01d9e35c58 
Change-Id: I80c3e348b4882fb259c72cc1b87f0c89a1d501e9
 2020-03-04 02:59:34 +00:00
Automerger Merge Worker
50aefb75b0 Merge "Add slice for dynamic grouping in output switcher" into rvc-dev am: 09ff25cdf9 am: bc0d38d1be 
Change-Id: I4c710e3a5ac052232139ab103205efbbbe394ca6
 2020-03-04 02:59:33 +00:00
Automerger Merge Worker
8e78fccbab [automerger skipped] [Wi-Fi] Ignore incorrect user certificates am: 9e46a0bc93 -s ours am: d6f421d593 -s ours am: b012406ee6 -s ours 
am skip reason: Change-Id Iab35ac975933abc54fda83b99a2109d53d6722d4 with SHA-1 9730b5aa86 is in history

Change-Id: If333151ac53f2b506c8deaf6a9bc4c34781e6b15
 2020-03-04 02:59:26 +00:00
Automerger Merge Worker
ec9c799dcc Merge "[Wi-Fi] Apply WifiEntry onUpdate to support refresh WiFi detail page for OpenRoaming feature." into rvc-dev am: e64fb77bc8 am: 55fa845f1e 
Change-Id: If0e7aad1904e70cf550bcb8143d22962086ed65c
 2020-03-04 02:59:21 +00:00
Automerger Merge Worker
b856ed655c Merge "Add dynamic group panel" into rvc-dev am: 9a1701b42f 
Change-Id: I57a4099c7aca8c366bf2740c29f8a17577ef1cc0
 2020-03-04 02:39:02 +00:00
Automerger Merge Worker
74bd004539 Merge "Add slice regist key for dynamic group" into rvc-dev am: 9904275968 
Change-Id: Icbe88e520ce7c8c7489fc6f4e19f6e5abaf87e32
 2020-03-04 02:39:00 +00:00
Automerger Merge Worker
ddaa0871cb Merge "Add slice for dynamic grouping in output switcher" into rvc-dev am: 09ff25cdf9 
Change-Id: I167d365acf558341669ce71413bb260acca43fe6
 2020-03-04 02:38:59 +00:00
Automerger Merge Worker
5c5c13e2a9 Merge "Add dynamic group panel" into rvc-dev am: 9a1701b42f 
Change-Id: I2455802d495dc2331b72fe7de02f5de4dbae289f
 2020-03-04 02:38:57 +00:00
Automerger Merge Worker
01d9e35c58 Merge "Add slice regist key for dynamic group" into rvc-dev am: 9904275968 
Change-Id: I4cb461f0395e948cc5b0ccf24474978984c4d50d
 2020-03-04 02:38:55 +00:00
Automerger Merge Worker
bc0d38d1be Merge "Add slice for dynamic grouping in output switcher" into rvc-dev am: 09ff25cdf9 
Change-Id: Id1ca213df71e06a33d89b7d1e510b75b74ace8c6
 2020-03-04 02:38:54 +00:00
Automerger Merge Worker
aa8531e082 [automerger skipped] [Wi-Fi] Ignore incorrect user certificates am: 9e46a0bc93 -s ours am: d6f421d593 -s ours 
am skip reason: Change-Id Iab35ac975933abc54fda83b99a2109d53d6722d4 with SHA-1 9730b5aa86 is in history

Change-Id: I006489e23cf726ccb9df0336d6b6cd282c5c6ecf
 2020-03-04 02:38:50 +00:00
Automerger Merge Worker
b012406ee6 [automerger skipped] [Wi-Fi] Ignore incorrect user certificates am: 9e46a0bc93 -s ours am: d6f421d593 -s ours 
am skip reason: Change-Id Iab35ac975933abc54fda83b99a2109d53d6722d4 with SHA-1 9730b5aa86 is in history

Change-Id: I9b319237feb46c080fdfebc8d0ca4106b52834fc
 2020-03-04 02:38:45 +00:00
Automerger Merge Worker
d105b75046 Merge "[Wi-Fi] Apply WifiEntry onUpdate to support refresh WiFi detail page for OpenRoaming feature." into rvc-dev am: e64fb77bc8 
Change-Id: I26b62e17a8182371b63b70542adcd2b390a77a18
 2020-03-04 02:38:40 +00:00
Automerger Merge Worker
55fa845f1e Merge "[Wi-Fi] Apply WifiEntry onUpdate to support refresh WiFi detail page for OpenRoaming feature." into rvc-dev am: e64fb77bc8 
Change-Id: I84001a5c44becfe7d8590e8097dbf99f6aed2eb9
 2020-03-04 02:38:35 +00:00
tim peng
9a1701b42f Merge "Add dynamic group panel" into rvc-dev 2020-03-04 02:35:35 +00:00
tim peng
9904275968 Merge "Add slice regist key for dynamic group" into rvc-dev 2020-03-04 02:35:35 +00:00
tim peng
09ff25cdf9 Merge "Add slice for dynamic grouping in output switcher" into rvc-dev 2020-03-04 02:35:35 +00:00
Automerger Merge Worker
ad3edcf79c Merge changes I3b1d1c4e,I11bdad27 into rvc-dev am: 5dbf99de82 am: 7d7ddddcda 
Change-Id: I07b6bd9ff2ab5ee82c116c83a2d4f1ea8fe69f27
 2020-03-04 02:32:59 +00:00
Automerger Merge Worker
99cb10c954 Merge changes I3b1d1c4e,I11bdad27 into rvc-dev am: 5dbf99de82 am: b3ff936644 
Change-Id: I5638d4c12907aea63a9f61b0c0dc3cea4d8115a0
 2020-03-04 02:32:42 +00:00
Automerger Merge Worker
d6f421d593 [automerger skipped] [Wi-Fi] Ignore incorrect user certificates am: 9e46a0bc93 -s ours 
am skip reason: Change-Id Iab35ac975933abc54fda83b99a2109d53d6722d4 with SHA-1 9730b5aa86 is in history

Change-Id: Ia2bbed0f22a29e50bc6d4523bf5ec4b75ee1a981
 2020-03-04 02:32:26 +00:00
Arc Wang
e64fb77bc8 Merge "[Wi-Fi] Apply WifiEntry onUpdate to support refresh WiFi detail page for OpenRoaming feature." into rvc-dev 2020-03-04 02:25:38 +00:00
Automerger Merge Worker
b3ff936644 Merge changes I3b1d1c4e,I11bdad27 into rvc-dev am: 5dbf99de82 
Change-Id: I8fc697e7682b9da3243b2050820d1b0ba59efebb
 2020-03-04 02:04:23 +00:00
Automerger Merge Worker
7d7ddddcda Merge changes I3b1d1c4e,I11bdad27 into rvc-dev am: 5dbf99de82 
Change-Id: I925eec066c43a8befeef41d40cad7ecfb2b6fb86
 2020-03-04 02:04:18 +00:00
Zhen Zhang
5dbf99de82 Merge changes I3b1d1c4e,I11bdad27 into rvc-dev 
* changes:
  Let tether preference controllers extend TogglePreferenceController
  Make tether option preferences listen to own SharedPreferences change
 2020-03-04 01:53:07 +00:00
Automerger Merge Worker
0b924d6cad Merge "Add string for output switcher transferring error" into rvc-dev am: 8c07f06cd5 am: 61c7581322 
Change-Id: I58d050e865f53aef709be9b27d3865e3307b8729
 2020-03-04 01:26:45 +00:00
Automerger Merge Worker
0d7209e303 Merge "Add string for output switcher transferring error" into rvc-dev am: 8c07f06cd5 am: 9aebc16b6a 
Change-Id: I34ef1774e79d6b280d34fb2298f316c15ea1480e
 2020-03-04 01:26:24 +00:00