OSDN Git Service
(root)
/
android-x86
/
packages-apps-Settings.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
58005fc
8fcf4d8
)
Merge "Adjust a11y shortcut settings based on UX input"
author
Phil Weaver
<pweaver@google.com>
Tue, 27 Jun 2017 15:09:33 +0000
(15:09 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Tue, 27 Jun 2017 15:09:35 +0000
(15:09 +0000)
1
2
res/values/strings.xml
patch
|
diff1
|
diff2
|
blob
|
history
src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java
patch
|
diff1
|
diff2
|
blob
|
history
tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
res/values/strings.xml
Simple merge
diff --cc
src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java
Simple merge
diff --cc
tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
Simple merge