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:
811de70
67d44d9
)
Merge "Hide the audio switcher if it is not relevant" into pi-dev am: 3f5444b9e4
author
caxtonchan
<caxtonchan@google.com>
Wed, 25 Apr 2018 04:04:45 +0000
(21:04 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 25 Apr 2018 04:04:45 +0000
(21:04 -0700)
am:
67d44d9d61
Change-Id: I36b249159ef8d0a6d099ba776c5d682ea596e5e3
1
2
src/com/android/settings/sound/AudioSwitchPreferenceController.java
patch
|
diff1
|
diff2
|
blob
|
history
src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java
patch
|
diff1
|
diff2
|
blob
|
history
src/com/android/settings/sound/MediaOutputPreferenceController.java
patch
|
diff1
|
diff2
|
blob
|
history
tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java
patch
|
diff1
|
diff2
|
blob
|
history
tests/robotests/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceControllerTest.java
patch
|
diff1
|
diff2
|
blob
|
history
tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/com/android/settings/sound/AudioSwitchPreferenceController.java
Simple merge
diff --cc
src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java
Simple merge
diff --cc
src/com/android/settings/sound/MediaOutputPreferenceController.java
Simple merge
diff --cc
tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java
Simple merge
diff --cc
tests/robotests/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceControllerTest.java
Simple merge
diff --cc
tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java
Simple merge
OSDN Git Service
