OSDN Git Service

resolve merge conflicts of 3964c51bf2 to nyc-dev
[android-x86/packages-apps-Settings.git] / res /
2016-09-19 Bill YiImport translations. DO NOT MERGE
2016-09-06 Maurice Lam[Fingerprint] Remove learn more link if not provisioned...
2016-09-06 Maurice Lam[Fingerprint] Remove learn more link if not provisioned...
2016-09-06 Maurice Lam[Fingerprint] Remove learn more link if not provisioned...
2016-09-06 Maurice Lam[Fingerprint] Remove learn more link if not provisioned...
2016-07-19 Jason MonkMerge "Pre-setup restrictions" into nyc-dev
2016-07-15 Jason MonkPre-setup restrictions DO NOT MERGE am: e6ad6e866b...
2016-07-15 Jason MonkPre-setup restrictions DO NOT MERGE am: e6ad6e866b...
2016-07-15 Jason MonkPre-setup restrictions DO NOT MERGE am: e6ad6e866b
2016-07-15 Jason MonkPre-setup restrictions DO NOT MERGE
2016-07-11 Bill YiImport translations. DO NOT MERGE
2016-07-06 Bill YiImport translations. DO NOT MERGE
2016-06-30 Bill YiImport translations. DO NOT MERGE
2016-06-27 Jason MonkMerge "Fix DND conditional null state" into nyc-dev
2016-06-27 Bill YiImport translations. DO NOT MERGE
2016-06-24 TreeHugger RobotMerge "Import translations. DO NOT MERGE" into nyc-dev
2016-06-24 Bill YiImport translations. DO NOT MERGE
2016-06-21 Daniel SandlerMerge "Show "0" instead of "0 B" in storage settings...
2016-06-21 TreeHugger RobotMerge "Import translations. DO NOT MERGE" into nyc-dev
2016-06-21 Bill YiImport translations. DO NOT MERGE
2016-06-20 Julia ReynoldsMerge "Fix NPE printing notification actions." into...
2016-06-20 Jason MonkFix focusability of battery history chart
2016-06-16 Adrian RoosMerge "Remove RemoteInput on lockscreen setting" into...
2016-06-16 Yohei YukawaMerge "Teach hard keyboard settings about correct user...
2016-06-16 Adrian RoosRemove RemoteInput on lockscreen setting
2016-06-16 TreeHugger RobotMerge "Import translations. DO NOT MERGE" into nyc-dev
2016-06-16 Bill YiImport translations. DO NOT MERGE
2016-06-15 Ricky WaiMerge "Remove work fingerprints when primary profile...
2016-06-15 Jason MonkMerge "Make linkify handle emptys urls better DO NOT...
2016-06-14 TreeHugger RobotMerge "Prevent users from blocking system notifications...
2016-06-14 TreeHugger RobotMerge "Import translations. DO NOT MERGE" into nyc-dev
2016-06-14 Bill YiImport translations. DO NOT MERGE
2016-06-14 Julia ReynoldsDND header should be translated.
2016-06-13 TreeHugger RobotMerge "Remove 'You can choose to either trust or remove...
2016-06-13 Robin LeeMerge "Respect DISALLOW_CONFIG_VPN for disconnect dialo...
2016-06-13 Michal KarpinskiRemove 'You can choose to either trust or remove this...
2016-06-13 Nicolas PrévotMerge "Fix rendering of policy transparency activity...
2016-06-10 Bill YiImport translations. DO NOT MERGE
2016-06-10 TreeHugger RobotMerge "Fix crash in finish from onCreate." into nyc-dev
2016-06-09 Yohei YukawaMerge "Fix sentence capitalization of locale names...
2016-06-09 Roozbeh PournaderMerge "Use existing localizations for formatting data...
2016-06-09 Svetoslav GanovMerge "Don't send user to permissions screen if none...
2016-06-09 Roozbeh PournaderUse existing localizations for formatting data usage...
2016-06-09 Bill YiImport translations. DO NOT MERGE
2016-06-08 Jason MonkMerge "Remove PreferenceActivity" into nyc-dev
2016-06-08 Jason MonkMerge "Fix data usage format strings" into nyc-dev
2016-06-08 Jason MonkMerge "Fix disabling of tiles that are not relevant...
2016-06-08 Ricky WaiMerge "Make work challenge settings work even work...
2016-06-08 Jason MonkRemove PreferenceActivity
2016-06-08 Baligh UddinMerge "Import translations. DO NOT MERGE" into nyc-dev
2016-06-08 Baligh UddinImport translations. DO NOT MERGE
2016-06-08 TreeHugger RobotMerge "Move legacy full disk encryption code to Setting...
2016-06-07 TreeHugger RobotMerge "Import translations. DO NOT MERGE" into nyc-dev
2016-06-07 Bill YiImport translations. DO NOT MERGE
2016-06-06 Robin LeeMerge "Restrict Settings always-on to NYC+" into nyc-dev
2016-06-06 Jason MonkFix data usage format strings
2016-06-03 TreeHugger RobotMerge "Import translations. DO NOT MERGE" into nyc-dev
2016-06-03 Jason MonkMerge "Fix accidental non-translatable string" into...
2016-06-03 Jason MonkFix accidental non-translatable string
2016-06-03 Bill YiImport translations. DO NOT MERGE
2016-06-03 TreeHugger RobotMerge "Avoid triggering device admin settings in non...
2016-06-03 Makoto OnukiFix RTL layout
2016-06-02 Fyodor KupolovMerge "Make prefs without an action unselectable" into...
2016-06-02 Wei WangMerge "Revert "Add an entry in developer options for...
2016-06-02 Wei WangRevert "Add an entry in developer options for location...
2016-06-01 Jason MonkMerge "onResume -> onStart, onPause -> onStop" into...
2016-06-01 Jason MonkMerge "Fix some top-level settings not updating with...
2016-06-01 Jason MonkMerge "Cache account prefs so we don't lose a11y focus...
2016-06-01 Jason MonkMerge "Fix apps spinner jank." into nyc-dev
2016-06-01 TreeHugger RobotMerge "Import translations. DO NOT MERGE" into nyc-dev
2016-06-01 Bill YiImport translations. DO NOT MERGE
2016-06-01 Victor ChangMerge "Show different strings when PO/DO user approves...
2016-06-01 Tony MakMerge "Fix RTL issue in Trusted Credentail page" into...
2016-05-31 Tony MakFix RTL issue in Trusted Credentail page
2016-05-31 TreeHugger RobotMerge "Import translations. DO NOT MERGE" into nyc-dev
2016-05-31 Roozbeh PournaderMerge "Show only up to two locales in Settings" into...
2016-05-30 Bill YiImport translations. DO NOT MERGE
2016-05-27 Jason MonkMerge "Fix pref availability for search" into nyc-dev
2016-05-27 Jason MonkMerge "Don't allow restricted data usage of system...
2016-05-27 Roozbeh PournaderMerge "Force dashboard summary to single-line and ellip...
2016-05-26 Roozbeh PournaderForce dashboard summary to single-line and ellipsize it
2016-05-26 Maurice LamMerge "Add activity label to encryption interstitial...
2016-05-26 TreeHugger RobotMerge "Import translations. DO NOT MERGE" into nyc-dev
2016-05-26 Julia ReynoldsMerge "Importance slider updates." into nyc-dev
2016-05-26 Julia ReynoldsImportance slider updates.
2016-05-26 Ricky WaiMerge "Use LockPatternUtils.resetKeyStore() to clear...
2016-05-25 Bill YiImport translations. DO NOT MERGE
2016-05-25 TreeHugger RobotMerge "Guard against IllegalArgumentException" into...
2016-05-25 Robin LeeMerge "Don't crash trying to disable lockdown VPN"...
2016-05-25 TreeHugger RobotMerge "Remove option to configure emergency app" into...
2016-05-24 Victor ChangMerge "Trust the certificate after unlocking screenlock...
2016-05-23 TreeHugger RobotMerge "Import translations. DO NOT MERGE" into nyc-dev
2016-05-23 TreeHugger RobotMerge "Fixed whitelist stats so it's only logged on...
2016-05-23 Bill YiImport translations. DO NOT MERGE
2016-05-23 Victor ChangMerge "Fix Continous loop in unifed screenlock when...
2016-05-21 Baligh UddinImport translations. DO NOT MERGE
2016-05-20 Felipe LemeMerge "Defined help page for Data Saver." into nyc-dev
2016-05-20 Victor ChangMerge "Temp fix for NPE when race condition happens...
2016-05-20 Felipe LemeDefined help page for Data Saver.
2016-05-19 Kenny GuyMerge "Update work challenge background image." into...
next