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 commit '11324dcedfd9d4cccba0b1e493c44fe80bb05da4' into manual_merge_11324dcedf
[android-x86/packages-apps-Settings.git]
/
res
/
layout-land
/
confirm_lock_pattern.xml
2017-03-09
Dmitry Dementyev
resolve merge conflicts of 75ae46d035 to lmp-mr1-dev...
blob
|
commitdiff
2017-03-08
Dmitry Dementyev
resolve merge conflicts of 75ae46d035 to lmp-mr1-dev...
blob
|
commitdiff
|
diff to current
2016-09-06
Maurice Lam
[Fingerprint] Remove learn more link if not provisioned...
blob
|
commitdiff
2016-08-18
Ajay Panicker
Merge "Do not allow apps to cause Bluetooth to be disco...
blob
|
commitdiff
2016-08-05
Mark Salyzyn
Merge changes Ic198dc44,I15f000bf
blob
|
commitdiff
2016-07-15
Jason Monk
Pre-setup restrictions DO NOT MERGE am: e6ad6e866b...
blob
|
commitdiff
2016-07-13
Mark Salyzyn
Merge \"Settings: trampoline persist.logd.logpersistd...
blob
|
commitdiff
2016-07-12
Mark Salyzyn
Merge \"Settings: add logpersist kernel only selection\"
blob
|
commitdiff
2016-07-08
Mark Salyzyn
Merge \"Settings: add logpersist kernel only selection...
blob
|
commitdiff
2016-06-13
Robert Greenwalt
resolve merge conflicts of b34cf86 to nyc-dev-plus...
blob
|
commitdiff
2016-06-11
Ruchi Kandoi
resolve merge conflicts of 9e28f9a to nyc-dev-plus...
blob
|
commitdiff
2016-06-09
Mark Salyzyn
Merge \\"Settings: add logpersist selection (strings...
blob
|
commitdiff
2016-06-03
Sanket Agarwal
Merge "Handle return value when Bluetooth is enabled...
blob
|
commitdiff
2016-05-27
Paul Stewart
Merge "Display connect button in the wifi connection...
blob
|
commitdiff
2016-05-23
Jason Monk
Merge "Fix the momery leak in DrawOverlayDetails" am...
blob
|
commitdiff
2016-05-18
Robert Greenwalt
Merge "Fix register multiple PhoneStateListeners."...
blob
|
commitdiff
2016-05-13
Amit Mahajan
Merge "Fix cannot build prefer or restore APN for Secon...
blob
|
commitdiff
2016-04-19
Amit Mahajan
resolve merge conflicts of 5213f71 to nyc-dev-plus...
blob
|
commitdiff
2016-04-07
Amith Yamasani
Merge "Fix user photo popup layout for RTL" am: 6186414
blob
|
commitdiff
2016-04-05
Jason Monk
Merge "Fix end padding of summary text for dialog is...
blob
|
commitdiff
2016-03-23
qinglian.x.zhang
Merge "Fix no options menu on location settings screen"
blob
|
commitdiff
2016-03-16
Carsten Hauge
Merge "Add Up button in Status settings"
blob
|
commitdiff
2016-02-29
Sanket Padawe
Resolve merge conflicts of b9e837bc78 to nyc-dev
blob
|
commitdiff
2016-02-27
Baligh Uddin
Import translations. DO NOT MERGE
blob
|
commitdiff
2016-02-23
Baligh Uddin
Import translations. DO NOT MERGE
blob
|
commitdiff
2016-02-20
Samuel Tan
WifiConfigController: set ca_path and ca_cert to null...
blob
|
commitdiff
2016-02-17
Bill Yi
Merge commit \'6a19c5cabf1615ffce654a1203554bbaa1d1f72e...
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
Andre Eisenbach
Merge "Add Developer menu entry to disable Bluetooth...
blob
|
commitdiff
2016-02-09
Samuel Tan
Allow trusted system certificates to be used in EAP...
blob
|
commitdiff
2016-02-05
Samuel Tan
Correctly load saved EAP CA cert and user cert options
blob
|
commitdiff
2016-02-03
Jason Monk
Merge "Change receiver name attribute for DISCOVERABLE_...
blob
|
commitdiff
2016-02-03
Geoff Mendal
Import translations. DO NOT MERGE am: 10a758b8b7 ...
blob
|
commitdiff
2016-02-03
Geoff Mendal
Import translations. DO NOT MERGE am: dd33e41c5a ...
blob
|
commitdiff
2016-02-03
Oleksandr Peletskyi
Merge "Gray out Wallpapers menu item when setting of...
blob
|
commitdiff
2016-02-02
Ritesh Reddy
Merge "Calling dataChanged() for Net Policy Restriction...
blob
|
commitdiff
2016-02-02
Samuel Tan
Allow domain suffix match to be set in UI for EAP confi...
blob
|
commitdiff
2016-02-02
Geoff Mendal
Import translations. DO NOT MERGE am: 49a9587ade ...
blob
|
commitdiff
2016-02-02
Geoff Mendal
Import translations. DO NOT MERGE am: 0873f057db ...
blob
|
commitdiff
2016-02-01
Geoff Mendal
Import translations. DO NOT MERGE am: 66382c5667 ...
blob
|
commitdiff
2016-02-01
Geoff Mendal
Import translations. DO NOT MERGE am: 67603ccc01 ...
blob
|
commitdiff
2016-01-27
Samuel Tan
Display warning if users does not provide CA cert in...
blob
|
commitdiff
2016-01-27
Samuel Tan
Add menu options for not specifying a EAP CA cert and...
blob
|
commitdiff
2016-01-27
Samuel Tan
Disable configuring EAP-TLS without user certificate.
blob
|
commitdiff
2016-01-27
Sanket Padawe
[DO NOT MERGE] Disable configuring EAP-TLS/TTLS/PEAP...
blob
|
commitdiff
2016-01-27
Geoff Mendal
Import translations. DO NOT MERGE am: 963c4b3d41 ...
blob
|
commitdiff
2016-01-27
Geoff Mendal
Import translations. DO NOT MERGE am: 9c57679b0e ...
blob
|
commitdiff
2016-01-27
Rubin Xu
resolve merge conflicts of 55d7fcbfc2 to master.
blob
|
commitdiff
2016-01-26
Philip P. Moltmann
Merge "Settings: Handle non-nullness of PrintJobId...
blob
|
commitdiff
2016-01-26
Shishir Agrawal
DO NOT MERGE : Unhiding MSIM APIs.
blob
|
commitdiff
2016-01-25
Tony Mantler
Merge "Move AccessPointPreference to SettingsLib"
blob
|
commitdiff
2016-01-25
Geoff Mendal
Merge "Import translations. DO NOT MERGE" into mnc...
blob
|
commitdiff
2016-01-25
Geoff Mendal
Import translations. DO NOT MERGE am: 13391af4fc ...
blob
|
commitdiff
2016-01-25
Benjamin Franz
Merge "Change build targets for settings tests"
blob
|
commitdiff
2016-01-23
Steve Pfetsch
resolve merge conflicts of 259b6a8029 to master.
blob
|
commitdiff
2016-01-22
Oleksandr Peletskyi
Merge "Added check of the restriction if a user is...
blob
|
commitdiff
2016-01-22
Anna Galusza
Merge "Make A11y SUW launchable from SUW and small...
blob
|
commitdiff
2016-01-22
Maurice Lam
Merge "Use RestrictedRadioButton in SetupRedactionInter...
blob
|
commitdiff
2016-01-22
Benjamin Franz
Merge "Add background image for work challenge"
blob
|
commitdiff
2016-01-21
Benjamin Franz
Add background image for work challenge
blob
|
commitdiff
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
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
2015-09-30
Geoff Mendal
am dffcc532: (-s ours) am c7b0a816: (-s ours) am 49b491...
blob
|
commitdiff
|
diff to current
2015-09-30
Geoff Mendal
am 77fc6ac5: (-s ours) Import translations. DO NOT...
blob
|
commitdiff
|
diff to current
2015-09-27
Baligh Uddin
am 4fdde2b5: (-s ours) am 2b802ceb: (-s ours) am cd6e60...
blob
|
commitdiff
|
diff to current
2015-09-27
Baligh Uddin
am ec981982: (-s ours) am 9b9d77f1: (-s ours) am 15243a...
blob
|
commitdiff
|
diff to current
2015-09-27
Baligh Uddin
am ad7342ec: (-s ours) Import translations. DO NOT...
blob
|
commitdiff
|
diff to current
2015-09-21
Zach Jang
am 7b2994d2: (-s ours) am 1304f47c: am 5cac8966: am...
blob
|
commitdiff
|
diff to current
2015-09-21
Zach Jang
am 386c7763: (-s ours) am 564ec935: am 00721b4a: am...
blob
|
commitdiff
|
diff to current
2015-09-17
Zach Jang
am b7e865ee: (-s ours) am 0431bc18: am e7e0c03f: DO...
blob
|
commitdiff
|
diff to current
2015-08-05
Sanket Padawe
am 5f9d15ed: am 86d85300: am 19336da3: am ac2347c0...
blob
|
commitdiff
|
diff to current
2015-07-29
Fyodor Kupolov
am 2731a18f: Merge "brightness status not refresh in...
blob
|
commitdiff
|
diff to current
2015-07-29
Fyodor Kupolov
am 2731a18f: Merge "brightness status not refresh in...
blob
|
commitdiff
|
diff to current
2015-07-29
Sanket Padawe
am df9b13af: am 74d85949: am e05f7143: Check for specia...
blob
|
commitdiff
|
diff to current
2015-07-14
Narayan Kamath
am 83a25842: Merge "Lose some deprecated test annotations."
blob
|
commitdiff
|
diff to current
next