Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- perka@perka-ubuntu:~/android/system/packages/apps/Settings$ git status
- # Not currently on any branch.
- # Changes to be committed:
- # (use "git reset HEAD <file>..." to unstage)
- #
- # modified: AndroidManifest.xml
- # new file: res/drawable-hdpi/ic_menu_trash_holo_dark.png
- # new file: res/drawable-mdpi/ic_menu_trash_holo_dark.png
- # new file: res/drawable-xhdpi/ic_menu_trash_holo_dark.png
- # new file: res/layout/add_profile_dialog.xml
- # new file: res/layout/preference_name.xml
- # new file: res/layout/preference_profiles.xml
- # copied: res/xml/profiles_settings.xml -> res/layout/preference_profiles_widget.xml
- # new file: res/layout/preference_streamvolume.xml
- # new file: res/layout/rename_profile_dialog.xml
- # modified: res/values-nl/arrays.xml
- # modified: res/values/arrays.xml
- # modified: res/values/styles.xml
- # copied: res/xml/profiles_settings.xml -> res/xml/appgroup_list.xml
- # renamed: res/xml/profiles_settings.xml -> res/xml/application_list.xml
- # new file: res/xml/profile_config.xml
- # new file: res/xml/profile_settings.xml
- # modified: res/xml/settings_headers.xml
- # new file: src/com/android/settings/profiles/AppGroupConfig.java
- # new file: src/com/android/settings/profiles/AppGroupList.java
- # new file: src/com/android/settings/profiles/ApplicationItemPreference.java
- # new file: src/com/android/settings/profiles/NamePreference.java
- # new file: src/com/android/settings/profiles/ProfileConfig.java
- # new file: src/com/android/settings/profiles/ProfileConnectionPreference.java
- # new file: src/com/android/settings/profiles/ProfileGroupConfig.java
- # new file: src/com/android/settings/profiles/ProfileRingtonePreference.java
- # new file: src/com/android/settings/profiles/ProfilesPreference.java
- # new file: src/com/android/settings/profiles/ProfilesSettings.java
- # new file: src/com/android/settings/profiles/StreamVolumePreference.java
- #
- # Unmerged paths:
- # (use "git reset HEAD <file>..." to unstage)
- # (use "git add/rm <file>..." as appropriate to mark resolution)
- #
- # both modified: res/values-nl/strings.xml
- # both modified: res/values/strings.xml
- #
- perka@perka-ubuntu:~/android/system/packages/apps/Settings$
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement