OSDN Git Service
(root)
/
android-x86
/
packages-apps-Settings.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Merge changes from topic "am-e8b13d24-dee0-4f84-89d4-8a7d110f6ec1" into oc-dev am...
[android-x86/packages-apps-Settings.git]
/
src
/
com
/
android
/
settings
/
SecuritySettings.java
2018-04-09
Hansong Zhang
Merge changes from topic "am-e8b13d24-dee0-4f84-89d4...
blob
|
commitdiff
2018-04-09
Hansong Zhang
[automerger] DO NOT MERGE Fix unexpected behavior in...
blob
|
commitdiff
2018-04-09
Hansong Zhang
Merge changes from topic "am-e8b13d24-dee0-4f84-89d4...
blob
|
commitdiff
|
diff to current
2018-04-09
Hansong Zhang
[automerger] DO NOT MERGE Fix unexpected behavior in...
blob
|
commitdiff
|
diff to current
2018-04-02
Android Build Merg...
[automerger] DO NOT MERGE Fix unexpected behavior in...
blob
|
commitdiff
|
diff to current
2018-04-02
Android Build Merg...
[automerger] DO NOT MERGE Fix unexpected behavior in...
blob
|
commitdiff
|
diff to current
2018-04-02
Android Build Merg...
[automerger] DO NOT MERGE Fix unexpected behavior in...
blob
|
commitdiff
|
diff to current
2018-04-02
Android Build Merg...
[automerger] DO NOT MERGE Fix unexpected behavior in...
blob
|
commitdiff
|
diff to current
2018-03-08
Antony Sargent
[automerger skipped] Import translations. DO NOT MERGE...
blob
|
commitdiff
2018-03-08
Antony Sargent
[automerger skipped] Import translations. DO NOT MERGE...
blob
|
commitdiff
|
diff to current
2018-02-13
Android Build Merg...
[automerger skipped] Import translations. DO NOT MERGE...
blob
|
commitdiff
|
diff to current
2018-02-13
Android Build Merg...
[automerger skipped] Import translations. DO NOT MERGE...
blob
|
commitdiff
|
diff to current
2018-02-13
Android Build Merg...
[automerger skipped] Import translations. DO NOT MERGE...
blob
|
commitdiff
|
diff to current
2017-12-19
Bill Yi
Import translations. DO NOT MERGE
blob
|
commitdiff
2017-12-13
Bill Yi
Import translations. DO NOT MERGE
blob
|
commitdiff
2017-12-08
Bill Yi
Import translations. DO NOT MERGE
blob
|
commitdiff
2017-12-05
Antony Sargent
Reword bluetooth confirmation dialog am: e14d38a383...
blob
|
commitdiff
2017-12-05
Antony Sargent
Reword bluetooth confirmation dialog am: e14d38a383...
blob
|
commitdiff
|
diff to current
2017-12-05
Antony Sargent
Reword bluetooth confirmation dialog am: e14d38a383...
blob
|
commitdiff
|
diff to current
2017-12-05
Antony Sargent
Reword bluetooth confirmation dialog am: e14d38a383...
blob
|
commitdiff
|
diff to current
2017-12-05
Antony Sargent
Reword bluetooth confirmation dialog
blob
|
commitdiff
|
diff to current
2017-12-01
Antony Sargent
Fix BluetoothPairingDialogTest to not expect device...
blob
|
commitdiff
2017-12-01
Antony Sargent
Fix BluetoothPairingDialogTest to not expect device...
blob
|
commitdiff
|
diff to current
2017-11-26
Bill Yi
Import translations. DO NOT MERGE
blob
|
commitdiff
2017-11-20
Bill Yi
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
blob
|
commitdiff
2017-11-15
Bill Yi
Import translations. DO NOT MERGE
blob
|
commitdiff
2017-11-07
Bill Yi
Import translations. DO NOT MERGE
blob
|
commitdiff
2017-11-03
Fan Zhang
Merge "Set device credential's Window flag to be SECURE...
blob
|
commitdiff
2017-11-03
Fan Zhang
Merge "Set device credential's Window flag to be SECURE...
blob
|
commitdiff
|
diff to current
2017-11-03
Fan Zhang
Merge "Set device credential's Window flag to be SECURE...
blob
|
commitdiff
|
diff to current
2017-11-03
Fan Zhang
Merge "Set device credential's Window flag to be SECURE...
blob
|
commitdiff
|
diff to current
2017-11-03
Fan Zhang
Merge "Set device credential's Window flag to be SECURE...
blob
|
commitdiff
|
diff to current
2017-11-03
Fan Zhang
Merge "Set device credential's Window flag to be SECURE...
blob
|
commitdiff
|
diff to current
2017-10-31
Fan Zhang
Merge "Set device credential's Window flag to be SECURE...
blob
|
commitdiff
2017-10-31
Fan Zhang
Merge "Set device credential's Window flag to be SECURE...
blob
|
commitdiff
|
diff to current
2017-10-31
Fan Zhang
Merge "Set device credential's Window flag to be SECURE...
blob
|
commitdiff
|
diff to current
2017-10-31
Fan Zhang
Merge "Set device credential's Window flag to be SECURE...
blob
|
commitdiff
|
diff to current
2017-10-31
Fan Zhang
Merge "Set device credential's Window flag to be SECURE...
blob
|
commitdiff
|
diff to current
2017-10-31
Fan Zhang
Merge "Set device credential's Window flag to be SECURE...
blob
|
commitdiff
2017-10-31
Fan Zhang
Merge "Set device credential's Window flag to be SECURE...
blob
|
commitdiff
|
diff to current
2017-10-31
Fan Zhang
Merge "Set device credential's Window flag to be SECURE...
blob
|
commitdiff
|
diff to current
2017-10-31
Fan Zhang
Merge "Set device credential's Window flag to be SECURE...
blob
|
commitdiff
2017-10-31
Fan Zhang
Merge "Set device credential's Window flag to be SECURE...
blob
|
commitdiff
|
diff to current
2017-10-31
Bill Yi
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
blob
|
commitdiff
2017-10-31
Fan Zhang
Merge "Set device credential's Window flag to be SECURE...
blob
|
commitdiff
2017-10-27
Bill Yi
Import translations. DO NOT MERGE
blob
|
commitdiff
2017-10-27
Christine Franks
Move color mode to DisplayTransformManager
blob
|
commitdiff
2017-10-27
Fan Zhang
Add strings to support multi-state vivid color management
blob
|
commitdiff
2017-10-27
Bill Yi
Import translations. DO NOT MERGE
blob
|
commitdiff
2017-10-27
Romain Guy
Add new color mode setting
blob
|
commitdiff
2017-10-18
Jeff Sharkey
DO NOT MERGE. ActivityPicker shouldn't grant permission...
blob
|
commitdiff
2017-10-18
Jeff Sharkey
DO NOT MERGE. ActivityPicker shouldn't grant permission...
blob
|
commitdiff
2017-10-18
Jeff Sharkey
DO NOT MERGE. ActivityPicker shouldn't grant permission...
blob
|
commitdiff
|
diff to current
2017-10-18
Jeff Sharkey
DO NOT MERGE. ActivityPicker shouldn't grant permission...
blob
|
commitdiff
|
diff to current
2017-10-18
Jeff Sharkey
DO NOT MERGE. ActivityPicker shouldn't grant permission...
blob
|
commitdiff
|
diff to current
2017-10-18
Jeff Sharkey
DO NOT MERGE. ActivityPicker shouldn't grant permission...
blob
|
commitdiff
|
diff to current
2017-10-18
Jeff Sharkey
DO NOT MERGE. ActivityPicker shouldn't grant permission...
blob
|
commitdiff
|
diff to current
2017-10-18
Jeff Sharkey
DO NOT MERGE. ActivityPicker shouldn't grant permission...
blob
|
commitdiff
|
diff to current
2017-10-18
Jeff Sharkey
DO NOT MERGE. ActivityPicker shouldn't grant permission...
blob
|
commitdiff
|
diff to current
2017-10-18
Jeff Sharkey
DO NOT MERGE. ActivityPicker shouldn't grant permission...
blob
|
commitdiff
|
diff to current
2017-10-18
Jeff Sharkey
DO NOT MERGE. ActivityPicker shouldn't grant permission...
blob
|
commitdiff
|
diff to current
2017-10-18
Jeff Sharkey
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
blob
|
commitdiff
|
diff to current
2017-10-11
Jeff Sharkey
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
blob
|
commitdiff
|
diff to current
2017-10-11
Jeff Sharkey
DO NOT MERGE. ActivityPicker shouldn't grant permission...
blob
|
commitdiff
2017-10-11
Jeff Sharkey
DO NOT MERGE. ActivityPicker shouldn't grant permission...
blob
|
commitdiff
2017-10-11
Jeff Sharkey
DO NOT MERGE. ActivityPicker shouldn't grant permission...
blob
|
commitdiff
|
diff to current
2017-10-11
Jeff Sharkey
DO NOT MERGE. ActivityPicker shouldn't grant permission...
blob
|
commitdiff
|
diff to current
2017-10-11
Jeff Sharkey
DO NOT MERGE. ActivityPicker shouldn't grant permission...
blob
|
commitdiff
2017-10-11
Jeff Sharkey
DO NOT MERGE. ActivityPicker shouldn't grant permission...
blob
|
commitdiff
2017-10-11
Jeff Sharkey
Merge "DO NOT MERGE. ActivityPicker shouldn't grant...
blob
|
commitdiff
2017-10-11
Jeff Sharkey
DO NOT MERGE. ActivityPicker shouldn't grant permission...
blob
|
commitdiff
|
diff to current
2017-10-11
Jeff Sharkey
DO NOT MERGE. ActivityPicker shouldn't grant permission...
blob
|
commitdiff
|
diff to current
2017-10-11
Jeff Sharkey
DO NOT MERGE. ActivityPicker shouldn't grant permission...
blob
|
commitdiff
|
diff to current
2017-10-11
Jeff Sharkey
DO NOT MERGE. ActivityPicker shouldn't grant permission...
blob
|
commitdiff
|
diff to current
2017-10-11
Jeff Sharkey
DO NOT MERGE. ActivityPicker shouldn't grant permission...
blob
|
commitdiff
|
diff to current
2017-10-11
Jeff Sharkey
Merge "DO NOT MERGE. ActivityPicker shouldn't grant...
blob
|
commitdiff
|
diff to current
2017-10-11
Jeff Sharkey
DO NOT MERGE. ActivityPicker shouldn't grant permission...
blob
|
commitdiff
|
diff to current
2017-10-11
Jeff Sharkey
DO NOT MERGE. ActivityPicker shouldn't grant permission...
blob
|
commitdiff
2017-10-11
Jeff Sharkey
DO NOT MERGE. ActivityPicker shouldn't grant permission...
blob
|
commitdiff
|
diff to current
2017-10-11
Jeff Sharkey
DO NOT MERGE. ActivityPicker shouldn't grant permission...
blob
|
commitdiff
|
diff to current
2017-10-11
Jeff Sharkey
DO NOT MERGE. ActivityPicker shouldn't grant permission...
blob
|
commitdiff
|
diff to current
2017-10-11
Jeff Sharkey
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
blob
|
commitdiff
|
diff to current
2017-10-11
Jeff Sharkey
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
blob
|
commitdiff
|
diff to current
2017-10-04
TreeHugger Robot
Merge "Use new no overlay flag instead app ops" into...
blob
|
commitdiff
2017-10-03
TreeHugger Robot
Merge "Fix ANR issue caused by sharedpref commit()...
blob
|
commitdiff
2017-09-28
TreeHugger Robot
Merge "Hide summary for type system" into oc-mr1-dev
blob
|
commitdiff
2017-09-28
TreeHugger Robot
Merge "Move listening to brightness changes to onStart...
blob
|
commitdiff
2017-09-25
TreeHugger Robot
Merge "FRP: Fix positioning of cancel button in Confirm...
blob
|
commitdiff
2017-09-23
TreeHugger Robot
Merge "Reflect device encryption status" into oc-mr1-dev
blob
|
commitdiff
2017-09-22
Ng Zhi An
Reflect device encryption status
blob
|
commitdiff
2017-08-30
Phil Weaver
resolve merge conflicts of 94c5202965 to oc-dr1-dev
blob
|
commitdiff
|
diff to current
2017-08-16
Suprabh Shukla
Disabling the activate button when paused am: de5df8b09...
blob
|
commitdiff
|
diff to current
2017-08-16
Suprabh Shukla
Disabling the activate button when paused am: 9ffee0d53...
blob
|
commitdiff
|
diff to current
2017-08-16
Suprabh Shukla
Disabling the activate button when paused am: af5d8b9b0...
blob
|
commitdiff
|
diff to current
2017-08-16
Suprabh Shukla
Disabling the activate button when paused am: de5df8b09...
blob
|
commitdiff
|
diff to current
2017-08-16
Suprabh Shukla
Disabling the activate button when paused am: 9ffee0d53...
blob
|
commitdiff
|
diff to current
2017-08-16
Suprabh Shukla
Disabling the activate button when paused am: af5d8b9b0...
blob
|
commitdiff
|
diff to current
2017-08-16
Suprabh Shukla
Disabling the activate button when paused am: de5df8b09...
blob
|
commitdiff
|
diff to current
2017-08-16
Suprabh Shukla
Disabling the activate button when paused am: de5df8b09...
blob
|
commitdiff
|
diff to current
2017-08-16
Suprabh Shukla
Disabling the activate button when paused am: 9ffee0d53...
blob
|
commitdiff
|
diff to current
next