edgar.huang
d2a65d5f03
Merge "Settings is crashed high probability when doing follow steps" am: 2584202cb7 am: 8f42d1a4ab am: e096a55f03
...
am: 8aeabc23c6
2017-09-06 01:56:23 +00:00
edgar.huang
8aeabc23c6
Merge "Settings is crashed high probability when doing follow steps" am: 2584202cb7 am: 8f42d1a4ab
...
am: e096a55f03
2017-09-06 00:44:05 +00:00
edgar.huang
e096a55f03
Merge "Settings is crashed high probability when doing follow steps" am: 2584202cb7
...
am: 8f42d1a4ab
2017-09-06 00:30:44 +00:00
edgar.huang
8f42d1a4ab
Merge "Settings is crashed high probability when doing follow steps"
...
am: 2584202cb7
2017-09-06 00:21:17 +00:00
Adrian Roos
b1758afdf0
Merge "FRP: Use SUW theme for factory reset protection flow" into oc-mr1-dev am: d57edb708f
...
am: 2faa5e7ac5
2017-09-05 18:58:22 +00:00
Adrian Roos
2faa5e7ac5
Merge "FRP: Use SUW theme for factory reset protection flow" into oc-mr1-dev
...
am: d57edb708f
2017-09-05 18:55:47 +00:00
TreeHugger Robot
d57edb708f
Merge "FRP: Use SUW theme for factory reset protection flow" into oc-mr1-dev
2017-09-05 18:43:30 +00:00
Adrian Roos
1262f39600
FRP: Use SUW theme for factory reset protection flow
...
Bug: 37224506
Test: adb shell settings put global device_provisioned 0 && adb shell am start -a android.app.action.CONFIRM_FRP_CREDENTIAL com.android.settings; verify it uses correct theme
Change-Id: I237d8d84840398ebfdc97bf99dce07447042b349
2017-09-05 13:52:26 +02:00
edgar.huang
ab6f11f47f
Settings is crashed high probability when doing follow steps
...
Enter into the fingerprint list screen and delete and identification of operation at the same time, when the item of the fingerprint verification was deleted, highlighting the item to be deleted, just so NullPointerException occurred.
Test: manual - enrolling a fingerprint and do above steps.
2017-09-05 06:35:27 +00:00
Daniel Nishi
09ed020f13
Merge "Make photos/videos storage preference normal." into oc-mr1-dev am: 3d1f6abd6f
...
am: 5467aed58d
2017-09-02 03:58:04 +00:00
Daniel Nishi
5467aed58d
Merge "Make photos/videos storage preference normal." into oc-mr1-dev
...
am: 3d1f6abd6f
2017-09-02 03:39:51 +00:00
TreeHugger Robot
3d1f6abd6f
Merge "Make photos/videos storage preference normal." into oc-mr1-dev
2017-09-02 03:29:52 +00:00
Daniel Nishi
9be0ce09c9
Make photos/videos storage preference normal.
...
We had special behavior for it in the past, but this defines new
behavior that is much closer to what the other storage preferences do.
A photo app filter is used and a photos/video files preference exists on
it which intents over to the gallery app.
Fixes: 64147318
Test: Settings robotests
Change-Id: I47284515fe2dfcc924ae61a44bc47051e9f5fda6
2017-09-01 17:51:56 -07:00
Doris Ling
87ca13d446
Merge "Set drawable for the entity header app preference button." into oc-mr1-dev am: 5fe8e76b36
...
am: c905662743
2017-09-02 00:46:36 +00:00
Doris Ling
c905662743
Merge "Set drawable for the entity header app preference button." into oc-mr1-dev
...
am: 5fe8e76b36
2017-09-02 00:41:28 +00:00
TreeHugger Robot
5fe8e76b36
Merge "Set drawable for the entity header app preference button." into oc-mr1-dev
2017-09-02 00:17:08 +00:00
Daniel Nishi
2e47a32605
Merge "Show work profile apps only on app list." into oc-mr1-dev am: 8618b8649f
...
am: d3e0d745a8
2017-09-01 23:37:21 +00:00
Amit Mahajan
933a4f062d
Merge "Change to disable mvno data field in ApnEditor if needed." into oc-mr1-dev am: cf11e21d47
...
am: f161b63c2a
2017-09-01 23:35:35 +00:00
Daniel Nishi
d3e0d745a8
Merge "Show work profile apps only on app list." into oc-mr1-dev
...
am: 8618b8649f
2017-09-01 23:17:06 +00:00
Amit Mahajan
f161b63c2a
Merge "Change to disable mvno data field in ApnEditor if needed." into oc-mr1-dev
...
am: cf11e21d47
2017-09-01 23:15:59 +00:00
Daniel Nishi
8618b8649f
Merge "Show work profile apps only on app list." into oc-mr1-dev
2017-09-01 22:49:21 +00:00
Doris Ling
a7b40995de
Set drawable for the entity header app preference button.
...
In the entity header layout, the action buttons resource is set to null by
default. When we bind the button with the app preference action, we
should also set the drawable to the settings icon as well.
Change-Id: Ic259b4c538f529671ca5a9c67664ef32fbbb25ae
Fixes: 64826061
Test: make RunSettingsRoboTests
2017-09-01 14:52:30 -07:00
Daniel Nishi
83ceab82e4
Show work profile apps only on app list.
...
For the work profile drilldown, we used to show all apps when the user
drilled down into the categories. This makes it so that the drill down
only shows the work apps when that deep.
Change-Id: I492cd3e9b9b923b87b68645a871dcfb2b91b4f95
Fixes: 62963093
Test: Settings robotest
2017-09-01 13:08:48 -07:00
TreeHugger Robot
f4dc03184b
Merge "Removed deprecated BIND_AUTOFILL permission."
2017-09-01 15:11:50 +00:00
Julia Reynolds
0e497230d9
Merge "Add settings page for notification channel groups"
2017-09-01 12:49:39 +00:00
Felipe Leme
b628d1ed53
Removed deprecated BIND_AUTOFILL permission.
...
Test: make -j100 RunSettingsRoboTests
Bug: 37563972
Change-Id: I423f9c6234e8c1898ed66b22e1078c6f91c58422
2017-08-31 14:28:39 -07:00
Amit Mahajan
a00af97ab1
Change to disable mvno data field in ApnEditor if needed.
...
Test: manual
Bug: 65243262
Change-Id: I4b3dec6d9dc7fecf0b0a8131dccc349c7daffe48
2017-08-31 21:01:25 +00:00
Jack He
0921319824
Merge "Bluetooth: do not dimiss fragment when Activity.finish() is called" into oc-mr1-dev am: bf66bf30b1
...
am: 4dddaf18e1
2017-08-31 19:54:20 +00:00
Jack He
4dddaf18e1
Merge "Bluetooth: do not dimiss fragment when Activity.finish() is called" into oc-mr1-dev
...
am: bf66bf30b1
2017-08-31 19:25:33 +00:00
TreeHugger Robot
bf66bf30b1
Merge "Bluetooth: do not dimiss fragment when Activity.finish() is called" into oc-mr1-dev
2017-08-31 19:16:50 +00:00
Daniel Nishi
cdab0de21f
Merge "Tint the work icon." into oc-mr1-dev am: 260ec8b9ea
...
am: 270f217c9f
2017-08-31 18:19:33 +00:00
Daniel Nishi
270f217c9f
Merge "Tint the work icon." into oc-mr1-dev
...
am: 260ec8b9ea
2017-08-31 17:46:01 +00:00
Phil Weaver
f8a7b8aff0
resolve merge conflicts of 94c5202965 to oc-dr1-dev
...
am: f65e790ba0
2017-08-31 17:34:40 +00:00
Daniel Nishi
260ec8b9ea
Merge "Tint the work icon." into oc-mr1-dev
2017-08-31 17:20:14 +00:00
Julia Reynolds
0c3f4bce57
Add settings page for notification channel groups
...
Bug: 63927402
Test: tests/unit/src/com/android/settings/notification/.*
Change-Id: Iebf7d8ba54f0cf5801a42f3161354d3cc5e5c848
2017-08-31 11:02:36 -04:00
Zhijun He
d1545e506d
Merge "Settings: Enable HAL HDR+ by default" into oc-mr1-dev am: 13991ff9f3
...
am: 7b63402f83
2017-08-31 05:10:20 +00:00
Zhijun He
7b63402f83
Merge "Settings: Enable HAL HDR+ by default" into oc-mr1-dev
...
am: 13991ff9f3
2017-08-31 04:25:28 +00:00
Zhijun He
13991ff9f3
Merge "Settings: Enable HAL HDR+ by default" into oc-mr1-dev
2017-08-31 04:20:59 +00:00
Maurice Lam
95eab62479
Merge "Fix Settings crashes after tapping "Learn more" in fingerprint page" am: 108611ff34 am: 61c8796a5e am: 46a04ecca1
...
am: fe38bfd742
2017-08-31 02:46:39 +00:00
Maurice Lam
fe38bfd742
Merge "Fix Settings crashes after tapping "Learn more" in fingerprint page" am: 108611ff34 am: 61c8796a5e
...
am: 46a04ecca1
2017-08-31 02:39:41 +00:00
Maurice Lam
61c8796a5e
Merge "Fix Settings crashes after tapping "Learn more" in fingerprint page"
...
am: 108611ff34
2017-08-31 02:10:37 +00:00
Jack He
6108d6c22e
Bluetooth: do not dimiss fragment when Activity.finish() is called
...
* When Activity.finish() is called, it's associtated fragments are all
dismissed automatically
* Cached used fragments are dimissed in onCreate() before new ones are
created
Bug: 62230203
Test: Pair with Bluetooth device, Settings unit tests
Change-Id: Ieca88ba0660c5407f0d88d572d06a722c642ac39
2017-08-30 18:44:39 -07:00
Phil Weaver
f65e790ba0
resolve merge conflicts of 94c5202965 to oc-dr1-dev
...
Bug: 62196835
Test: I solemnly swear I tested this conflict resolution.
Merged-In: I7c8d8b4143a5dd1cb684c31c4503608c8d5be0e3
Change-Id: I1bd77f165d1206ea139961bc0c42ad74c1d4bfaf
2017-08-30 22:57:39 +00:00
Lei Yu
9260c92c24
Merge "Add device/profile app check in background check" into oc-mr1-dev am: f5d7db2cfa
...
am: ec8007b426
2017-08-30 17:21:30 +00:00
Lei Yu
ec8007b426
Merge "Add device/profile app check in background check" into oc-mr1-dev
...
am: f5d7db2cfa
2017-08-30 17:15:02 +00:00
Lei Yu
f5d7db2cfa
Merge "Add device/profile app check in background check" into oc-mr1-dev
2017-08-30 17:02:21 +00:00
jackqdyulei
00015fbf50
Add device/profile app check in background check
...
If app is device or profile app, we disable the background check
toggle. This cl also create an util method for this check and
remove duplicate code
Bug: 64665807
Test: RunSettingsRoboTests
Change-Id: Id8336eadaac8832327bc3653aaa7dfbacde352ac
2017-08-29 16:10:36 -07:00
TreeHugger Robot
7c2aebc2b7
Merge "Fix power usage detail page is launched in wrong user"
2017-08-29 22:42:47 +00:00
Daniel Nishi
1568c56de9
Tint the work icon.
...
Bug: 64475406
Test: Manual
Change-Id: Ibe817a9c099439db91aca1a858e5cf5562fa6a4a
2017-08-29 13:55:06 -07:00
Steven Timotius
83018be30d
Merge "Fix to show correct value for data limit setting" into oc-mr1-dev
...
am: 99d524e52b
2017-08-29 19:36:42 +00:00
