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
Merge "Rename Night display to Night Light" into nyc-mr1-dev
[android-x86/packages-apps-Settings.git]
/
res
/
xml
/
zen_mode_event_rule_settings.xml
2016-02-29
Sanket Padawe
Resolve merge conflicts of b9e837bc78 to nyc-dev
blob
|
commitdiff
2016-02-20
Samuel Tan
WifiConfigController: set ca_path and ca_cert to null...
blob
|
commitdiff
2016-02-17
Geoff Mendal
Import translations. DO NOT MERGE
blob
|
commitdiff
2016-02-17
Lorenzo Colitti
resolve merge conflicts of c408ab3de6 to nyc-dev
blob
|
commitdiff
2016-02-17
Nathan Harold
Update BandMode Names to support full list, fix off...
blob
|
commitdiff
2016-02-15
Geoff Mendal
Import translations. DO NOT MERGE
blob
|
commitdiff
2016-02-14
Svetoslav
DO NOT MERGE Modify system settings: incorrect UI state...
blob
|
commitdiff
2016-02-10
Geoff Mendal
Import translations. DO NOT MERGE
blob
|
commitdiff
2016-02-09
Samuel Tan
Allow trusted system certificates to be used in EAP...
blob
|
commitdiff
2016-02-06
Adam Lesinski
Merge "Update FakeUid interface to match BatteryStats...
blob
|
commitdiff
2016-02-05
Samuel Tan
Correctly load saved EAP CA cert and user cert options
blob
|
commitdiff
2016-02-05
Jim Miller
Merge "Fix crash on devices without fingerprint feature."
blob
|
commitdiff
2016-02-04
Casey Burkhardt
Merge "Remove ActivityManagerNative dependency for...
blob
|
commitdiff
2016-02-04
Sudheer Shanka
Merge "Use the correct userId when checking if disabled...
blob
|
commitdiff
2016-02-04
Alan Viverette
Merge "App grid preview for screen zoom"
blob
|
commitdiff
2016-02-03
Jason Monk
Merge "Make cell data usage an array"
blob
|
commitdiff
2016-02-03
Anna Galusza
Merge "UI fixes (back arrow, blue switch bar, append...
blob
|
commitdiff
2016-02-03
Sunny Goyal
Merge "Adding fast scroller in app list"
blob
|
commitdiff
2016-02-03
Jason Monk
Merge "String refinements touch -> tap"
blob
|
commitdiff
2016-02-03
Jason Monk
Merge "Change receiver name attribute for DISCOVERABLE_...
blob
|
commitdiff
2016-02-03
Jason Monk
Merge "Broadscale logging for Settings"
blob
|
commitdiff
2016-02-03
Geoff Mendal
Import translations. DO NOT MERGE am: 10a758b8b7 ...
blob
|
commitdiff
|
diff to current
2016-02-03
Geoff Mendal
Import translations. DO NOT MERGE am: dd33e41c5a ...
blob
|
commitdiff
|
diff to current
2016-02-02
Ritesh Reddy
Merge "Calling dataChanged() for Net Policy Restriction...
blob
|
commitdiff
|
diff to current
2016-02-02
Samuel Tan
Allow domain suffix match to be set in UI for EAP confi...
blob
|
commitdiff
|
diff to current
2016-02-02
Geoff Mendal
Import translations. DO NOT MERGE am: 49a9587ade ...
blob
|
commitdiff
|
diff to current
2016-02-02
Geoff Mendal
Import translations. DO NOT MERGE am: 0873f057db ...
blob
|
commitdiff
|
diff to current
2016-02-01
Geoff Mendal
Import translations. DO NOT MERGE am: 66382c5667 ...
blob
|
commitdiff
|
diff to current
2016-02-01
Geoff Mendal
Import translations. DO NOT MERGE am: 67603ccc01 ...
blob
|
commitdiff
|
diff to current
2016-01-30
Jason Monk
Broadscale logging for Settings
blob
|
commitdiff
2016-01-27
Samuel Tan
Display warning if users does not provide CA cert in...
blob
|
commitdiff
|
diff to current
2016-01-27
Samuel Tan
Add menu options for not specifying a EAP CA cert and...
blob
|
commitdiff
|
diff to current
2016-01-27
Samuel Tan
Disable configuring EAP-TLS without user certificate.
blob
|
commitdiff
|
diff to current
2016-01-27
Sanket Padawe
[DO NOT MERGE] Disable configuring EAP-TLS/TTLS/PEAP...
blob
|
commitdiff
|
diff to current
2016-01-27
Geoff Mendal
Import translations. DO NOT MERGE am: 963c4b3d41 ...
blob
|
commitdiff
|
diff to current
2016-01-27
Geoff Mendal
Import translations. DO NOT MERGE am: 9c57679b0e ...
blob
|
commitdiff
|
diff to current
2016-01-27
Rubin Xu
resolve merge conflicts of 55d7fcbfc2 to master.
blob
|
commitdiff
|
diff to current
2016-01-26
Shishir Agrawal
DO NOT MERGE : Unhiding MSIM APIs.
blob
|
commitdiff
|
diff to current
2016-01-25
Geoff Mendal
Merge "Import translations. DO NOT MERGE" into mnc...
blob
|
commitdiff
|
diff to current
2016-01-25
Geoff Mendal
Import translations. DO NOT MERGE am: 13391af4fc ...
blob
|
commitdiff
|
diff to current
2016-01-23
Steve Pfetsch
resolve merge conflicts of 259b6a8029 to master.
blob
|
commitdiff
|
diff to current
2016-01-22
Kenny Root
resolve merge conflicts of bdc6074276 to master.
blob
|
commitdiff
|
diff to current
2016-01-20
Geoff Mendal
Import translations. DO NOT MERGE am: ffb0eb03a7 ...
blob
|
commitdiff
|
diff to current
2016-01-20
Geoff Mendal
Import translations. DO NOT MERGE am: bcefb0397f ...
blob
|
commitdiff
|
diff to current
2016-01-18
Geoff Mendal
Import translations. DO NOT MERGE am: c123a6a923 ...
blob
|
commitdiff
|
diff to current
2016-01-18
Geoff Mendal
Import translations. DO NOT MERGE am: bd620a7de1 ...
blob
|
commitdiff
|
diff to current
2016-01-15
Stephen Li
Merge -s ours commit 'dcd4a64f66'
blob
|
commitdiff
|
diff to current
2016-01-15
Jason Monk
Merge "Settings Hooks launch wrong activity" am: 69704608f4
blob
|
commitdiff
|
diff to current
2016-01-14
Bart Sears
resolve merge conflicts of 7e0586b7a6 to master.
blob
|
commitdiff
|
diff to current
2016-01-13
Geoff Mendal
Import translations. DO NOT MERGE am: 6a52aca8ea ...
blob
|
commitdiff
|
diff to current
2016-01-12
Pavel Zhamaitsiak
resolve merge conflicts of 5a1e5edeb7 to master.
blob
|
commitdiff
|
diff to current
2016-01-11
Sudheer Shanka
am 3ad534aa: am bc956309: Update warning dialog on...
blob
|
commitdiff
|
diff to current
2016-01-11
Geoff Mendal
am 0baeee0c: (-s ours) am 79670bbe: (-s ours) Import...
blob
|
commitdiff
|
diff to current
2016-01-11
Alan Viverette
am fb7827f3: am d4988442: Point to Material.Settings...
blob
|
commitdiff
|
diff to current
2016-01-11
Yorke Lee
am 80848e20: am 169f824b: Merge "Rename setDefaultDiale...
blob
|
commitdiff
|
diff to current
2016-01-11
Jorim Jaggi
am 80134266: am 4a2423ba: Move fingerprint enroll logic...
blob
|
commitdiff
|
diff to current
2016-01-11
Jorim Jaggi
am 6ecd1005: am 11eae045: Allow incremental builds...
blob
|
commitdiff
|
diff to current
2016-01-11
Maurice Lam
am ab82d2fd: am 9fab5c1d: Merge "[LockSetup] Hide back...
blob
|
commitdiff
|
diff to current
2016-01-11
Maurice Lam
am 824b09cb: am 80ca2687: Merge "[WifiSetup] Show progr...
blob
|
commitdiff
|
diff to current
2016-01-11
Jason Monk
am e5f7ba7f: am 70c5472f: Merge "Move process stats...
blob
|
commitdiff
|
diff to current
2016-01-11
Geoff Mendal
am 6d53b908: (-s ours) am d1b9edab: (-s ours) Import...
blob
|
commitdiff
|
diff to current
2016-01-11
Geoff Mendal
am 3eb3af9d: (-s ours) am c5184ff1: (-s ours) Import...
blob
|
commitdiff
|
diff to current
2016-01-11
Sudheer Shanka
am 3ad534aa: am bc956309: Update warning dialog on...
blob
|
commitdiff
|
diff to current
2016-01-11
Geoff Mendal
am 0baeee0c: (-s ours) am 79670bbe: (-s ours) Import...
blob
|
commitdiff
|
diff to current
2016-01-11
Alan Viverette
am fb7827f3: am d4988442: Point to Material.Settings...
blob
|
commitdiff
|
diff to current
2016-01-11
Yorke Lee
am 80848e20: am 169f824b: Merge "Rename setDefaultDiale...
blob
|
commitdiff
|
diff to current
2016-01-11
Jorim Jaggi
am 80134266: am 4a2423ba: Move fingerprint enroll logic...
blob
|
commitdiff
|
diff to current
2016-01-11
Jorim Jaggi
am 6ecd1005: am 11eae045: Allow incremental builds...
blob
|
commitdiff
|
diff to current
2016-01-11
Maurice Lam
am ab82d2fd: am 9fab5c1d: Merge "[LockSetup] Hide back...
blob
|
commitdiff
|
diff to current
2016-01-11
Maurice Lam
am 824b09cb: am 80ca2687: Merge "[WifiSetup] Show progr...
blob
|
commitdiff
|
diff to current
2016-01-11
Jason Monk
am e5f7ba7f: am 70c5472f: Merge "Move process stats...
blob
|
commitdiff
|
diff to current
2016-01-11
Geoff Mendal
am 6d53b908: (-s ours) am d1b9edab: (-s ours) Import...
blob
|
commitdiff
|
diff to current
2016-01-11
Geoff Mendal
am 3eb3af9d: (-s ours) am c5184ff1: (-s ours) Import...
blob
|
commitdiff
|
diff to current
2016-01-08
Mark Salyzyn
Merge "whitelist "snet_event_log" when turning logs...
blob
|
commitdiff
|
diff to current
2016-01-07
Alex Klyubin
Merge "[2/3] Remove unnecessary throws statement in...
blob
|
commitdiff
|
diff to current
2016-01-06
Mark Salyzyn
Merge "Settings: switch to using ctl.start property...
blob
|
commitdiff
|
diff to current
2016-01-05
Jeff Sharkey
Merge "Some text are missing in eject sdcard warning...
blob
|
commitdiff
|
diff to current
2016-01-05
Amith Yamasani
Merge "Fix "division by zero" crash after USB mass...
blob
|
commitdiff
|
diff to current
2016-01-04
Jason Monk
Merge "fix out of memory with continuous entry and...
blob
|
commitdiff
|
diff to current
2015-12-28
Mark Salyzyn
resolve merge conflicts of 94ab88228e to master.
blob
|
commitdiff
|
diff to current
2015-12-24
Alex Cheung
Use "merge -s ours origin/mirror-partner-mm-wireless...
blob
|
commitdiff
|
diff to current
2015-12-23
Nick Kralevich
Merge "Hide usb mode chooser dialog after disconnected...
blob
|
commitdiff
|
diff to current
2015-12-22
Svetoslav
DO NOT MERGE Modify system settings: incorrect UI state...
blob
|
commitdiff
|
diff to current
2015-12-21
Jack Yu
Merge "Added a new broadcast receiver to handle Brzail...
blob
|
commitdiff
|
diff to current
2015-12-21
Philip P. Moltmann
Merge "Print-Settings Remove unused fields."
blob
|
commitdiff
|
diff to current
2015-12-15
Amit Mahajan
Merge "Code cleanup including removing direct reference...
blob
|
commitdiff
|
diff to current
2015-12-15
Maurice Lam
Merge "[ScreenLock] Fix result code handling"
blob
|
commitdiff
|
diff to current
2015-12-15
Jason Monk
Merge "Move DropDownPreference to supportlib"
blob
|
commitdiff
|
diff to current
2015-12-15
Jason Monk
Move DropDownPreference to supportlib
blob
|
commitdiff
|
diff to current
2015-11-17
Russell Brenner
Merge "Block developer settings during SUW" into lmp...
blob
|
commitdiff
|
diff to current
2015-11-17
Russell Brenner
[DO NOT MERGE] Preserve FRP lock if wiped during SUW...
blob
|
commitdiff
|
diff to current
2015-10-19
Geoff Mendal
am f191953c: (-s ours) Import translations. DO NOT...
blob
|
commitdiff
|
diff to current
2015-10-14
Geoff Mendal
am 8b6b589d: (-s ours) am cec2a65a: (-s ours) am 26bb54...
blob
|
commitdiff
|
diff to current
2015-10-14
Geoff Mendal
am 974dfc1f: (-s ours) Import translations. DO NOT...
blob
|
commitdiff
|
diff to current
2015-10-12
Geoff Mendal
am 1bd19dd1: (-s ours) am 0e3ffe7c: (-s ours) am 5fa0a9...
blob
|
commitdiff
|
diff to current
2015-10-12
Geoff Mendal
am f598d0bc: (-s ours) Import translations. DO NOT...
blob
|
commitdiff
|
diff to current
2015-10-07
Geoff Mendal
am ad36aa0e: (-s ours) am 3963b980: (-s ours) am 793b2a...
blob
|
commitdiff
|
diff to current
2015-10-07
Geoff Mendal
am b4a027d0: (-s ours) Import translations. DO NOT...
blob
|
commitdiff
|
diff to current
2015-10-05
Geoff Mendal
am 03226257: (-s ours) am 45335b0c: (-s ours) am 0070fb...
blob
|
commitdiff
|
diff to current
2015-10-05
Geoff Mendal
am 010d2fcd: (-s ours) Import translations. DO NOT...
blob
|
commitdiff
|
diff to current
next