Commit Graph

40944 Commits

Author SHA1 Message Date
TreeHugger Robot
84f1e3003a Merge "Reorder default app summary to match subpage ordering" 2017-10-17 01:15:45 +00:00
Fan Zhang
069830012f Add advanced button to security & location page
Change-Id: I45977105d6ddabef8f2d9bdc7b46959af9cbbf0f
Fixes: 36657221
Test: visual
2017-10-16 17:39:27 -07:00
jeffreyhuang
17edf20fa5 Lazy load SettingsObserver
- Lazy load the SettingsObserver in StayAwakePreferenceController
 so that search indexing works properly

Bug: 34203528
Test: make RunSettingsRoboTests -j40
Change-Id: I1e2afb106ce293f616143da3f37fbde3829f414f
2017-10-16 16:56:26 -07:00
Fan Zhang
11e9123036 Reorder default app summary to match subpage ordering
Change-Id: I618f44ba8cf6f590b86d483cfecb090b71ef1268
Fixes: 65049890
Test: robotests
2017-10-16 16:42:27 -07:00
Cai, Min1
573f3d5917 Merge "Refresh payment preference while resume" am: 05650bb3da am: 088baf348b am: f523ca10aa
am: 84a60e3cf3

Change-Id: I037f72265acc57e531edc337e3e523ece20063a3
2017-10-16 21:45:23 +00:00
Maurice Lam
b8cf5a03a4 resolve merge conflicts of f36b25c2df to stage-aosp-master am: d4621f6302 am: 0e1c486e74
am: c03cf0092e  -s ours

Change-Id: Ie9d2e04136be07b90bdb49f4fcceb259c95dee4a
2017-10-16 21:43:55 +00:00
Cai, Min1
84a60e3cf3 Merge "Refresh payment preference while resume" am: 05650bb3da am: 088baf348b
am: f523ca10aa

Change-Id: I25dea8b9ddb1740c907d4ef79c74fe8b201352a2
2017-10-16 19:59:50 +00:00
Cai, Min1
f523ca10aa Merge "Refresh payment preference while resume" am: 05650bb3da
am: 088baf348b

Change-Id: I146f0925e1b9c68e2cd04d76897a59fe87ac741d
2017-10-16 19:41:44 +00:00
Cai, Min1
088baf348b Merge "Refresh payment preference while resume"
am: 05650bb3da

Change-Id: Ib4876e7d4f17b99699f3b7f328cd1b1eafb19eba
2017-10-16 19:29:33 +00:00
Maurice Lam
c03cf0092e resolve merge conflicts of f36b25c2df to stage-aosp-master am: d4621f6302
am: 0e1c486e74

Change-Id: I9b94c26c4df2329e388eeb925350a2446ef9148e
2017-10-16 19:25:57 +00:00
Maurice Lam
0e1c486e74 resolve merge conflicts of f36b25c2df to stage-aosp-master
am: d4621f6302

Change-Id: I7f2e89579a99523808138eaabffa917b1e02e3b0
2017-10-16 19:22:12 +00:00
Maurice Lam
d4621f6302 resolve merge conflicts of f36b25c2df to stage-aosp-master
Test: Existing tests pass
Merged-In: I8f6219ab22abad98111f016d633bf100dc3222ce
Change-Id: I6e021d1156686aa30bdc051f1fefe16b5c619b80
2017-10-16 18:31:40 +00:00
Jeffrey Huang
826ee4d38f Merge "Restore state when activity is destroyed" 2017-10-16 17:15:29 +00:00
Jeffrey Huang
79c1a5944f Merge "Introduce FreeformWindowsPreferenceController" 2017-10-16 17:15:17 +00:00
Jeffrey Huang
82f8a3deba Merge "Introduce BackgroundProcessLimitPreferenceCtrl" 2017-10-16 17:15:05 +00:00
Jeffrey Huang
914d623984 Merge "Introduce ProfileGpuRenderingPreferenceController" 2017-10-16 17:14:53 +00:00
Jeffrey Huang
092d5ba968 Merge "Introduce SetGpuRendererPreferenceController" 2017-10-16 17:14:41 +00:00
Daniel Nishi
02909bd9e6 Merge "Fix PrivateVolumeSettings be launched repeatedly" am: 31a7b2a4c7 am: 5973d32c77 am: f1dc9e65f1
am: ab80b6ee9c

Change-Id: I8dd477c65898f92954868d5ab25b12ffabfe3d0a
2017-10-15 05:34:44 +00:00
Doris Ling
4930065f3a Update tile limit for Sound settings. am: 893bdba206
am: 15d06244d3

Change-Id: Ib307fc04adea4b7371f5234fa0c5c0813ff7b41e
2017-10-15 05:33:47 +00:00
Daniel Nishi
ab80b6ee9c Merge "Fix PrivateVolumeSettings be launched repeatedly" am: 31a7b2a4c7 am: 5973d32c77
am: f1dc9e65f1

Change-Id: Ib55d4b211b48f4a6e18034f60d91f43748aebe89
2017-10-15 04:30:40 +00:00
Daniel Nishi
f1dc9e65f1 Merge "Fix PrivateVolumeSettings be launched repeatedly" am: 31a7b2a4c7
am: 5973d32c77

Change-Id: I66747a250e7461cfc3fe04fb8228bb7fe7541b5a
2017-10-15 03:59:02 +00:00
Daniel Nishi
5973d32c77 Merge "Fix PrivateVolumeSettings be launched repeatedly"
am: 31a7b2a4c7

Change-Id: I2ee1fe82349968182b21a716a36ac716c0425080
2017-10-15 03:47:13 +00:00
Doris Ling
15d06244d3 Update tile limit for Sound settings.
am: 893bdba206

Change-Id: Ie73472f54d737ae8058ff95a65d16068750ace24
2017-10-15 02:43:43 +00:00
TreeHugger Robot
43e86cefc9 Merge "Exempt res folder from OWNERS approval." 2017-10-14 00:25:41 +00:00
TreeHugger Robot
99111a92e8 Merge "Remove WifiNetworkScoreCache fake" 2017-10-14 00:08:28 +00:00
Kevin Chyn
5132e29d6e Fingerprint enrolling should update UI while in multi-window mode
Fixes: 67652597

Test: Try enrolling fingerprint while in multi-window mode, with and
      without focusing the FP Settings activity

Test: Enrolling doesn't occur when FP Settings activity is not shown
      (ie home button pressed)

Change-Id: Ie467da767ae36eb8d3c2b956754272749dffb43fu
2017-10-13 23:27:45 +00:00
Fan Zhang
7ad17d72ad Merge "Encapsulate AppFilter and its display label into 1 class" 2017-10-13 23:24:05 +00:00
Treehugger Robot
05650bb3da Merge "Refresh payment preference while resume" 2017-10-13 23:10:13 +00:00
Fan Zhang
9dae6ada85 Exempt res folder from OWNERS approval.
Test: rebuild
Change-Id: I4ba7e5d02985f62811fa89d2fd5d2667aa0b441d
2017-10-13 15:59:03 -07:00
jeffreyhuang
4eda4b3152 Restore state when activity is destroyed
- Fixes a bug where developer options would be re-enabled
 if the activity is destroyed when the master switch is set to
 off

Bug: 34203528
Test: Manual testing with screen rotation
Change-Id: Ic8e04858f6e3dd2353feb6fa94be9f420ab8adbb
2017-10-13 15:44:03 -07:00
Treehugger Robot
f36b25c2df Merge "There is no NEXT button in find sensor screen of fingerprint." 2017-10-13 21:45:18 +00:00
Fan Zhang
bd56215962 Encapsulate AppFilter and its display label into 1 class
Bug: 64804294
Test: robotests
Change-Id: I2a752794ded4ccb8510adf37d41afa4514d8c4c0
2017-10-13 14:33:11 -07:00
TreeHugger Robot
aad3b1cef2 Merge "Use ButtonBarLayout to stack buttons" 2017-10-13 20:12:49 +00:00
TreeHugger Robot
909df8b966 Merge "There is no NEXT button in find sensor screen of fingerprint." 2017-10-13 20:11:09 +00:00
Doris Ling
893bdba206 Update tile limit for Sound settings.
Pull the notification and alarm ringtone out of the preference category
and update the tile limit to 1, so that only the first preference
category will be displayed initially.

Change-Id: I9ae7669fb2b688560a3fc228274ea44f225b262f
Fixes: 67750626
Test: visual
2017-10-13 11:45:30 -07:00
Daniel Nishi
31a7b2a4c7 Merge "Fix PrivateVolumeSettings be launched repeatedly" 2017-10-13 17:52:58 +00:00
Jeffrey Huang
32b0f1d486 Merge "Introduce DebugNonRectClipOperationsPreferenceCtrl" 2017-10-13 16:51:39 +00:00
Jeffrey Huang
acb142ce3f Merge "Introduce SecondaryDisplaysPreferenceController" 2017-10-13 16:51:18 +00:00
Jeffrey Huang
0d37dad0fd Merge changes Ie94273c2,Ib9230336
* changes:
  Introduce AbstractBluetoothA2dpPreferenceCtrl
  Refactor A2dpStore to be a non-static object
2017-10-13 16:50:56 +00:00
Eric Schwarzenbach
5345e0bd8d Merge "Show updated Speed Label on Wifi detail page." 2017-10-13 16:40:12 +00:00
Eric Schwarzenbach
4abc6336ca Remove WifiNetworkScoreCache fake
Now that Robolectric supports O, maintaining this fake class is no
longer necessary.

Bug: 64262653
Test: n/a

Change-Id: I14d15720031ba70f83f81e8aff66681f44985704
2017-10-13 09:31:10 -07:00
Maurice Lam
bb31c01f87 Use ButtonBarLayout to stack buttons
In fingerprint-enroll-finish landscape, if there is not enough space
to display the buttons, stack them by using ButtonBarLayout.

Bug: 67370165
Test: Manual
Change-Id: I482b811d6a2af545c4783a1cdd50b566c34b60c3
2017-10-13 01:21:31 +00:00
jeffreyhuang
027da329fe Introduce AbstractBluetoothA2dpPreferenceCtrl
- Refactor BluetoothAudioSampleRatePreferenceController into
  AbstractBluetoothA2dpPreferenceController
 - Make it easier to implement future bluetooth a2dp preferences

Bug: 34203528
Test: make RunSettingsRoboTests -j40
Change-Id: Ie94273c2b97504f4fb63f11b1afc21abc6944ffb
2017-10-12 16:47:30 -07:00
TreeHugger Robot
bda0d166bb Merge "Move ManageApplications to sub package and remove dead code" 2017-10-12 22:46:43 +00:00
jeffreyhuang
de895f3857 Introduce FreeformWindowsPreferenceController
- Create new FreeformWindowsPreferenceController
 - Create controller inside the DashboardFragment
 - Port logic from DevelopmentSettings into the controller

Bug: 34203528
Test: make RunSettingsRoboTests -j40
Change-Id: I3ce3731a2aa37833c635e5bdaaf452491b2dadb5
2017-10-12 14:03:27 -07:00
Fan Zhang
a8cac7a409 Move ManageApplications to sub package and remove dead code
Bug: 64804294
Test: rerun test
Change-Id: I23cbd8da9b65f52470030ba3b9b676ece2bada11
2017-10-12 13:48:54 -07:00
jeffreyhuang
a8ae717599 Introduce BackgroundProcessLimitPreferenceCtrl
- Create new BackgroundProcessLimitPreferenceController
 - Create controller inside the DashboardFragment
 - Port logic from DevelopmentSettings into the controller

Bug: 34203528
Test: make RunSettingsRoboTests -j40
Change-Id: Ie151f911917ecf9401df8f3daa6f10770b7a571e
2017-10-12 12:29:28 -07:00
Glen Kuhne
c98eee331a Merge "Allow 64 char HEX string PSKs in WifiSettingsUi" into oc-mr1-dev am: 85f59ff42d
am: 91aeed6f55

Change-Id: I65d9d59816f9a1b248bfa9bcf7e801260f60bc01
2017-10-12 19:14:50 +00:00
Glen Kuhne
91aeed6f55 Merge "Allow 64 char HEX string PSKs in WifiSettingsUi" into oc-mr1-dev
am: 85f59ff42d

Change-Id: I0812fdee8ad859cb7efb56f980de4ca00ce3f5a5
2017-10-12 19:02:55 +00:00
TreeHugger Robot
85f59ff42d Merge "Allow 64 char HEX string PSKs in WifiSettingsUi" into oc-mr1-dev 2017-10-12 18:54:43 +00:00