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
Import translations. DO NOT MERGE
[android-x86/packages-apps-Settings.git]
/
Android.mk
2013-06-06
Alex Klyubin
resolved conflicts for merge of 5d21820a to jb-mr2-dev
blob
|
commitdiff
2013-06-06
Alex Klyubin
am 5aa3f878: (-s ours) am 0c32da7e: am 6f28e342: am...
blob
|
commitdiff
2013-06-06
Alex Klyubin
am 01dbfbf9: am efd88e2c: Merge "Permit deactivation...
blob
|
commitdiff
|
diff to current
2013-06-06
Alex Klyubin
am 60544e74: am 3dddd8cb: Ensure all active Device...
blob
|
commitdiff
|
diff to current
2013-06-06
Alex Klyubin
am efd88e2c: Merge "Permit deactivation of malformed...
blob
|
commitdiff
|
diff to current
2013-06-06
Alex Klyubin
am 3dddd8cb: Ensure all active Device Admins are listed.
blob
|
commitdiff
|
diff to current
2013-06-06
Dianne Hackborn
am 9cd1d5e2: (-s ours) am a9a28d2f: am f96a86c9: am...
blob
|
commitdiff
2013-06-06
Dianne Hackborn
am 5f28c77b: am d6086125: Fix issue #9074296: Device...
blob
|
commitdiff
|
diff to current
2013-06-06
Dianne Hackborn
am d6086125: Fix issue #9074296: Device Admins can...
blob
|
commitdiff
|
diff to current
2013-04-12
Maggie Benthall
Merge "Implement Settings app UX for when a user has...
blob
|
commitdiff
2013-04-12
Emily Bernier
Merge "User restrictions for creds storage & user remov...
blob
|
commitdiff
2013-04-12
Amith Yamasani
Merge "Embed the app restrictions fragment in the dual...
blob
|
commitdiff
2013-04-12
Irfan Sheriff
Merge "Limit device name length" into jb-mr2-dev
blob
|
commitdiff
2013-04-11
Benjamin Poiesz
Merge "Forcing the settings apk to be built with the...
blob
|
commitdiff
2013-04-11
Benjamin Poiesz
Forcing the settings apk to be built with the zz_ZZ...
blob
|
commitdiff
2013-03-28
Kenny Root
am 0d52fc18: am 9dc478ec: Merge "Add ability to install...
blob
|
commitdiff
|
diff to current
2013-03-20
Jeff Sharkey
am f8db32d8: am 74fd506b: Merge "Enable Ethernet tab...
blob
|
commitdiff
|
diff to current
2013-03-17
Robert Greenwalt
am cd1c38cf: am ae9ebfd1: Merge "add MVNO field for...
blob
|
commitdiff
|
diff to current
2013-03-14
Elliott Hughes
am 93692c36: am 53309365: Merge "use date from 1970...
blob
|
commitdiff
|
diff to current
2013-03-12
Amith Yamasani
am 8749f35f: am 506b68e1: Merge "Moved KEY_VIBRATE...
blob
|
commitdiff
|
diff to current
2013-03-12
Daniel Sandler
Merge "Show new and old notifications in the same list...
blob
|
commitdiff
|
diff to current
2013-03-11
Jean-Baptiste Queru
am 565af383: am 33adccd2: am 9cff5e3f: am f4b1aefb...
blob
|
commitdiff
|
diff to current
2013-03-08
Amith Yamasani
am 6e0bff0d: Merge "Fix the message when Bluetooth...
blob
|
commitdiff
|
diff to current
2013-03-07
Daniel Sandler
Merge "Listen for the current user's notifications...
blob
|
commitdiff
|
diff to current
2013-03-07
Baligh Uddin
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
blob
|
commitdiff
|
diff to current
2013-03-06
Jeff Sharkey
Merge "Remove guava dependency to speed up build."...
blob
|
commitdiff
|
diff to current
2013-03-06
Jeff Sharkey
Remove guava dependency to speed up build.
blob
|
commitdiff
|
diff to current
2013-03-05
Irfan Sheriff
am ba6a68c8: Merge "Fix not updating error message...
blob
|
commitdiff
|
diff to current
2013-02-21
Wink Saville
am a7d2fd80: Merge "avoid stopping app in case of acces...
blob
|
commitdiff
|
diff to current
2013-02-20
Amith Yamasani
am a5f756c9: Merge "Prevent cursor from causing global...
blob
|
commitdiff
|
diff to current
2013-02-16
Irfan Sheriff
am ff5b96fb: Merge changes If41fad5f,I9c860569,I2e3e8d4...
blob
|
commitdiff
|
diff to current
2013-02-15
Amith Yamasani
am 1ef6a106: Merge "Fix Settings app crash after enable...
blob
|
commitdiff
|
diff to current
2013-02-14
Kenny Root
resolved conflicts for merge of bbe409d3 to master
blob
|
commitdiff
|
diff to current
2013-02-06
Irfan Sheriff
am 5c879e48: am 414d9e9c: Merge "P2PSetting:Avoid p2p_f...
blob
|
commitdiff
|
diff to current
2013-02-06
Irfan Sheriff
am 6639dee4: am 203631b2: Merge "wifiSettings: Updating...
blob
|
commitdiff
|
diff to current
2013-01-28
Irfan Sheriff
Merge "Follow UX design guideline for frequency band"
blob
|
commitdiff
|
diff to current
2013-01-26
Dianne Hackborn
am bbf8daf4: am 505232be: Merge "Fix of Settings applic...
blob
|
commitdiff
|
diff to current
2013-01-26
Irfan Sheriff
am 61b0f8c8: am b1ea6805: Merge "Option "None" replaced...
blob
|
commitdiff
|
diff to current
2013-01-23
Amith Yamasani
am a6c51f3d: am 7b8b6618: Merge "Fix for battery temper...
blob
|
commitdiff
|
diff to current
2013-01-22
Irfan Sheriff
am 814db19c: am 67995f97: Merge "Fix for F/C in WifiCon...
blob
|
commitdiff
|
diff to current
2013-01-22
Elliott Hughes
am d7d5b33b: am 375b6d98: Merge "Force closed at settin...
blob
|
commitdiff
|
diff to current
2013-01-19
Irfan Sheriff
Merge "Allow only valid EAP configs"
blob
|
commitdiff
|
diff to current
2013-01-17
Chris Craik
Merge "Remove now obsolete tracing options"
blob
|
commitdiff
|
diff to current
2013-01-17
Russell Brenner
Merge "Stop hijacking strings from Setup Wizard"
blob
|
commitdiff
|
diff to current
2013-01-17
Russell Brenner
Merge "Revised text for skipping wifi"
blob
|
commitdiff
|
diff to current
2013-01-17
Fabrice Di Meglio
Merge "Fix Switches padding for Settings app"
blob
|
commitdiff
|
diff to current
2013-01-16
Amith Yamasani
Merge "Use bindServiceAsUser() to follow API change."
blob
|
commitdiff
|
diff to current
2013-01-16
Dianne Hackborn
Quick and dirty UI for viewing app op information.
blob
|
commitdiff
|
diff to current
2012-12-08
Elliott Hughes
Merge "Makes the add button for new APNs appear in...
blob
|
commitdiff
|
diff to current
2012-11-01
Amith Yamasani
am f9a2f324: Merge "Changed the way that date format...
blob
|
commitdiff
|
diff to current
2012-09-14
Michael Jurka
Merge "Adding ability to filter for certain types of...
blob
|
commitdiff
|
diff to current
2012-09-13
Jeff Sharkey
am 7786df05: am 4a095381: Merge "Iteration on multi...
blob
|
commitdiff
|
diff to current
2012-09-13
Dianne Hackborn
Merge "Multi-user battery settings." into jb-mr1-dev
blob
|
commitdiff
|
diff to current
2012-09-13
The Android Automerger
merge in jb-mr1-release history after reset to jb-mr1-dev
blob
|
commitdiff
|
diff to current
2012-09-13
Jeff Sharkey
am 4a095381: Merge "Iteration on multi-user Storage...
blob
|
commitdiff
|
diff to current
2012-09-13
Jeff Sharkey
am 4a095381: Merge "Iteration on multi-user Storage...
blob
|
commitdiff
|
diff to current
2012-09-13
Jeff Sharkey
Merge "Iteration on multi-user Storage UI." into jb...
blob
|
commitdiff
|
diff to current
2012-09-13
Jeff Sharkey
Iteration on multi-user Storage UI.
blob
|
commitdiff
|
diff to current
2012-09-06
The Android Open...
Reconcile with jb-release - do not merge
blob
|
commitdiff
|
diff to current
2012-08-17
The Android Open...
Reconcile with jb-mr0-release - do not merge
blob
|
commitdiff
|
diff to current
2012-08-15
Baligh Uddin
am 11665038: Merge "Import translations. DO NOT MERGE...
blob
|
commitdiff
|
diff to current
2012-08-14
Baligh Uddin
am cb5624b8: Merge "Import translations. DO NOT MERGE...
blob
|
commitdiff
|
diff to current
2012-08-14
Baligh Uddin
am c5acc132: Import translations. DO NOT MERGE
blob
|
commitdiff
|
diff to current
2012-08-13
Jean-Baptiste Queru
Merge "Settings: Use ICS alert drawable"
blob
|
commitdiff
|
diff to current
2012-08-07
The Android Open...
Reconcile with jb-mr0-release - do not merge
blob
|
commitdiff
|
diff to current
2012-08-03
Ying Wang
am 3eee86b8: Import translations. DO NOT MERGE
blob
|
commitdiff
|
diff to current
2012-08-03
Michael Jurka
am ca511a81: Fix appwidget bind dialog
blob
|
commitdiff
|
diff to current
2012-08-01
Ying Wang
am d7ae05db: Import translations. DO NOT MERGE
blob
|
commitdiff
|
diff to current
2012-08-01
Justin Koh
am 7b065464: Move BT settings appliance check after...
blob
|
commitdiff
|
diff to current
2012-07-31
The Android Open...
Reconcile with jb-mr0-release - do not merge
blob
|
commitdiff
|
diff to current
2012-07-30
Ying Wang
am 723bdf1e: Import translations. DO NOT MERGE
blob
|
commitdiff
|
diff to current
2012-07-30
The Android Open...
Reconcile with jb-mr0-release jb-release
blob
|
commitdiff
|
diff to current
2012-07-27
Ying Wang
am eaeb8b61: Import translations. DO NOT MERGE
blob
|
commitdiff
|
diff to current
2012-07-26
Amith Yamasani
am 07841668: Merge "Move Google-apps specific location...
blob
|
commitdiff
|
diff to current
2012-07-26
Ying Wang
am 4e53a0cb: Import translations. DO NOT MERGE
blob
|
commitdiff
|
diff to current
2012-07-25
Ying Wang
am c31f6b23: Import translations. DO NOT MERGE
blob
|
commitdiff
|
diff to current
2012-07-25
Ying Wang
am 54199540: Import translations. DO NOT MERGE
blob
|
commitdiff
|
diff to current
2012-07-24
Amith Yamasani
am 4635ec6b: Strings for upcoming location settings...
blob
|
commitdiff
|
diff to current
2012-07-23
Ying Wang
am 13be5469: Import translations. DO NOT MERGE
blob
|
commitdiff
|
diff to current
2012-07-20
Ying Wang
am 509cfa1d: Import translations. DO NOT MERGE
blob
|
commitdiff
|
diff to current
2012-07-19
Ying Wang
am 35e404c8: Import translations. DO NOT MERGE
blob
|
commitdiff
|
diff to current
2012-07-19
The Android Open...
Reconcile with jb-mr0-release jb-release
blob
|
commitdiff
|
diff to current
2012-07-19
Ying Wang
am 2bc05a27: Import translations. DO NOT MERGE
blob
|
commitdiff
|
diff to current
2012-07-17
Ying Wang
am fa0f3fe1: Import translations. DO NOT MERGE
blob
|
commitdiff
|
diff to current
2012-07-17
Wink Saville
Use telephony-common - DO NOT MERGE
blob
|
commitdiff
|
diff to current
2012-07-16
Ying Wang
am 66daca6b: Import translations. DO NOT MERGE
blob
|
commitdiff
|
diff to current
2012-07-14
Dianne Hackborn
am ea819b07: Merge "Implement issue #6819955: Add butto...
blob
|
commitdiff
|
diff to current
2012-07-13
Ying Wang
am 4b25c5ad: Import translations. DO NOT MERGE
blob
|
commitdiff
|
diff to current
2012-07-12
Dianne Hackborn
Merge "If external storage is emulated, don't show...
blob
|
commitdiff
|
diff to current
2012-07-12
Ying Wang
am 62acae4f: Merge "Import translations. DO NOT MERGE...
blob
|
commitdiff
|
diff to current
2012-07-12
John Wang
am b0b45c02: Display FCC id for LTE in Settings.
blob
|
commitdiff
|
diff to current
2012-07-12
Wink Saville
Merge commit '5543404a' into mit
blob
|
commitdiff
|
diff to current
2012-07-11
Wink Saville
Use telephony-common
blob
|
commitdiff
|
diff to current
2012-07-03
Irfan Sheriff
am 2fad853b: Merge "Limit length of SSID input string...
blob
|
commitdiff
|
diff to current
2012-07-03
Irfan Sheriff
am d80ff0a4: Merge "wifi: update text displayed during...
blob
|
commitdiff
|
diff to current
2012-06-14
Jean-Baptiste Queru
am 60ec22d1: (-s ours) Merge "Settings: Fixed German...
blob
|
commitdiff
|
diff to current
2012-06-12
Jean-Baptiste Queru
resolved conflicts for merge of 051f46d7 to jb-dev...
blob
|
commitdiff
|
diff to current
2012-06-11
Jean-Baptiste Queru
am c56b0146: Merge "Fixing pin_too_short text"
blob
|
commitdiff
|
diff to current
2012-06-08
Jean-Baptiste Queru
am 5a0b3230: Merge "Add account type check for invisibl...
blob
|
commitdiff
|
diff to current
2012-05-25
Amith Yamasani
am 8ad7abbc: Merge "Corrected return value for updatePr...
blob
|
commitdiff
|
diff to current
next